Merge pull request 'chore(deps): update dependency sass to v1.79.3' (#112) from renovate/sass-1.x-lockfile into master

Reviewed-on: #112

.dockerignore

@@ -1,4 +1,4 @@
-/target
+**/target/
 tarpaulin-report.html
 .env
 cobertura.xml

.github/workflows/coverage.yml

@@ -68,6 +68,9 @@ jobs:
 
       - name: download deps
         run: make dev-env
+        env:
+          LPCONDUCTOR_CREDS_USERNAME: "librepages_api"
+          LPCONDUCTOR_CREDS_PASSWORD: "longrandomlygeneratedpassword"
 
       - name: Apply migrations
         run: make migrate

.github/workflows/linux.yml

@@ -55,6 +55,9 @@ jobs:
 
       - name: download deps
         run: make dev-env
+        env:
+          LPCONDUCTOR_CREDS_USERNAME: "librepages_api"
+          LPCONDUCTOR_CREDS_PASSWORD: "longrandomlygeneratedpassword"
 
       - name: configure GPG key
         if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'realaravinth/librepages'

.woodpecker.yml

@@ -0,0 +1,88 @@
+steps:
+  librepages-conductor:
+    image: realaravinth/librepages-conductor
+    detach: true
+    environment:
+      - LPCONDUCTOR__SOURCE_CODE=https://git.batsense.net/LibrePages/conductor
+      - LPCONDUCTOR_SERVER__PROXY_HAS_TLS=false
+      - LPCONDUCTOR_DEBUG=false
+      - LPCONDUCTOR_CONDUCTOR=dummy
+      - LPCONDUCTOR_SERVER_DOMAIN=librepages.test
+      - LPCONDUCTOR_SERVER_IP=0.0.0.0
+      - LPCONDUCTOR_SERVER_PROXY_HAS_TLS=false
+      - LPCONDUCTOR_SERVER_PORT=7000
+      - LPCONDUCTOR_SOURCE_CODE=https://example.org
+      - LPCONDUCTOR_CREDS_USERNAME=librepages_api
+      - LPCONDUCTOR_CREDS_TOKEN=longrandomlygeneratedpassword
+      - PORT=5000
+      - LPCONDUCTOR_CREDS_PASSWORD=longrandomlygeneratedpassword
+    commands:
+      - conductor serve
+
+  backend:
+    image: rust
+    environment:
+      - DATABASE_URL=postgres://postgres:password@database:5432/postgres
+    commands:
+      - curl -fsSL https://deb.nodesource.com/setup_16.x | bash - &&\
+      - apt update && apt-get -y --no-install-recommends install nodejs tar gpg curl wget
+      - rustup component add rustfmt
+      - rustup component add clippy
+        # rewrite conducotr configuration
+      - sed -i 's%url = "http:\/\/localhost:5000"%url = "http:\/\/librepages-conductor:5000"%' config/default.toml
+      - make dev-env
+      - make migrate
+      - make lint
+      - make test
+      - make release
+
+  build_docker_img:
+    image: plugins/docker
+    when:
+      event: [pull_request]
+    settings:
+      dry_run: true
+      repo: realaravinth/librepages
+      tags: latest
+
+  build_and_publish_docker_img:
+    image: plugins/docker
+    when:
+      event: [push, tag, deployment]
+      branch: master
+    settings:
+      username: realaravinth
+      password:
+        from_secret: DOCKER_TOKEN
+      repo: realaravinth/librepages
+      tags:
+        latest
+
+        #  build_publisher_docker_img:
+        #    image: plugins/docker
+        #    when:
+        #      event: [push, tag, deployment]
+        #    settings:
+        #      dry_run: true
+        #      dockerfile: scripts/publish-bins-docker
+        #      purge: false
+        #      repo: realaravinth/librepages-publisher
+        #      tags: latest
+        #
+  publish_bins:
+    image: rust
+    when:
+      event: [push, tag, deployment]
+      branch: master
+    commands:
+      - apt update
+      - apt-get -y --no-install-recommends install gpg tar curl wget
+      - echo -n "$RELEASE_BOT_GPG_SIGNING_KEY" | gpg --batch --import --pinentry-mode loopback
+      - scripts/bin-publish.sh publish master latest $DUMBSERVE_PASSWORD
+    secrets: [RELEASE_BOT_GPG_SIGNING_KEY, DUMBSERVE_PASSWORD, GPG_PASSWORD]
+
+services:
+  database:
+    image: postgres
+    environment:
+      - POSTGRES_PASSWORD=password

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "pages"
+name = "librepages"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
-homepage = "https://github.com/realaravinth/pages"
-repository = "https://github.com/realaravinth/pages"
-documentation = "https://github.con/realaravinth/pages"
-readme = "https://github.com/realaravinth/pages/blob/master/README.md"
+homepage = "https://git.batsense.net/LibrePages/librepages"
+repository = "https://git.batsense.net/LibrePages/librepages"
+documentation = "https://git.batsense.net/LibrePages/librepages"
+readme = "https://git.batsense.net/LibrePages/librepages/blob/master/README.md"
 license = "AGPLv3 or later version"
 authors = ["realaravinth <realaravinth@batsense.net>"]
 
@@ -19,20 +19,21 @@ actix-identity = "0.4.0"
 actix-rt = "2"
 actix-web-codegen-const-routes = { version = "0.1.0", tag = "0.1.0", git = "https://github.com/realaravinth/actix-web-codegen-const-routes" }
 argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
-sqlx = { version = "0.6.1", features = ["runtime-actix-rustls", "postgres", "time", "offline", "json", "uuid"] }
-clap = { version = "3.2.20", features = ["derive"]}
+sqlx = { version = "0.6.2", features = ["runtime-actix-rustls", "postgres", "time", "offline", "json", "uuid"] }
+clap = { version = "4.0.0", features = ["derive"]}
+libconfig = { version = "0.1.0", git = "https://git.batsense.net/librepages/libconfig" }
+libconductor = { version = "0.1.0", git = "https://git.batsense.net/librepages/conductor/" }
 
-config = "0.13"
-git2 = "0.14.2"
+config = "0.14"
+git2 = "0.19.0"
 
 serde = { version = "1", features = ["derive", "rc"]}
 serde_json = "1"
 
-pretty_env_logger = "0.4"
+pretty_env_logger = "0.5"
 
 lazy_static = "1.4"
-
-url = "2.2"
+url = { version = "2.2", features = ["serde"] }
 urlencoding = "2.1.0"
 
 derive_more = "0.99"
@@ -40,17 +41,21 @@ derive_more = "0.99"
 num_cpus = "1.13"
 
 tokio = { version = "1", features=["sync"]}
-num_enum = "0.5.7"
+num_enum = "0.7.0"
 
 mime_guess = "2.0.4"
 mime = "0.3.16"
-rust-embed = "6.3.0"
+rust-embed = "8.0.0"
 rand = "0.8.5"
 tracing = { version = "0.1.37", features = ["log"]}
-tracing-actix-web = "0.6.2"
-toml = "0.5.9"
+tracing-actix-web = "0.7.0"
+toml = "0.8.0"
 serde_yaml = "0.9.14"
 uuid = { version = "1.2.2", features = ["serde"] }
+reqwest = { version = "0.12.0", features = ["json"] }
+sha2 = "0.10.6"
+hmac = "0.12.1"
+hex= "0.4.3"
 
 [dependencies.cache-buster]
 git = "https://github.com/realaravinth/cache-buster"
@@ -68,7 +73,7 @@ version = "0.2"
 
 [dev-dependencies]
 futures = "0.3.24"
-mktemp = "0.4.1"
+mktemp = "0.5.0"
 
 
 [workspace]

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.9.1 as frontend
+FROM node:20.17.0 as frontend
 COPY package.json package-lock.json /src/
 WORKDIR /src
 RUN npm install
@@ -19,11 +19,11 @@ RUN cd utils/cache-bust && cargo run
 RUN cargo build --release
 
 FROM debian:bullseye-slim
-#RUN useradd -ms /bin/bash -u 1000 pages
-#RUN mkdir -p /var/www/pages && chown pages /var/www/pages
+#RUN useradd -ms /bin/bash -u 1000 librepages
+#RUN mkdir -p /var/www/librepages && chown librepages /var/www/librepages
 RUN apt-get update && apt-get install -y ca-certificates
 COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x  /usr/local/bin/entrypoint.sh
-COPY --from=rust /src/target/release/pages /usr/local/bin/
+COPY --from=rust /src/target/release/librepages /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

Makefile

@@ -30,14 +30,14 @@ doc: ## Prepare documentation
 
 docker: ## Build docker images
 	docker build \
-		-t realaravinth/pages:master \
-		-t realaravinth/pages:latest \
-		-t realaravinth/pages:0.1.0 .
+		-t realaravinth/librepages:master \
+		-t realaravinth/librepages:latest \
+		-t realaravinth/librepages:0.1.0 .
 
 docker-publish: docker ## Build and publish docker images
-	docker push realaravinth/pages:master 
-	docker push realaravinth/pages:latest
-	docker push realaravinth/pages:0.1.0
+	docker push realaravinth/librepages:master 
+	docker push realaravinth/librepages:latest
+	docker push realaravinth/librepages:0.1.0
 
 lint: ## Lint codebase
 	cargo fmt -v --all -- --emit files
@@ -46,7 +46,7 @@ lint: ## Lint codebase
 migrate: ## run migrations
 	$(call cache_bust)
 	unset DATABASE_URL && cargo build
-	cargo run -- migrate
+	DATABASE_URL=${DATABASE_URL} cargo run -- migrate
 
 release: ## Release build
 	$(call cache_bust)

README.md

@@ -5,10 +5,8 @@
 **Auto-deploy static websites from git repositories**
 
 </p>
+[![status-badge](https://ci.batsense.net/api/badges/LibrePages/librepages/status.svg)](https://ci.batsense.net/LibrePages/librepages)
 
-[![Build](https://github.com/realaravinth/pages/actions/workflows/linux.yml/badge.svg)](https://github.com/realaravinth/pages/actions/workflows/linux.yml)
-[![dependency status](https://deps.rs/repo/github/realaravinth/pages/status.svg)](https://deps.rs/repo/github/realaravinth/pages)
-[![codecov](https://codecov.io/gh/realaravinth/pages/branch/master/graph/badge.svg)](https://codecov.io/gh/realaravinth/pages)
 
 </div>
 

config/default.toml

@@ -1,8 +1,11 @@
 debug = true
 allow_registration = true
 # source code of your copy of pages server.
-source_code = "https://github.com/realaravinth/pages"
+source_code = "https://git.batsense.net/LibrePages/pages"
 support_email = "support@librepages.example.org"
+conductors = [
+{ username = "librepages_api", api_key = "longrandomlygeneratedpassword", url = "http://localhost:5000"}
+]
 
 [server]
 # The port at which you want Pages to listen to
@@ -16,7 +19,6 @@ workers = 2
 domain = "localhost"
 cookie_secret = "94b2b2732626fdb7736229a7c777cb451e6304c147c4549f30"
 
-
 [page]
 base_path = "/tmp/librepages-defualt-config/"
 base_domain = "librepages.test" # domain where customer pages will be deployed.

docs/installation/bare-metal.md

@@ -3,10 +3,10 @@
 The process is tedious, most of this will be automated with a script in
 the future.
 
-## 1. Create new user for running `pages`:
+## 1. Create new user for running `librepages`:
 
 ```bash
-sudo useradd -b /srv -m -s /usr/bin/zsh pages
+sudo useradd -b /srv -m -s /usr/bin/zsh librepages
 ```
 
 ## 2. Install Runtime dependencies
@@ -19,11 +19,11 @@ On Debian-based systems, run:
 sudo apt install nginx
 ```
 
-## 3. Build `Pages`
+## 3. Build `librepages`
 
 ### i. Install Build Dependencies
 
-To build `pages`, you need the following dependencies:
+To build `librepages`, you need the following dependencies:
 
 1. [Git](https://packages.debian.org/bullseye/git)
 2. [pkg-config](https://packages.debian.org/bullseye/pkg-config)
@@ -71,23 +71,23 @@ Install binary and copy demo configuration file into default configuration
 lookup path(`/etc/static-pages/config.toml`)
 
 ```bash
-sudo cp ./target/release/pages /usr/local/bin/ && \
+sudo cp ./target/release/librepages /usr/local/bin/ && \
 	sudo mkdir /etc/static-pages && \
 	sudo cp config/default.toml /etc/static-pages/config.toml
 ```
 
 ## 4. Systemd service configuration:
 
-### i. Copy the following to `/etc/systemd/system/pages.service`:
+### i. Copy the following to `/etc/systemd/system/librepages.service`:
 
 ```systemd
 [Unit]
-Description=pages: Auto-deploy static websites from git repositories
+Description=librepages: Auto-deploy static websites from git repositories
 
 [Service]
 Type=simple
-User=pages
-ExecStart=/usr/local/bin/pages
+User=librepages
+ExecStart=/usr/local/bin/librepages
 Restart=on-failure
 RestartSec=1
 MemoryDenyWriteExecute=true
@@ -107,13 +107,13 @@ WantedBy=multi-user.target
 
 ```bash
 sudo systemctl daemon-reload && \
-	sudo systemctl enable pages && \ # Auto startup during boot
-	sudo systemctl start pages
+	sudo systemctl enable librepages && \ # Auto startup during boot
+	sudo systemctl start librepages
 ```
 
-## 5. Optionally configure Nginx to reverse proxy requests to Pages
+## 5. Optionally configure Nginx to reverse proxy requests to LibrePages
 
 **NOTE: This sections includes instructions to reverse proxy requests to
-Pages API, not the websites managed by Pages.**
+LibrePages API, not the websites managed by librepages.**
 
-See [here](../../config/pages-nginx-config) for sample Nginx configuration.
+See [here](../../config/librepages-nginx-config) for sample Nginx configuration.

migrations/20221220010013_librepages_forgejo_webhooks.sql

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS librepages_forgejo_webhooks (
+    forgejo_webhook_secret VARCHAR(40) NOT NULL UNIQUE,
+    forgejo_url VARCHAR(3000) NOT NULL,
+    auth_token VARCHAR(40) NOT NULL UNIQUE,
+	ID SERIAL PRIMARY KEY NOT NULL,
+	owned_by INTEGER NOT NULL references librepages_users(ID) ON DELETE CASCADE
+);
+
+CREATE UNIQUE INDEX librepages_forgejo_webhook_auth_token_index ON librepages_forgejo_webhooks(auth_token);
+
+CREATE TABLE IF NOT EXISTS librepages_forgejo_webhook_site_mapping (
+	site_id INTEGER NOT NULL references librepages_sites(ID) ON DELETE CASCADE,
+	forgejo_webhook_id INTEGER NOT NULL references librepages_forgejo_webhooks(ID) ON DELETE CASCADE,
+    UNIQUE(site_id, forgejo_webhook_id)
+);

package-lock.json

@@ -12,104 +12,20 @@
         "sass": "^1.54.9"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz",
+      "integrity": "sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
         "url": "https://paulmillr.com/funding/"
       }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
     },
     "node_modules/immutable": {
       "version": "4.1.0",
@@ -117,88 +33,26 @@
       "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
       "dev": true
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+    "node_modules/readdirp": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
+      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
+        "node": ">= 14.16.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/sass": {
-      "version": "1.54.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-      "integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
+      "version": "1.79.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
+      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
       "dev": true,
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
+        "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
@@ -206,7 +60,7 @@
         "sass": "sass.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
       }
     },
     "node_modules/source-map-js": {
@@ -217,85 +71,16 @@
       "engines": {
         "node": ">=0.10.0"
       }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
     }
   },
   "dependencies": {
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
     "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.0.tgz",
+      "integrity": "sha512-mxIojEAQcuEvT/lyXq+jf/3cO/KoA6z4CeNDGGevTybECPOMFCnQy3OPahluUkbqgPNGw5Bi78UC7Po6Lhy+NA==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
+        "readdirp": "^4.0.1"
       }
     },
     "immutable": {
@@ -304,64 +89,19 @@
       "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
       "dev": true
     },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true
-    },
     "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
+      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
+      "dev": true
     },
     "sass": {
-      "version": "1.54.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.9.tgz",
-      "integrity": "sha512-xb1hjASzEH+0L0WI9oFjqhRi51t/gagWnxLiwUNMltA0Ab6jIDkAacgKiGYKM9Jhy109osM7woEEai6SXeJo5Q==",
+      "version": "1.79.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
+      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
       "dev": true,
       "requires": {
-        "chokidar": ">=3.0.0 <4.0.0",
+        "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       }
@@ -371,15 +111,6 @@
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "dev": true
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-        "is-number": "^7.0.0"
-      }
     }
   }
 }

renovate.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":dependencyDashboard"
+  ],
+  "labels": [
+    "renovate-bot"
+  ],
+  "prHourlyLimit": 0,
+  "timezone": "Asia/kolkata",
+  "prCreation": "immediate",
+  "vulnerabilityAlerts": {
+    "enabled": true,
+    "labels": [
+      "renovate-bot",
+      "renovate-security",
+      "security"
+    ]
+  }
+}

scripts/bin-publish.sh

@@ -33,14 +33,15 @@ FILENAME="$NAME-$2-linux-amd64"
 TARBALL=$FILENAME.tar.gz
 TARGET_DIR="$TMP_DIR/$FILENAME/"
 mkdir -p $TARGET_DIR
-DOCKER_IMG="realaravinth/pages:$3"
+DOCKER_IMG="realaravinth/librepages:$3"
 
 
 get_bin(){
 	echo "[*] Grabbing binary"
-	container_id=$(docker create $DOCKER_IMG)
-	docker cp $container_id:/usr/local/bin/pages $TARGET_DIR/
-	docker rm -v $container_id
+	#container_id=$(docker create $DOCKER_IMG)
+	#docker cp $container_id:/usr/local/bin/pages $TARGET_DIR/
+	#docker rm -v $container_id
+	cp target/release/librepages $TARGET_DIR
 }
 
 copy() {

scripts/conductor.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+readonly NAME=librepages-conductor
+
+docker rm -f $NAME
+
+docker create --name $NAME -p 5000:5000 \
+	-e LPCONDUCTOR__SOURCE_CODE="https://git.batsense.net/LibrePages/conductor" \
+	-e LPCONDUCTOR_SERVER__PROXY_HAS_TLS=false \
+	-e LPCONDUCTOR_DEBUG="false" \
+	-e LPCONDUCTOR_CONDUCTOR="dummy" \
+	-e LPCONDUCTOR_SERVER_URL_PREFIX="" \
+	-e LPCONDUCTOR_SERVER_DOMAIN="librepages.test" \
+	-e LPCONDUCTOR_SERVER_IP="0.0.0.0" \
+	-e LPCONDUCTOR_SERVER_PROXY_HAS_TLS="false" \
+	-e LPCONDUCTOR_SERVER_PORT=7000 \
+	-e LPCONDUCTOR_SOURCE_CODE="https://example.org" \
+    -e LPCONDUCTOR_CREDS_USERNAME=$LPCONDUCTOR_CREDS_USERNAME \
+	-e LPCONDUCTOR_CREDS_PASSWORD=$LPCONDUCTOR_CREDS_PASSWORD \
+    -e PORT="5000"\
+	realaravinth/librepages-conductor conductor serve
+
+docker start $NAME

scripts/entrypoint.sh

@@ -15,4 +15,4 @@ else
 	useradd --uid $USER_ID -b /home -m -s /bin/bash $LIBREPAGES_USER
 fi
 
-su $LIBREPAGES_USER  -c 'pages'
+su $LIBREPAGES_USER  -c 'librepages'

scripts/publish-bins-docker

@@ -0,0 +1,14 @@
+FROM realaravinth/librepages:latest as base
+RUN echo foo
+
+FROM debian:bullseye-slim
+RUN  apt update
+RUN  apt-get -y --no-install-recommends install gpg tar curl wget
+WORKDIR /src
+COPY --from=base /usr/local/bin/librepages .
+COPY . .
+ARG RELEASE_BOT_GPG_SIGNING_KEY
+RUN echo -n "$RELEASE_BOT_GPG_SIGNING_KEY"
+RUN echo -n "$RELEASE_BOT_GPG_SIGNING_KEY" | gpg --batch --import --pinentry-mode loopback
+env GPG_PASSWORD=$GPG_PASSWORD
+RUN /src/scripts/bin-publish.sh publish master latest $DUMBSERVE_PASSWORD

sqlx-data.json

@@ -144,6 +144,39 @@
     },
     "query": "SELECT\n                    librepages_deploy_event_type.name,\n                    librepages_site_deploy_events.time,\n                    librepages_site_deploy_events.pub_id\n                FROM\n                    librepages_site_deploy_events\n                INNER JOIN librepages_deploy_event_type ON\n                    librepages_deploy_event_type.ID = librepages_site_deploy_events.event_type\n                WHERE\n                    librepages_site_deploy_events.site = (\n                        SELECT ID FROM librepages_sites WHERE hostname = $1\n                    )\n                AND\n                    librepages_site_deploy_events.pub_id = $2\n                "
   },
+  "3ecc3a4c89b1289368ef9d9c97204330f74138a0da614ef2174c59a687119595": {
+    "describe": {
+      "columns": [
+        {
+          "name": "forgejo_url",
+          "ordinal": 0,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "auth_token",
+          "ordinal": 1,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "forgejo_webhook_secret",
+          "ordinal": 2,
+          "type_info": "Varchar"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT\n                forgejo_url, auth_token, forgejo_webhook_secret\n            FROM\n                librepages_forgejo_webhooks\n            WHERE\n                auth_token = $1\n            AND\n                owned_by = (SELECT ID FROM librepages_users WHERE name = $2);\n            "
+  },
   "432fe829719ce8110f768b4a611724bb34191ac224d2143ff4c81548da75c103": {
     "describe": {
       "columns": [
@@ -189,6 +222,76 @@
     },
     "query": "SELECT repo_url, branch, hostname, owned_by, site_secret\n            FROM librepages_sites\n            WHERE pub_id = $1\n            AND\n                owned_by = (SELECT ID from librepages_users WHERE name = $2)\n            AND\n                deleted = false;\n            "
   },
+  "4445ff3226af3b5a24b255c5bb012c99b222cc7bd6dda80f232809ed273fc712": {
+    "describe": {
+      "columns": [
+        {
+          "name": "repo_url",
+          "ordinal": 0,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "site_secret",
+          "ordinal": 1,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "branch",
+          "ordinal": 2,
+          "type_info": "Text"
+        },
+        {
+          "name": "hostname",
+          "ordinal": 3,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "owned_by",
+          "ordinal": 4,
+          "type_info": "Int4"
+        },
+        {
+          "name": "pub_id",
+          "ordinal": 5,
+          "type_info": "Uuid"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT repo_url, site_secret, branch, hostname, owned_by, pub_id\n            FROM librepages_sites\n            WHERE repo_url = $1\n            AND deleted = false;\n            "
+  },
+  "4cddf1049783251bfc79090055724e894a2be9451302f7691ce2f4240f1ee3ad": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int4"
+        }
+      ],
+      "nullable": [
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT ID FROM librepages_sites WHERE repo_url = $1"
+  },
   "53f3c21c06c8d1c218537dfa9183fd0604aaf28200d8aa12e97db4ac317df39e": {
     "describe": {
       "columns": [
@@ -390,6 +493,41 @@
     },
     "query": "SELECT EXISTS (SELECT 1 from librepages_users WHERE email = $1)"
   },
+  "8bf4e01b8c38d035fe6bdbfbe8ad9cb35e3fc2fd11107bae92880d157ed11379": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Varchar",
+          "Varchar",
+          "Varchar",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO librepages_forgejo_webhooks\n            (forgejo_url , auth_token, forgejo_webhook_secret, owned_by) VALUES ($1, $2, $3, \n            (SELECT ID FROM librepages_users WHERE name = $4)\n                )"
+  },
+  "90907d6cb4ca3b485f7b583584fb5821a950362679d061e490545c76634c211e": {
+    "describe": {
+      "columns": [
+        {
+          "name": "exists",
+          "ordinal": 0,
+          "type_info": "Bool"
+        }
+      ],
+      "nullable": [
+        null
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT EXISTS (SELECT 1 from librepages_sites WHERE repo_url = $1)"
+  },
   "924e756de5544cece865a10a7e136ecc6126e3a603947264cc7899387c18c819": {
     "describe": {
       "columns": [],
@@ -403,6 +541,70 @@
     },
     "query": "UPDATE librepages_users set password = $1\n            WHERE name = $2"
   },
+  "9710a01bc4c5c5cda2db27d14baca3d7a6ceffa66c7d539da6fda7947c222e71": {
+    "describe": {
+      "columns": [
+        {
+          "name": "forgejo_url",
+          "ordinal": 0,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "auth_token",
+          "ordinal": 1,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "forgejo_webhook_secret",
+          "ordinal": 2,
+          "type_info": "Varchar"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT\n                forgejo_url, auth_token, forgejo_webhook_secret\n            FROM\n                librepages_forgejo_webhooks\n            WHERE\n                owned_by = (SELECT ID FROM librepages_users WHERE name = $1);\n            "
+  },
+  "a6284ede1dbf340942dd97afb75865ba0a41009a145254117b03002bd9afa588": {
+    "describe": {
+      "columns": [
+        {
+          "name": "forgejo_url",
+          "ordinal": 0,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "auth_token",
+          "ordinal": 1,
+          "type_info": "Varchar"
+        },
+        {
+          "name": "forgejo_webhook_secret",
+          "ordinal": 2,
+          "type_info": "Varchar"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Text"
+        ]
+      }
+    },
+    "query": "SELECT forgejo_url, auth_token, forgejo_webhook_secret\n            FROM librepages_forgejo_webhooks\n            WHERE auth_token = $1\n            "
+  },
   "b48c77db6e663d97df44bf9ec2ee92fd3e02f2dcbcdbd1d491e09fab2da68494": {
     "describe": {
       "columns": [
@@ -429,6 +631,20 @@
     },
     "query": "SELECT name, password  FROM librepages_users WHERE email = ($1)"
   },
+  "b7e51e976a4a80a78df8dbfed1f195af212023d00faee88ab2d09326896bd653": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Text",
+          "Int4",
+          "Text"
+        ]
+      }
+    },
+    "query": "INSERT INTO librepages_forgejo_webhook_site_mapping\n                (site_id, forgejo_webhook_id) VALUES (\n                    (SELECT ID FROM librepages_sites WHERE repo_url = $1 AND ID = $2),\n                    (SELECT ID FROM librepages_forgejo_webhooks WHERE auth_token = $3)\n                ) ON CONFLICT (site_id, forgejo_webhook_id) DO NOTHING;"
+  },
   "b8b1b3c5fa205b071f577b2ce9993ddfc7c99ada26aea48aa1c201c8c3c7fcf6": {
     "describe": {
       "columns": [],

src/api/v1/forgejo.rs

@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use actix_identity::Identity;
+use actix_web::{web, HttpRequest, HttpResponse, Responder};
+use serde::{Deserialize, Serialize};
+use tracing::info;
+use url::Url;
+
+use super::get_auth_middleware;
+use crate::{errors::*, AppCtx};
+
+pub mod routes {
+    use crate::ctx::Ctx;
+
+    pub struct Forgejo {
+        pub add_webhook: &'static str,
+        pub view_webhook: &'static str,
+        pub list_webhooks: &'static str,
+        pub webhook: &'static str,
+    }
+
+    impl Forgejo {
+        pub const fn new() -> Self {
+            Self {
+                add_webhook: "/api/v1/forgejo/webhook/add",
+                list_webhooks: "/api/v1/forgejo/webhook/add",
+                view_webhook: "/api/v1/forgejo/webhook/view/{auth_token}",
+                webhook: "/api/v1/forgejo/webhook/event/new",
+            }
+        }
+
+        pub fn get_view(&self, auth_token: &str) -> String {
+            self.view_webhook.replace("{auth_token}", auth_token)
+        }
+
+        pub fn get_webhook_url(&self, ctx: &Ctx, auth_token: &str) -> String {
+            format!(
+                "https://{}{}?auth={auth_token}",
+                &ctx.settings.server.domain, self.webhook
+            )
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct AddWebhook {
+    pub forgejo_url: Url,
+}
+
+#[actix_web_codegen_const_routes::post(
+    path = "crate::V1_API_ROUTES.forgejo.add_webhook",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "Add webhook" skip(id, ctx, payload))]
+async fn add_webhook(
+    ctx: AppCtx,
+    id: Identity,
+    payload: web::Json<AddWebhook>,
+) -> ServiceResult<impl Responder> {
+    info!(
+        "Adding webhook for Forgejo instance: {}",
+        payload.forgejo_url.as_str()
+    );
+    let owner = id.identity().unwrap();
+    let payload = payload.into_inner();
+    let hook = ctx.db.new_webhook(payload.forgejo_url, &owner).await?;
+    Ok(HttpResponse::Ok().json(hook))
+}
+
+#[actix_web_codegen_const_routes::get(
+    path = "crate::V1_API_ROUTES.forgejo.list_webhooks",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "Delete webhook" skip(id, ctx))]
+async fn list_webhooks(ctx: AppCtx, id: Identity) -> ServiceResult<impl Responder> {
+    let owner = id.identity().unwrap();
+    info!("Getting all webhooks created by {}", owner);
+    let hooks = ctx.db.list_all_webhooks_with_owner(&owner).await?;
+    Ok(HttpResponse::Ok().json(hooks))
+}
+
+#[actix_web_codegen_const_routes::get(
+    path = "crate::V1_API_ROUTES.forgejo.view_webhook",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "Delete webhook" skip(id, ctx, path))]
+async fn view_webhook(
+    ctx: AppCtx,
+    id: Identity,
+    path: web::Path<String>,
+) -> ServiceResult<impl Responder> {
+    let path = path.into_inner();
+    let owner = id.identity().unwrap();
+    info!("Gitting webhook webhook for Forgejo instance: {}", path,);
+    let hook = ctx.db.get_webhook_with_owner(&path, &owner).await?;
+    Ok(HttpResponse::Ok().json(hook))
+}
+
+#[derive(Serialize, Deserialize)]
+struct Auth {
+    auth: String,
+}
+
+#[actix_web_codegen_const_routes::post(path = "crate::V1_API_ROUTES.forgejo.webhook")]
+#[tracing::instrument(name = "Update ", skip(body, ctx, req, q))]
+async fn webhook(
+    ctx: AppCtx,
+    body: web::Bytes,
+    req: HttpRequest,
+    q: web::Query<Auth>,
+) -> ServiceResult<impl Responder> {
+    ctx.process_webhook(&body, &req, &q.auth).await?;
+    Ok(HttpResponse::Ok())
+}
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    cfg.service(add_webhook);
+    cfg.service(view_webhook);
+    cfg.service(list_webhooks);
+    cfg.service(webhook);
+}
+
+#[cfg(test)]
+mod tests {
+    use actix_web::{error::ResponseError, http::StatusCode, test};
+    use hmac::Mac;
+
+    use crate::ctx::api::v1::forgejo::{HmacSha256, WebhookPayload};
+    use crate::db::ForgejoWebhook;
+    use crate::tests;
+    use crate::*;
+
+    use super::*;
+
+    #[actix_rt::test]
+    async fn test_api_forgejo_webhook() {
+        const NAME: &str = "apiforgejowebhookuser";
+        const PASSWORD: &str = "longpasswordasdfa2";
+        const EMAIL: &str = "apiforgejowebhookuser@a.com";
+
+        let (_dir, ctx) = tests::get_ctx().await;
+        let _ = ctx.delete_user(NAME, PASSWORD).await;
+        let (_, signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
+        let page = ctx.add_test_site(NAME.into()).await;
+        let cookies = get_cookie!(signin_resp);
+        let app = get_app!(ctx).await;
+
+        let payload = AddWebhook {
+            forgejo_url: Url::parse("https://git.batnsense.net").unwrap(),
+        };
+
+        let add_webhook_resp = test::call_service(
+            &app,
+            post_request!(&payload, V1_API_ROUTES.forgejo.add_webhook)
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+        check_status!(add_webhook_resp, StatusCode::OK);
+        let response: ForgejoWebhook = actix_web::test::read_body_json(add_webhook_resp).await;
+        assert_eq!(response.forgejo_url, payload.forgejo_url);
+
+        let view_webhook_resp = get_request!(
+            &app,
+            &V1_API_ROUTES.forgejo.get_view(&response.auth_token),
+            cookies.clone()
+        );
+        check_status!(view_webhook_resp, StatusCode::OK);
+        let hook: ForgejoWebhook = actix_web::test::read_body_json(view_webhook_resp).await;
+        assert_eq!(hook, response);
+
+        let list_all_webhooks_resp =
+            get_request!(&app, V1_API_ROUTES.forgejo.list_webhooks, cookies.clone());
+        check_status!(list_all_webhooks_resp, StatusCode::OK);
+        let hooks: Vec<ForgejoWebhook> =
+            actix_web::test::read_body_json(list_all_webhooks_resp).await;
+        assert_eq!(vec![hook.clone()], hooks);
+
+        let webhook_url = format!("{}?auth={}", V1_API_ROUTES.forgejo.webhook, hook.auth_token);
+
+        // test webhook
+        let mut webhook_payload = WebhookPayload::default();
+        webhook_payload.reference = format!("refs/origin/{}", page.branch);
+        webhook_payload.repository.html_url = page.repo;
+
+        let body = serde_json::to_string(&webhook_payload).unwrap();
+        let body = body.as_bytes();
+        let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes())
+            .expect("HMAC can take key of any size");
+        mac.update(body);
+        let res = mac.finalize();
+        let sig = res.into_bytes();
+        let sig = hex::encode(&sig[..]);
+
+        let post_to_webhook_resp = test::call_service(
+            &app,
+            post_request!(&webhook_payload, &webhook_url)
+                .insert_header(("X-Gitea-Delivery", "foobar213randomuuid"))
+                .insert_header(("X-Gitea-Signature", sig.clone()))
+                .insert_header(("X-Gitea-Event", "push"))
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+        check_status!(post_to_webhook_resp, StatusCode::OK);
+
+        // no webhook
+        let fake_webhook_url = format!(
+            "{}?auth={}",
+            V1_API_ROUTES.forgejo.webhook, hook.forgejo_webhook_secret
+        );
+        let body = serde_json::to_string(&webhook_payload).unwrap();
+        let body = body.as_bytes();
+        let mut mac =
+            HmacSha256::new_from_slice(b"nosecret").expect("HMAC can take key of any size");
+        mac.update(body);
+        let res = mac.finalize();
+        let fake_sig = res.into_bytes();
+        let fake_sig = hex::encode(&fake_sig[..]);
+
+        let post_to_no_exist_webhook_resp = test::call_service(
+            &app,
+            post_request!(&webhook_payload, &fake_webhook_url)
+                .insert_header(("X-Gitea-Delivery", "foobar213randomuuid"))
+                .insert_header(("X-Gitea-Signature", fake_sig))
+                .insert_header(("X-Gitea-Event", "push"))
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+        let err = ServiceError::WebhookNotFound;
+        assert_eq!(post_to_no_exist_webhook_resp.status(), err.status_code());
+        let resp_err: ErrorToResponse =
+            actix_web::test::read_body_json(post_to_no_exist_webhook_resp).await;
+        assert_eq!(resp_err.error, err.to_string());
+
+        // no website
+        let mut webhook_payload = WebhookPayload::default();
+        webhook_payload.reference = format!("refs/origin/{}", page.branch);
+        webhook_payload.repository.html_url = "https://no-exist-git.example.org".into();
+
+        let body = serde_json::to_string(&webhook_payload).unwrap();
+        let body = body.as_bytes();
+        let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes())
+            .expect("HMAC can take key of any size");
+        mac.update(body);
+        let res = mac.finalize();
+        let sig = res.into_bytes();
+        let sig = hex::encode(&sig[..]);
+
+        let post_to_no_website_webhook_resp = test::call_service(
+            &app,
+            post_request!(&webhook_payload, &webhook_url)
+                .insert_header(("X-Gitea-Delivery", "foobar213randomuuid"))
+                .insert_header(("X-Gitea-Signature", sig.clone()))
+                .insert_header(("X-Gitea-Event", "push"))
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+
+        let err = ServiceError::WebsiteNotFound;
+        assert_eq!(post_to_no_website_webhook_resp.status(), err.status_code());
+        let resp_err: ErrorToResponse =
+            actix_web::test::read_body_json(post_to_no_website_webhook_resp).await;
+        assert_eq!(resp_err.error, err.to_string());
+    }
+}

src/api/v1/mod.rs

@@ -20,6 +20,7 @@ use serde::Deserialize;
 
 pub mod account;
 pub mod auth;
+pub mod forgejo;
 pub mod meta;
 pub mod pages;
 pub mod routes;
@@ -30,6 +31,7 @@ pub fn services(cfg: &mut ServiceConfig) {
     auth::services(cfg);
     account::services(cfg);
     meta::services(cfg);
+    forgejo::services(cfg);
     pages::services(cfg);
 }
 

src/api/v1/routes.rs

@@ -19,6 +19,7 @@ use actix_auth_middleware::GetLoginRoute;
 
 use crate::serve::routes::Serve;
 
+use super::forgejo::routes::Forgejo;
 use super::meta::routes::Meta;
 use super::pages::routes::Deploy;
 
@@ -92,6 +93,7 @@ pub struct Routes {
     pub account: Account,
     /// Meta routes
     pub meta: Meta,
+    pub forgejo: Forgejo,
     pub deploy: Deploy,
     pub serve: Serve,
 }
@@ -103,6 +105,7 @@ impl Routes {
             auth: Auth::new(),
             account: Account::new(),
             meta: Meta::new(),
+            forgejo: Forgejo::new(),
             deploy: Deploy::new(),
             serve: Serve::new(),
         }

src/conductor.rs

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use reqwest::Client;
+
+use libconductor::EventType;
+use libconfig::Config;
+use tracing::info;
+
+use crate::errors::ServiceResult;
+use crate::{page::Page, settings::Settings};
+
+#[derive(Clone)]
+pub struct Conductor {
+    client: Client,
+    pub settings: Settings,
+}
+
+impl Conductor {
+    pub fn new(settings: Settings, client: Option<Client>) -> Self {
+        let client = if let Some(client) = client {
+            client
+        } else {
+            Client::new()
+        };
+        Self { client, settings }
+    }
+    async fn tx(&self, e: &EventType) -> ServiceResult<()> {
+        for c in self.settings.conductors.iter() {
+            info!("Tx event to {}", c.url);
+            let mut event_url = c.url.clone();
+            event_url.set_path("/api/v1/events/new");
+            self.client
+                .post(event_url)
+                .basic_auth(&c.username, Some(&c.api_key))
+                .json(e)
+                .send()
+                .await
+                .unwrap();
+        }
+        Ok(())
+    }
+
+    pub async fn new_site(&self, page: Page) -> ServiceResult<()> {
+        let msg = EventType::NewSite {
+            hostname: page.domain,
+            branch: page.branch,
+            path: page.path,
+        };
+        self.tx(&msg).await
+    }
+
+    pub async fn tx_config(&self, config: Config) -> ServiceResult<()> {
+        self.tx(&EventType::Config { data: config }).await
+    }
+
+    pub async fn delete_site(&self, hostname: String) -> ServiceResult<()> {
+        self.tx(&EventType::DeleteSite { hostname }).await
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use uuid::Uuid;
+
+    #[actix_rt::test]
+    pub async fn test_conductor() {
+        let settings = Settings::new().unwrap();
+        let c = Conductor::new(settings.clone(), None);
+        c.delete_site("example.org".into()).await.unwrap();
+        let page = Page {
+            secret: "foo".into(),
+            repo: "foo".into(),
+            path: "foo".into(),
+            branch: "foo".into(),
+            domain: "foo".into(),
+            pub_id: Uuid::new_v4(),
+        };
+        c.new_site(page).await.unwrap();
+    }
+}

src/ctx/api/v1/forgejo.rs

@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use actix_web::web;
+use actix_web::HttpRequest;
+use hmac::{Hmac, Mac};
+use serde::{Deserialize, Serialize};
+use sha2::Sha256;
+use tracing::{info, warn};
+use url::Url;
+
+use crate::ctx::Ctx;
+use crate::errors::ServiceError;
+use crate::errors::ServiceResult;
+
+pub type HmacSha256 = Hmac<Sha256>;
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct CommitPerson {
+    pub name: String,
+    pub email: String,
+    pub username: String,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone, Eq, PartialEq)]
+pub struct Commit {
+    pub id: String,
+    pub message: String,
+    pub url: String,
+    pub author: CommitPerson,
+    pub committer: CommitPerson,
+    pub verification: serde_json::Value,
+    pub timestamp: String,
+    pub added: serde_json::Value,
+    pub removed: serde_json::Value,
+    pub modified: serde_json::Value,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct Person {
+    pub id: usize,
+    pub login: String,
+    pub full_name: String,
+    pub email: String,
+    pub avatar_url: String,
+    pub language: String,
+    pub is_admin: bool,
+    pub last_login: String,
+    pub created: String,
+    pub restricted: bool,
+    pub active: bool,
+    pub prohibit_login: bool,
+    pub location: String,
+    pub website: String,
+    pub description: String,
+    pub visibility: String,
+    pub followers_count: usize,
+    pub following_count: usize,
+    pub starred_repos_count: usize,
+    pub username: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct Permissions {
+    pub admin: bool,
+    pub push: bool,
+    pub pull: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct InternalTracker {
+    pub enable_time_tracker: bool,
+    pub allow_only_contributors_to_track_time: bool,
+    pub enable_issue_dependencies: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct Repository {
+    pub id: usize,
+    pub owner: Person,
+    pub name: String,
+    pub full_name: String,
+    pub description: String,
+    pub empty: bool,
+    pub private: bool,
+    pub fork: bool,
+    pub template: bool,
+    pub parent: Option<serde_json::Value>,
+    pub mirror: bool,
+    pub size: usize,
+    pub html_url: String,
+    pub ssh_url: String,
+    pub clone_url: String,
+    pub original_url: String,
+    pub website: String,
+    pub stars_count: usize,
+    pub forks_count: usize,
+    pub watchers_count: usize,
+    pub open_issues_count: usize,
+    pub open_pr_counter: usize,
+    pub release_counter: usize,
+    pub default_branch: String,
+    pub archived: bool,
+    pub created_at: String,
+    pub updated_at: String,
+    pub permissions: Permissions,
+    pub has_issues: bool,
+    pub internal_tracker: InternalTracker,
+    pub has_wiki: bool,
+    pub has_pull_requests: bool,
+    pub has_projects: bool,
+    pub ignore_whitespace_conflicts: bool,
+    pub allow_merge_commits: bool,
+    pub allow_rebase: bool,
+    pub allow_rebase_explicit: bool,
+    pub allow_squash_merge: bool,
+    pub default_merge_style: String,
+    pub avatar_url: String,
+    pub internal: bool,
+    pub mirror_interval: String,
+    pub mirror_updated: String,
+    pub repo_transfer: Option<serde_json::Value>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
+pub struct WebhookPayload {
+    #[serde(rename(serialize = "ref", deserialize = "ref"))]
+    pub reference: String,
+    pub before: String,
+    pub after: String,
+    pub compare_url: String,
+    pub repository: Repository,
+    pub pusher: Person,
+    pub sender: Person,
+}
+
+impl Ctx {
+    pub async fn process_webhook(
+        &self,
+        body: &web::Bytes,
+        req: &HttpRequest,
+        auth_token: &str,
+    ) -> ServiceResult<()> {
+        let headers = req.headers();
+        let _uuid = headers.get("X-Gitea-Delivery").unwrap();
+        let sig = headers.get("X-Gitea-Signature").unwrap();
+        let sig = hex::decode(sig).unwrap();
+        let event_type = headers.get("X-Gitea-Event").unwrap();
+
+        let payload: WebhookPayload = serde_json::from_slice(body).unwrap();
+
+        let hook = self.db.get_webhook(auth_token).await?;
+
+        for url in [
+            &payload.repository.html_url,
+            &payload.repository.ssh_url,
+            &payload.repository.clone_url,
+        ] {
+            if self.db.site_with_repository_exists(url).await? {
+                let mut mac = HmacSha256::new_from_slice(hook.forgejo_webhook_secret.as_bytes())?;
+                mac.update(body);
+                mac.verify_slice(&sig[..])?;
+
+                let site = self.db.get_site_from_repo_url(url).await?;
+                self.db
+                    .webhook_link_site(auth_token, &Url::parse(&site.repo_url)?)
+                    .await?;
+                if payload.reference.contains(&site.branch) {
+                    info!(
+                        "[webhook][forgejo/gitea] received update {:?} from {url} repository on deployed branch",
+                        event_type
+                    );
+                    self.update_site(&site.site_secret, Some(site.branch))
+                        .await?;
+                } else {
+                    info!(
+                        "[webhook][forgejo/gitea] received update {:?} from {url} repository on non-deployed branch {}",
+                        event_type,
+                        payload.reference
+                    );
+                }
+                return Ok(());
+            }
+        }
+        warn!(
+            "[webhook][forgejo/gitea] stray update from {} repository",
+            payload.repository.html_url
+        );
+        Err(ServiceError::WebsiteNotFound)
+    }
+}

src/ctx/api/v1/mod.rs

@@ -16,6 +16,7 @@
  */
 pub mod account;
 pub mod auth;
+pub mod forgejo;
 pub mod pages;
 
 #[cfg(test)]

src/ctx/api/v1/pages.rs

@@ -61,12 +61,15 @@ impl Ctx {
         self.db.add_site(&db_site).await?;
         let page = Page::from_site(&self.settings, db_site);
         page.update(&page.branch)?;
-        if let Some(_config) = page_config::Config::load(&page.path, &page.branch) {
-            unimplemented!();
-        }
         self.db
             .log_event(&page.domain, &db::EVENT_TYPE_CREATE)
             .await?;
+        self.conductor.new_site(page.clone()).await?;
+
+        if let Some(config) = page_config::load(&page.path, &page.branch) {
+            self.conductor.tx_config(config).await?;
+            unimplemented!("Parse and store custom domains in DB");
+        }
         Ok(page)
     }
 
@@ -87,8 +90,9 @@ impl Ctx {
                 .unwrap();
             }
             rx.await.unwrap()?;
-            if let Some(_config) = page_config::Config::load(&page.path, &page.branch) {
-                unimplemented!();
+            if let Some(config) = page_config::load(&page.path, &page.branch) {
+                self.conductor.tx_config(config).await?;
+                unimplemented!("Parse and store custom domains in DB");
             }
             self.db
                 .log_event(&page.domain, &db::EVENT_TYPE_UPDATE)
@@ -110,6 +114,7 @@ impl Ctx {
             self.db
                 .delete_site(&db_site.owner, &db_site.hostname)
                 .await?;
+            self.conductor.delete_site(db_site.hostname).await?;
             Ok(())
         } else {
             Err(ServiceError::WebsiteNotFound)

src/ctx/mod.rs

@@ -20,18 +20,23 @@ use std::thread;
 use crate::db::*;
 use crate::settings::Settings;
 use argon2_creds::{Config as ArgonConfig, ConfigBuilder as ArgonConfigBuilder, PasswordPolicy};
+use reqwest::Client;
 use tracing::info;
 
 pub mod api;
 
+use crate::conductor::Conductor;
+
 pub type ArcCtx = Arc<Ctx>;
 
 #[derive(Clone)]
 pub struct Ctx {
     pub settings: Settings,
     pub db: Database,
+    pub conductor: Conductor,
     /// credential-procession policy
     pub creds: ArgonConfig,
+    client: Client,
 }
 
 impl Ctx {
@@ -49,6 +54,8 @@ impl Ctx {
     pub async fn new(settings: Settings) -> Arc<Self> {
         let creds = Self::get_creds();
         let c = creds.clone();
+        let client = Client::default();
+        let conductor = Conductor::new(settings.clone(), Some(client.clone()));
 
         #[allow(unused_variables)]
         let init = thread::spawn(move || {
@@ -63,8 +70,10 @@ impl Ctx {
 
         Arc::new(Self {
             settings,
+            client,
             db,
             creds,
+            conductor,
         })
     }
 }

src/db.rs

@@ -23,9 +23,11 @@ use sqlx::types::time::OffsetDateTime;
 use sqlx::ConnectOptions;
 use sqlx::PgPool;
 use tracing::error;
+use url::Url;
 use uuid::Uuid;
 
 use crate::errors::*;
+use crate::utils;
 
 /// Connect to databse
 pub enum ConnectionOptions {
@@ -48,6 +50,7 @@ impl ConnectionOptions {
     async fn connect(self) -> ServiceResult<Database> {
         let pool = match self {
             Self::Fresh(fresh) => {
+                tracing::info!("DATABASE URL: {}", fresh.url);
                 let mut connect_options =
                     sqlx::postgres::PgConnectOptions::from_str(&fresh.url).unwrap();
                 if fresh.disable_logging {
@@ -273,6 +276,53 @@ impl Database {
         Ok(())
     }
 
+    pub async fn get_site_from_repo_url(&self, repo_url: &str) -> ServiceResult<Site> {
+        struct S {
+            repo_url: String,
+            branch: String,
+            hostname: String,
+            owned_by: i32,
+            site_secret: String,
+            pub_id: Uuid,
+        }
+
+        let site = sqlx::query_as!(
+            S,
+            "SELECT repo_url, site_secret, branch, hostname, owned_by, pub_id
+            FROM librepages_sites
+            WHERE repo_url = $1
+            AND deleted = false;
+            ",
+            repo_url,
+        )
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebsiteNotFound))?;
+
+        struct Owner {
+            name: String,
+        }
+        let owner = sqlx::query_as!(
+            Owner,
+            "SELECT name FROM librepages_users WHERE ID = $1",
+            site.owned_by
+        )
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebsiteNotFound))?;
+
+        let site = Site {
+            site_secret: site.site_secret,
+            branch: site.branch,
+            hostname: site.hostname,
+            owner: owner.name,
+            repo_url: site.repo_url,
+            pub_id: site.pub_id,
+        };
+
+        Ok(site)
+    }
+
     pub async fn get_site_from_pub_id(&self, pub_id: Uuid, owner: String) -> ServiceResult<Site> {
         struct S {
             repo_url: String,
@@ -430,6 +480,24 @@ impl Database {
         Ok(resp)
     }
 
+    /// check if site with repository exists
+    pub async fn site_with_repository_exists(&self, url: &str) -> ServiceResult<bool> {
+        let res = sqlx::query!(
+            "SELECT EXISTS (SELECT 1 from librepages_sites WHERE repo_url = $1)",
+            url,
+        )
+        .fetch_one(&self.pool)
+        .await
+        .map_err(map_register_err)?;
+
+        let mut resp = false;
+        if let Some(x) = res.exists {
+            resp = x;
+        }
+
+        Ok(resp)
+    }
+
     /// check if event type exists
     async fn event_type_exists(&self, event: &Event) -> ServiceResult<bool> {
         let res = sqlx::query!(
@@ -621,7 +689,134 @@ impl Database {
         }
         Ok(events)
     }
+
+    /// register a new webhook
+    pub async fn new_webhook(
+        &self,
+        forgejo_url: Url,
+        owner: &str,
+    ) -> ServiceResult<ForgejoWebhook> {
+        let hook = ForgejoWebhook::new(forgejo_url);
+        sqlx::query!(
+            "INSERT INTO librepages_forgejo_webhooks
+            (forgejo_url , auth_token, forgejo_webhook_secret, owned_by) VALUES ($1, $2, $3, 
+            (SELECT ID FROM librepages_users WHERE name = $4)
+                )",
+            hook.forgejo_url.as_str(),
+            &hook.auth_token,
+            &hook.forgejo_webhook_secret,
+            owner,
+        )
+        .execute(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::AccountNotFound))?;
+        Ok(hook)
     }
+
+    pub async fn list_all_webhooks_with_owner(
+        &self,
+        owner: &str,
+    ) -> ServiceResult<Vec<ForgejoWebhook>> {
+        let mut db_hooks = sqlx::query_as!(
+            InnerForgejoWebhook,
+            "SELECT
+                forgejo_url, auth_token, forgejo_webhook_secret
+            FROM
+                librepages_forgejo_webhooks
+            WHERE
+                owned_by = (SELECT ID FROM librepages_users WHERE name = $1);
+            ",
+            owner
+        )
+        .fetch_all(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebhookNotFound))?;
+
+        let mut hooks = Vec::with_capacity(db_hooks.len());
+
+        for hook in db_hooks.drain(0..) {
+            hooks.push(hook.to_webhook()?)
+        }
+
+        Ok(hooks)
+    }
+
+    pub async fn get_webhook_with_owner(
+        &self,
+        auth_token: &str,
+        owner: &str,
+    ) -> ServiceResult<ForgejoWebhook> {
+        let h = sqlx::query_as!(
+            InnerForgejoWebhook,
+            "SELECT
+                forgejo_url, auth_token, forgejo_webhook_secret
+            FROM
+                librepages_forgejo_webhooks
+            WHERE
+                auth_token = $1
+            AND
+                owned_by = (SELECT ID FROM librepages_users WHERE name = $2);
+            ",
+            auth_token,
+            owner
+        )
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebhookNotFound))?;
+
+        h.to_webhook()
+    }
+
+    pub async fn get_webhook(&self, auth_token: &str) -> ServiceResult<ForgejoWebhook> {
+        let h = sqlx::query_as!(
+            InnerForgejoWebhook,
+            "SELECT forgejo_url, auth_token, forgejo_webhook_secret
+            FROM librepages_forgejo_webhooks
+            WHERE auth_token = $1
+            ",
+            auth_token,
+        )
+        .fetch_one(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebhookNotFound))?;
+
+        h.to_webhook()
+    }
+
+    /// register a webhook against a site
+    pub async fn webhook_link_site(&self, auth_token: &str, repo_url: &Url) -> ServiceResult<()> {
+        struct Site {
+            id: i32,
+        }
+        let sites = sqlx::query_as!(
+            Site,
+            "SELECT ID FROM librepages_sites WHERE repo_url = $1",
+            repo_url.as_str()
+        )
+        .fetch_all(&self.pool)
+        .await
+        .map_err(|e| map_row_not_found_err(e, ServiceError::WebsiteNotFound))?;
+
+        for site in sites {
+            sqlx::query!(
+                "INSERT INTO librepages_forgejo_webhook_site_mapping
+                (site_id, forgejo_webhook_id) VALUES (
+                    (SELECT ID FROM librepages_sites WHERE repo_url = $1 AND ID = $2),
+                    (SELECT ID FROM librepages_forgejo_webhooks WHERE auth_token = $3)
+                ) ON CONFLICT (site_id, forgejo_webhook_id) DO NOTHING;",
+                repo_url.as_str(),
+                site.id,
+                auth_token
+            )
+            .execute(&self.pool)
+            .await
+            //.unwrap();
+            .map_err(|e| map_row_not_found_err(e, ServiceError::WebhookNotFound))?;
+        }
+        Ok(())
+    }
+}
+
 struct InnerSite {
     site_secret: String,
     repo_url: String,
@@ -731,6 +926,39 @@ pub struct LibrePagesEvent {
     pub id: Uuid,
 }
 
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub struct ForgejoWebhook {
+    pub forgejo_url: Url,
+    pub forgejo_webhook_secret: String,
+    pub auth_token: String,
+}
+
+impl ForgejoWebhook {
+    fn new(forgejo_url: Url) -> Self {
+        Self {
+            forgejo_url,
+            forgejo_webhook_secret: utils::get_random(40),
+            auth_token: utils::get_random(40),
+        }
+    }
+}
+
+struct InnerForgejoWebhook {
+    forgejo_url: String,
+    auth_token: String,
+    forgejo_webhook_secret: String,
+}
+
+impl InnerForgejoWebhook {
+    fn to_webhook(self) -> ServiceResult<ForgejoWebhook> {
+        Ok(ForgejoWebhook {
+            forgejo_url: Url::parse(&self.forgejo_url)?,
+            auth_token: self.auth_token,
+            forgejo_webhook_secret: self.forgejo_webhook_secret,
+        })
+    }
+}
+
 fn now_unix_time_stamp() -> OffsetDateTime {
     OffsetDateTime::now_utc()
 }
@@ -950,7 +1178,7 @@ mod tests {
 
         let site = Site {
             site_secret: "foobar".into(),
-            repo_url: "https://git.batsense.net/LibrePages/librepages.git".into(),
+            repo_url: "https://git.test_db_sites.example.org/LibrePages/librepages.git".into(),
             branch: "librepages".into(),
             hostname: "db_works.tests.librepages.librepages.org".into(),
             pub_id: Uuid::new_v4(),
@@ -959,12 +1187,20 @@ mod tests {
 
         // test if hostname exists. Should be false
         assert!(!db.hostname_exists(&site.hostname).await.unwrap());
+        assert!(!db
+            .site_with_repository_exists(&site.repo_url)
+            .await
+            .unwrap());
 
         // testing adding site
         db.add_site(&site).await.unwrap();
 
         // test if hostname exists. Should be true
         assert!(db.hostname_exists(&site.hostname).await.unwrap());
+        assert!(db
+            .site_with_repository_exists(&site.repo_url)
+            .await
+            .unwrap());
 
         // get site
         let db_site = db.get_site(p.username, &site.hostname).await.unwrap();
@@ -976,6 +1212,12 @@ mod tests {
             db.get_site_from_secret(&site.site_secret).await.unwrap()
         );
 
+        // get site  by repo_url
+        assert_eq!(
+            db_site,
+            db.get_site_from_repo_url(&site.repo_url).await.unwrap()
+        );
+
         // list all sites owned by user
         let db_sites = db.list_all_sites(p.username).await.unwrap();
         assert_eq!(db_sites.len(), 1);
@@ -1022,6 +1264,32 @@ mod tests {
         );
         assert_eq!(latest_update_event_id_from_db.id, latest_update_event_id);
 
+        // add webhook
+        let forgejo_url = Url::parse("https://example.org").unwrap();
+        let hook = db.new_webhook(forgejo_url, NAME).await.unwrap();
+        assert_eq!(hook, db.get_webhook(&hook.auth_token).await.unwrap());
+        assert_eq!(
+            vec![hook.clone()],
+            db.list_all_webhooks_with_owner(NAME).await.unwrap()
+        );
+        assert_eq!(
+            hook,
+            db.get_webhook_with_owner(&hook.auth_token, NAME)
+                .await
+                .unwrap()
+        );
+        assert_eq!(
+            db.get_webhook(&hook.forgejo_webhook_secret).await.err(),
+            Some(ServiceError::WebhookNotFound)
+        );
+
+        db.webhook_link_site(&hook.auth_token, &Url::parse(&site.repo_url).unwrap())
+            .await
+            .unwrap();
+        db.webhook_link_site(&hook.auth_token, &Url::parse(&site.repo_url).unwrap())
+            .await
+            .unwrap();
+
         // delete site
         db.delete_site(p.username, &site.hostname).await.unwrap();
 

src/errors.rs

@@ -28,6 +28,8 @@ use argon2_creds::errors::CredsError;
 use config::ConfigError as ConfigErrorInner;
 use derive_more::{Display, Error};
 use git2::Error as GitError;
+use hmac::digest::InvalidLength;
+use hmac::digest::MacError;
 use serde::{Deserialize, Serialize};
 use url::ParseError;
 
@@ -178,6 +180,24 @@ pub enum ServiceError {
     #[display(fmt = "Passwords don't match")]
     /// passwords don't match
     PasswordsDontMatch,
+
+    /// Webhook not found
+    #[display(fmt = "Webhook not found")]
+    WebhookNotFound,
+}
+
+impl From<InvalidLength> for ServiceError {
+    #[cfg(not(tarpaulin_include))]
+    fn from(_: InvalidLength) -> ServiceError {
+        ServiceError::InternalServerError
+    }
+}
+
+impl From<MacError> for ServiceError {
+    #[cfg(not(tarpaulin_include))]
+    fn from(_: MacError) -> ServiceError {
+        ServiceError::WebhookNotFound
+    }
 }
 
 impl From<ParseError> for ServiceError {
@@ -252,6 +272,7 @@ impl ResponseError for ServiceError {
             ServiceError::ClosedForRegistration => StatusCode::FORBIDDEN, //FORBIDDEN,
             ServiceError::NotAnEmail => StatusCode::BAD_REQUEST,       //BADREQUEST,
             ServiceError::WrongPassword => StatusCode::UNAUTHORIZED,   //UNAUTHORIZED,
+            ServiceError::WebhookNotFound => StatusCode::NOT_FOUND,    //NOT FOUND,
         }
     }
 }

src/main.rs

@@ -27,6 +27,7 @@ use tracing::info;
 use tracing_actix_web::TracingLogger;
 
 mod api;
+mod conductor;
 mod ctx;
 mod db;
 mod errors;

src/page_config.rs

@@ -16,41 +16,11 @@
  */
 use std::path::Path;
 
+use libconfig::Config;
 use serde::{Deserialize, Serialize};
 
 use crate::git::{ContentType, GitFileMode};
 
-#[derive(Deserialize, Serialize, Debug, Eq, PartialEq, Clone)]
-pub struct Config {
-    pub source: Source,
-    pub domains: Option<Vec<String>>,
-    pub forms: Option<Forms>,
-    pub image_compression: Option<ImageCompression>,
-    pub redirects: Option<Vec<Redirects>>,
-}
-
-#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone)]
-pub struct Source {
-    production_branch: String,
-    staging: Option<String>,
-}
-
-#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone)]
-pub struct Forms {
-    pub enable: bool,
-}
-
-#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone)]
-pub struct ImageCompression {
-    pub enable: bool,
-}
-
-#[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone)]
-pub struct Redirects {
-    pub from: String,
-    pub to: String,
-}
-
 #[derive(Deserialize, Debug, Serialize, PartialEq, Eq)]
 struct Policy<'a> {
     rel_path: &'a str,
@@ -70,14 +40,13 @@ enum SupportedFormat {
     Toml,
 }
 
-impl Config {
 pub fn load<P: AsRef<Path>>(repo_path: &P, branch: &str) -> Option<Config> {
     const POLICIES: [Policy; 2] = [
         Policy::new("librepages.toml", SupportedFormat::Toml),
         Policy::new("librepages.json", SupportedFormat::Json),
     ];
 
-        if let Some(policy) = Self::discover(repo_path, branch, &POLICIES) {
+    if let Some(policy) = discover(repo_path, branch, &POLICIES) {
         //            let path = p.repo.as_ref().join(policy.rel_path);
         //let contents = fs::read_to_string(path).await.unwrap();
 
@@ -86,9 +55,9 @@ impl Config {
                 .unwrap();
         if let ContentType::Text(contents) = file.content {
             let res = match policy.format {
-                    SupportedFormat::Json => Self::load_json(&contents),
-                    SupportedFormat::Yaml => Self::load_yaml(&contents),
-                    SupportedFormat::Toml => Self::load_toml(&contents),
+                SupportedFormat::Json => load_json(&contents),
+                SupportedFormat::Yaml => load_yaml(&contents),
+                SupportedFormat::Toml => load_toml(&contents),
             };
 
             return Some(res);
@@ -141,7 +110,6 @@ impl Config {
 fn load_json(c: &str) -> Config {
     serde_json::from_str(c).unwrap()
 }
-}
 
 #[cfg(test)]
 mod tests {
@@ -149,6 +117,8 @@ mod tests {
     use crate::git::tests::write_file_util;
     use mktemp::Temp;
 
+    use libconfig::*;
+
     #[actix_rt::test]
     async fn page_config_test() {
         let tmp_dir = Temp::new_dir().unwrap();
@@ -167,7 +137,7 @@ mod tests {
             Some(&content),
         );
 
-        let config = Config::load(&repo_path, "master").unwrap();
+        let config = load(&repo_path, "master").unwrap();
         assert!(config.forms.as_ref().unwrap().enable);
         assert!(config.image_compression.as_ref().unwrap().enable);
         assert_eq!(config.source.production_branch, "librepages");

src/pages/dash/forgejo/add.rs

@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use std::cell::RefCell;
+
+use actix_identity::Identity;
+use actix_web::http::header::ContentType;
+use tera::Context;
+use tracing::info;
+
+use super::get_auth_middleware;
+use crate::api::v1::forgejo::AddWebhook;
+use crate::pages::errors::*;
+use crate::settings::Settings;
+use crate::AppCtx;
+
+pub use super::*;
+
+pub const DASH_FORGEJO_WEBHOOK_ADD: TemplateFile =
+    TemplateFile::new("dash_forgejo_webhook_add", "pages/dash/forgejo/add.html");
+
+pub struct Add {
+    ctx: RefCell<Context>,
+}
+
+impl CtxError for Add {
+    fn with_error(&self, e: &ReadableError) -> String {
+        self.ctx.borrow_mut().insert(ERROR_KEY, e);
+        self.render()
+    }
+}
+
+impl Add {
+    pub fn new(settings: &Settings) -> Self {
+        let ctx = RefCell::new(context(settings));
+        Self { ctx }
+    }
+
+    pub fn render(&self) -> String {
+        TEMPLATES
+            .render(DASH_FORGEJO_WEBHOOK_ADD.name, &self.ctx.borrow())
+            .unwrap()
+    }
+}
+
+#[actix_web_codegen_const_routes::get(
+    path = "PAGES.dash.forgejo_webhook.add",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "Dashboard add forgejo webhook webpage", skip(ctx))]
+pub async fn get_add_forgejo_webhook(ctx: AppCtx) -> PageResult<impl Responder, Add> {
+    let add = Add::new(&ctx.settings).render();
+    let html = ContentType::html();
+    Ok(HttpResponse::Ok().content_type(html).body(add))
+}
+
+#[actix_web_codegen_const_routes::post(
+    path = "PAGES.dash.forgejo_webhook.add",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(
+    name = "Post Dashboard add Forgejo webhook webpage",
+    skip(ctx, id, payload)
+)]
+pub async fn post_add_forgejo_webhook(
+    ctx: AppCtx,
+    id: Identity,
+    payload: web::Form<AddWebhook>,
+) -> PageResult<impl Responder, Add> {
+    let owner = id.identity().unwrap();
+    let payload = payload.into_inner();
+
+    info!(
+        "Adding webhook for Forgejo instance: {}",
+        payload.forgejo_url.as_str()
+    );
+    let hook = ctx
+        .db
+        .new_webhook(payload.forgejo_url, &owner)
+        .await
+        .map_err(|e| PageError::new(Add::new(&ctx.settings), e))?;
+
+    Ok(HttpResponse::Found()
+        .append_header((
+            http::header::LOCATION,
+            PAGES.dash.forgejo_webhook.get_view(&hook.auth_token),
+        ))
+        .finish())
+}
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    cfg.service(get_add_forgejo_webhook);
+    cfg.service(post_add_forgejo_webhook);
+}
+
+#[cfg(test)]
+mod tests {
+    use actix_web::http::StatusCode;
+    use actix_web::test;
+    use url::Url;
+
+    use crate::api::v1::forgejo::AddWebhook;
+    use crate::ctx::ArcCtx;
+    use crate::tests;
+    use crate::*;
+
+    use super::PAGES;
+
+    #[actix_rt::test]
+    async fn postgres_dashboadr_add_forgejo_webhook_works() {
+        let (_, ctx) = tests::get_ctx().await;
+        dashboadr_add_forgejo_webhook_works(ctx.clone()).await;
+    }
+
+    async fn dashboadr_add_forgejo_webhook_works(ctx: ArcCtx) {
+        const NAME: &str = "testdashwebhookforgejoadduser";
+        const EMAIL: &str = "testdashwebhookforgejoadduser@foo.com";
+        const PASSWORD: &str = "longpassword";
+
+        let _ = ctx.delete_user(NAME, PASSWORD).await;
+        let (_, signin_resp) = ctx.register_and_signin(NAME, EMAIL, PASSWORD).await;
+        let cookies = get_cookie!(signin_resp);
+        let app = get_app!(ctx.clone()).await;
+
+        let resp = get_request!(&app, PAGES.dash.forgejo_webhook.add, cookies.clone());
+        assert_eq!(resp.status(), StatusCode::OK);
+        let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
+        assert!(res.contains("Add Forgejo Webhook"));
+
+        let payload = AddWebhook {
+            forgejo_url: Url::parse("https://git.batsense.net").unwrap(),
+        };
+
+        let add_webhook = test::call_service(
+            &app,
+            post_request!(&payload, PAGES.dash.forgejo_webhook.add, FORM)
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+        assert_eq!(add_webhook.status(), StatusCode::FOUND);
+
+        let mut hooks = ctx.db.list_all_webhooks_with_owner(NAME).await.unwrap();
+        let hook = hooks.pop().unwrap();
+
+        //        let mut event = ctx.db.list(&site.hostname).await.unwrap();
+        //        let event = event.pop().unwrap();
+
+        let headers = add_webhook.headers();
+        let view_webhook_url = PAGES.dash.forgejo_webhook.get_view(&hook.auth_token);
+        assert_eq!(
+            headers.get(actix_web::http::header::LOCATION).unwrap(),
+            &view_webhook_url
+        );
+
+        // list webhooks
+        let resp = get_request!(&app, PAGES.dash.forgejo_webhook.list, cookies.clone());
+        assert_eq!(resp.status(), StatusCode::OK);
+        let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
+        assert!(res.contains(hook.forgejo_url.as_str()));
+
+        // view webhook
+        let resp = get_request!(&app, &view_webhook_url, cookies.clone());
+        assert_eq!(resp.status(), StatusCode::OK);
+        let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
+        assert!(res.contains("****"));
+        assert!(res.contains(
+            &crate::V1_API_ROUTES
+                .forgejo
+                .get_webhook_url(&ctx, &hook.auth_token)
+        ));
+
+        let show_forgejo_webhook_secret =
+            format!("{view_webhook_url}?show_forgejo_webhook_secret=true");
+        let resp = get_request!(&app, &show_forgejo_webhook_secret, cookies.clone());
+        assert_eq!(resp.status(), StatusCode::OK);
+        let res = String::from_utf8(test::read_body(resp).await.to_vec()).unwrap();
+        assert!(res.contains(&hook.forgejo_webhook_secret));
+    }
+}

src/pages/dash/forgejo/list.rs

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use std::cell::RefCell;
+
+use actix_identity::Identity;
+use actix_web::http::header::ContentType;
+
+use tera::Context;
+
+use super::get_auth_middleware;
+use crate::errors::ServiceResult;
+use crate::pages::errors::*;
+use crate::settings::Settings;
+use crate::AppCtx;
+
+pub use super::*;
+
+pub const DASH_FORGEJO_WEBHOOK_LIST: TemplateFile =
+    TemplateFile::new("dash_forgejo_webhook_list", "pages/dash/forgejo/list.html");
+
+pub struct List {
+    ctx: RefCell<Context>,
+}
+
+impl CtxError for List {
+    fn with_error(&self, e: &ReadableError) -> String {
+        self.ctx.borrow_mut().insert(ERROR_KEY, e);
+        self.render()
+    }
+}
+
+impl List {
+    pub fn new(settings: &Settings, hooks: Option<&[TemplateForgejoWebhook]>) -> Self {
+        let ctx = RefCell::new(context(settings));
+        if let Some(hooks) = hooks {
+            ctx.borrow_mut().insert(PAYLOAD_KEY, hooks);
+        }
+        Self { ctx }
+    }
+
+    pub fn render(&self) -> String {
+        TEMPLATES
+            .render(DASH_FORGEJO_WEBHOOK_LIST.name, &self.ctx.borrow())
+            .unwrap()
+    }
+}
+
+async fn get_webhook_data(
+    ctx: &AppCtx,
+    id: &Identity,
+) -> ServiceResult<Vec<TemplateForgejoWebhook>> {
+    let db_hooks = ctx
+        .db
+        .list_all_webhooks_with_owner(&id.identity().unwrap())
+        .await?;
+    let mut hooks = Vec::with_capacity(db_hooks.len());
+    for hook in db_hooks {
+        hooks.push(TemplateForgejoWebhook::new(ctx, hook));
+    }
+    Ok(hooks)
+}
+
+#[actix_web_codegen_const_routes::get(
+    path = "PAGES.dash.forgejo_webhook.list",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "List all Forgejo webhooks", skip(ctx, id))]
+pub async fn list_hooks(ctx: AppCtx, id: Identity) -> PageResult<impl Responder, List> {
+    let sites = get_webhook_data(&ctx, &id)
+        .await
+        .map_err(|e| PageError::new(List::new(&ctx.settings, None), e))?;
+    let home = List::new(&ctx.settings, Some(&sites)).render();
+    let html = ContentType::html();
+    Ok(HttpResponse::Ok().content_type(html).body(home))
+}
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    cfg.service(list_hooks);
+}

src/pages/dash/forgejo/mod.rs

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use actix_web::*;
+use serde::{Deserialize, Serialize};
+
+use super::get_auth_middleware;
+pub use super::home::TemplateSite;
+pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
+
+use crate::ctx::Ctx;
+use crate::db::ForgejoWebhook;
+
+pub mod add;
+pub mod list;
+pub mod view;
+
+pub fn register_templates(t: &mut tera::Tera) {
+    add::DASH_FORGEJO_WEBHOOK_ADD
+        .register(t)
+        .expect(add::DASH_FORGEJO_WEBHOOK_ADD.name);
+    list::DASH_FORGEJO_WEBHOOK_LIST
+        .register(t)
+        .expect(list::DASH_FORGEJO_WEBHOOK_LIST.name);
+
+    view::DASH_FORGEJO_WEBHOOK_VIEW
+        .register(t)
+        .expect(view::DASH_FORGEJO_WEBHOOK_VIEW.name);
+}
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    add::services(cfg);
+    list::services(cfg);
+    view::services(cfg);
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, Eq, PartialEq)]
+pub struct TemplateForgejoWebhook {
+    pub webhook: ForgejoWebhook,
+    pub view: String,
+    pub url: String,
+}
+
+impl TemplateForgejoWebhook {
+    pub fn new(ctx: &Ctx, hook: ForgejoWebhook) -> Self {
+        let view = PAGES.dash.forgejo_webhook.get_view(&hook.auth_token);
+        let url = crate::V1_API_ROUTES
+            .forgejo
+            .get_webhook_url(ctx, &hook.auth_token);
+        Self {
+            webhook: hook,
+            view,
+            url,
+        }
+    }
+}

src/pages/dash/forgejo/view.rs

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2022  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use std::cell::RefCell;
+
+use actix_identity::Identity;
+use actix_web::http::header::ContentType;
+use serde::{Deserialize, Serialize};
+use tera::Context;
+
+use super::get_auth_middleware;
+
+use crate::pages::errors::*;
+use crate::settings::Settings;
+use crate::AppCtx;
+
+pub use super::*;
+
+pub const DASH_FORGEJO_WEBHOOK_VIEW: TemplateFile =
+    TemplateFile::new("dash_forgejo_webhook_view", "pages/dash/forgejo/view.html");
+
+const SHOW_FORGEJO_WEBHOOK_SECRET_KEY: &str = "show_forgejo_webhook_secret";
+
+pub struct View {
+    ctx: RefCell<Context>,
+}
+
+impl CtxError for View {
+    fn with_error(&self, e: &ReadableError) -> String {
+        self.ctx.borrow_mut().insert(ERROR_KEY, e);
+        self.render()
+    }
+}
+
+impl View {
+    pub fn new(settings: &Settings, payload: Option<TemplateForgejoWebhook>) -> Self {
+        let ctx = RefCell::new(context(settings));
+        if let Some(payload) = payload {
+            ctx.borrow_mut().insert(PAYLOAD_KEY, &payload);
+        }
+
+        Self { ctx }
+    }
+
+    pub fn show_forgejo_webhook_secret(&mut self) {
+        self.ctx
+            .borrow_mut()
+            .insert(SHOW_FORGEJO_WEBHOOK_SECRET_KEY, &true);
+    }
+
+    pub fn render(&self) -> String {
+        TEMPLATES
+            .render(DASH_FORGEJO_WEBHOOK_VIEW.name, &self.ctx.borrow())
+            .unwrap()
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
+pub struct ViewOptions {
+    show_forgejo_webhook_secret: Option<bool>,
+}
+
+#[actix_web_codegen_const_routes::get(
+    path = "PAGES.dash.forgejo_webhook.view",
+    wrap = "get_auth_middleware()"
+)]
+#[tracing::instrument(name = "Dashboard Forgejo webhook webpage", skip(ctx, id))]
+pub async fn get_view_site(
+    ctx: AppCtx,
+    id: Identity,
+    path: web::Path<String>,
+    query: web::Query<ViewOptions>,
+) -> PageResult<impl Responder, View> {
+    let auth_token = path.into_inner();
+    let owner = id.identity().unwrap();
+
+    let hook = ctx
+        .db
+        .get_webhook_with_owner(&auth_token, &owner)
+        .await
+        .map_err(|e| PageError::new(View::new(&ctx.settings, None), e))?;
+
+    let payload = TemplateForgejoWebhook::new(&ctx, hook);
+    let mut page = View::new(&ctx.settings, Some(payload));
+    if let Some(true) = query.show_forgejo_webhook_secret {
+        page.show_forgejo_webhook_secret();
+    }
+    let add = page.render();
+    let html = ContentType::html();
+    Ok(HttpResponse::Ok().content_type(html).body(add))
+}
+
+pub fn services(cfg: &mut web::ServiceConfig) {
+    cfg.service(get_view_site);
+}

src/pages/dash/mod.rs

@@ -24,6 +24,7 @@ pub use super::{context, Footer, TemplateFile, PAGES, PAYLOAD_KEY, TEMPLATES};
 use crate::db::Event;
 use crate::db::LibrePagesEvent;
 
+pub mod forgejo;
 pub mod home;
 pub mod sites;
 
@@ -49,9 +50,11 @@ impl From<LibrePagesEvent> for TemplateSiteEvent {
 pub fn register_templates(t: &mut tera::Tera) {
     home::DASH_HOME.register(t).expect(home::DASH_HOME.name);
     sites::register_templates(t);
+    forgejo::register_templates(t);
 }
 
 pub fn services(cfg: &mut web::ServiceConfig) {
     home::services(cfg);
     sites::services(cfg);
+    forgejo::services(cfg);
 }

src/pages/routes.rs

@@ -72,6 +72,7 @@ pub struct Dash {
     /// home route
     pub home: &'static str,
     pub site: DashSite,
+    pub forgejo_webhook: ForgejoWebhook,
 }
 
 impl Dash {
@@ -79,7 +80,37 @@ impl Dash {
     pub const fn new() -> Dash {
         let home = "/dash";
         let site = DashSite::new();
-        Dash { home, site }
+        let forgejo_webhook = ForgejoWebhook::new();
+        Dash {
+            home,
+            site,
+            forgejo_webhook,
+        }
+    }
+}
+
+#[derive(Serialize)]
+/// Dashboard ForgejoWebhook routes
+pub struct ForgejoWebhook {
+    /// add forgejo webhook route
+    pub add: &'static str,
+    /// view forgejo webhook route
+    pub view: &'static str,
+    /// list forgejo webhooks route
+    pub list: &'static str,
+}
+
+impl ForgejoWebhook {
+    /// create new instance of ForgejoWebhook route
+    pub const fn new() -> ForgejoWebhook {
+        let add = "/dash/forgejo/webhook/add";
+        let list = "/dash/forgejo/webhook/list";
+        let view = "/dash/forgejo/webhook/view/{auth_token}";
+        ForgejoWebhook { add, view, list }
+    }
+
+    pub fn get_view(&self, auth_token: &str) -> String {
+        self.view.replace("{auth_token}", auth_token)
     }
 }
 

src/settings.rs

@@ -82,6 +82,14 @@ pub struct Settings {
     pub source_code: String,
     pub database: Database,
     pub page: PageConfig,
+    pub conductors: Vec<Conductor>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Conductor {
+    pub username: String,
+    pub api_key: String,
+    pub url: Url,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -128,15 +136,6 @@ impl Settings {
             Err(e) => warn!("couldn't interpret PORT: {}", e),
         }
 
-        if let Ok(val) = env::var("DATABASE_URL") {
-            let url = Url::parse(&val).expect("couldn't parse Database URL");
-            s = s.set_override("database.url", url.to_string()).unwrap();
-            let database_type = DBType::from_url(&url).unwrap();
-            s = s
-                .set_override("database.database_type", database_type.to_string())
-                .unwrap();
-        }
-
         let intermediate_config = s.build_cloned().unwrap();
 
         s = s
@@ -163,6 +162,15 @@ impl Settings {
             )
             .expect("Couldn't set database url");
 
+        if let Ok(val) = env::var("DATABASE_URL") {
+            let url = Url::parse(&val).expect("couldn't parse Database URL");
+            s = s.set_override("database.url", url.to_string()).unwrap();
+            let database_type = DBType::from_url(&url).unwrap();
+            s = s
+                .set_override("database.database_type", database_type.to_string())
+                .unwrap();
+        }
+
         let settings = s.build()?.try_deserialize::<Settings>()?;
         settings.check_url();
 

src/tests.rs

@@ -24,6 +24,7 @@ use actix_web::{
 };
 use mktemp::Temp;
 use serde::Serialize;
+use url::Url;
 
 use crate::ctx::api::v1::auth::{Login, Register};
 use crate::ctx::api::v1::pages::AddSite;
@@ -33,13 +34,22 @@ use crate::page::Page;
 use crate::settings::Settings;
 use crate::*;
 
-pub const REPO_URL: &str = "http://localhost:8080/mCaptcha/website/";
+pub const REPO_URL: &str = "https://github.com/mCaptcha/website/";
 pub const BRANCH: &str = "gh-pages";
 
 pub async fn get_ctx() -> (Temp, Arc<Ctx>) {
     // mktemp::Temp is returned because the temp directory created
     // is removed once the variable goes out of scope
     let mut settings = Settings::new().unwrap();
+    let mut db_url = Url::parse(&settings.database.url).unwrap();
+    db_url.set_path(&crate::utils::get_random(8));
+    settings.database.url = db_url.to_string();
+
+    use sqlx::migrate::MigrateDatabase;
+    //    sqlx::Postgres::create_database(&settings.database.url).await.unwrap();
+    sqlx::postgres::Postgres::create_database(&settings.database.url)
+        .await
+        .unwrap();
 
     let tmp_dir = Temp::new_dir().unwrap();
     println!("[log] Test temp directory: {}", tmp_dir.to_str().unwrap());
@@ -48,8 +58,10 @@ pub async fn get_ctx() -> (Temp, Arc<Ctx>) {
     settings.init();
     println!("[log] Initialzing settings again with test config");
     settings.init();
+    let ctx = Ctx::new(settings).await;
+    ctx.db.migrate().await.unwrap();
 
-    (tmp_dir, Ctx::new(settings).await)
+    (tmp_dir, ctx)
 }
 
 #[allow(dead_code, clippy::upper_case_acronyms)]

templates/components/nav/auth.html

@@ -16,6 +16,11 @@
     <div class="nav__link-container">
       <a class="nav__link" rel="noreferrer" href="{{ page.dash.site.add }}">New Site</a>
     </div>
+
+    <div class="nav__link-container">
+      <a class="nav__link" rel="noreferrer" href="{{ page.dash.forgejo_webhook.list }}">Webhooks</a>
+    </div>
+
     <div class="nav__link-container">
       <a class="nav__link" rel="noreferrer" href="{{ page.auth.logout }}">Log out</a>
     </div>

templates/pages/dash/forgejo/add.html

@@ -0,0 +1,23 @@
+{% extends 'base' %}{% block title %} Add Forgejo Webhook{% endblock title %} {% block nav
+%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
+
+<main class="sites__main">
+  <div class="add-site__container">
+    <form class="auth-form" action="{{ page.dash.forgejo_webhook.add }}" method="POST">
+      <label class="auth-form__label" for="forgejo_url">
+        Forgejo instance URL
+        <input
+          type="url"
+          name="forgejo_url"
+          id="forgejo_url"
+          class="auth-form__input"
+        />
+      </label>
+      <div class="auth-form__action-container">
+        <button class="auth-form__submit" type="submit">Add Webhook</button>
+      </div>
+    </form>
+  </div>
+</main>
+
+{% endblock main %}

templates/pages/dash/forgejo/list.html

@@ -0,0 +1,33 @@
+{% extends 'base' %}{% block title %} Forgejo Webhooks{% endblock title %} {% block nav
+%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
+
+<main class="sites__main">
+  <div class="sites__collection">
+    <div class="sites__actions">
+      <a class="sites__actions__new-site" href="{{ page.dash.forgejo_webhook.add }}">
+        <button>Add New Forgejo Webhook</button>
+      </a>
+    </div>
+    {% if payload|length > 0 %}
+      {% for hook in payload %}
+        <a href="{{ hook.view }}" class="site__container">
+          <div class="site__info--head">
+            <img
+              class="site__container--preview"
+              src="{{ hook.webhook.forgejo_url }}/favicon.ico"
+              alt="Webhook icon"
+            />
+            <div class="site__info--column">
+              <p><b>{{ hook.webhook.forgejo_url }}</b></p>
+              <p>Forgejo instance {{ hook.webhook.forgejo_url }}</p>
+            </div>
+          </div>
+        </a>
+      {% endfor %}
+    {% else %}
+    <p class="sites__banner">Nothing to show, click <a href="{{page.dash.forgejo_webhook.add}}">here</a> to add new Forgejo webhook!</p>
+    {% endif %}
+  </div>
+</main>
+
+{% endblock main %}

templates/pages/dash/forgejo/view.html

@@ -0,0 +1,32 @@
+{% extends 'base' %}{% block title %} {{ payload.webhook.forgejo_url }}{% endblock title %} {% block nav
+%} {% include "auth_nav" %} {% endblock nav %} {% block main %}
+
+<main class="sites__main">
+  <div class="add-site__container">
+    <section>
+      <table>
+        <tr>
+          <th>Webhook URL</th>
+          <td>{{ payload.url }}</td>
+        </tr>
+
+        <tr>
+          <th>Secret</th>
+          <td>
+            {% if show_forgejo_webhook_secret %} 
+              {{ payload.webhook.forgejo_webhook_secret }} <a href="{{ payload.view }}">Hide</a>
+            {% else %}
+            ****
+              <a href="{{ payload.view }}?show_forgejo_webhook_secret=true">
+                Show
+              </a>
+            {% endif %}
+          </td>
+        </tr>
+
+      </table>
+    </section>
+  </div>
+</main>
+
+{% endblock main %}

templates/pages/dash/index.html

@@ -15,7 +15,7 @@
             <img
               class="site__container--preview"
               src="{{ deployment.site.hostname }}/favicon.ico"
-              alt="{{ deployment.site.hostname }}'s favicon"
+              alt="Website icon"
             />
             <div class="site__info--column">
               <p><b>{{ deployment.site.hostname }}</b></p>

utils/cache-bust/Cargo.lock

@@ -72,7 +72,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.94",
 ]
 
 [[package]]
@@ -83,7 +83,7 @@ checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 1.0.94",
 ]
 
 [[package]]
@@ -110,7 +110,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.94",
 ]
 
 [[package]]
@@ -120,7 +120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.94",
 ]
 
 [[package]]
@@ -167,6 +167,21 @@ version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
 
+[[package]]
+name = "librepages"
+version = "0.1.0"
+dependencies = [
+ "cache-buster",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -183,29 +198,20 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "pages"
-version = "0.1.0"
-dependencies = [
- "cache-buster",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.38"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.18"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -227,31 +233,32 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.81"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -284,6 +291,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -299,6 +317,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.3"

utils/cache-bust/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "pages"
+name = "librepages"
 version = "0.1.0"
 edition = "2021"
-homepage = "https://github.com/realaravinth/pages"
-repository = "https://github.com/realaravinth/pages"
-documentation = "https://github.con/realaravinth/pages"
-readme = "https://github.com/realaravinth/pages/blob/master/README.md"
+homepage = "https://git.batsense.net/LibrePages/librepages"
+repository = "https://git.batsense.net/LibrePages/librepages"
+documentation = "https://github.con/realaravinth/librepages"
+readme = "https://git.batsense.net/LibrePages/librepages/blob/master/README.md"
 license = "AGPLv3 or later version"
 authors = ["realaravinth <realaravinth@batsense.net>"]