fix: copy OpenAPI build from build container to final container

fixes: https://github.com/mCaptcha/mCaptcha/issues/59
Merge pull request #52 from Gusted/close-register-page
2026-02-12 02:25:41 +00:00 · 2023-01-17 03:54:54 +05:30 · 2022-11-07 13:39:34 +05:30 · 2022-11-06 19:42:22 +01:00 · 2022-10-24 22:47:07 +02:00 · 2022-10-24 21:22:34 +05:30
14 changed files with 347 additions and 85 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -81,6 +81,12 @@ jobs:
            target
          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

+      - name: configure GPG key
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'mCaptcha/mCaptcha'
+        run: echo -n "$RELEASE_BOT_GPG_SIGNING_KEY" | gpg --batch --import --pinentry-mode loopback
+        env:
+          RELEASE_BOT_GPG_SIGNING_KEY: ${{ secrets.RELEASE_BOT_GPG_SIGNING_KEY }}
+
      - name: load env
        run: |
          source .env_sample \
@@ -133,6 +139,13 @@ jobs:
        if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'mCaptcha/mCaptcha'
        run: make docker-publish

+      - name: publish bins
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'mCaptcha/mCaptcha'
+        run: ./scripts/publish.sh publish master latest $DUMBSERVE_PASSWORD
+        env:
+          DUMBSERVE_PASSWORD: ${{ secrets.DUMBSERVE_PASSWORD }}
+          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+
      - name: generate documentation
        if: matrix.version == 'stable' && (github.repository == 'mCaptcha/mCaptcha')
        run: make doc
--- a/.github/workflows/tagged-release.yml
+++ b/.github/workflows/tagged-release.yml
@@ -0,0 +1,32 @@
+name: Create binary for release
+
+# Only on tags that start with a "v"
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: x86_64-pc-windows-gnu
+            archive: zip
+          - target: x86_64-unknown-linux-musl
+            archive: tar.gz tar.xz
+          - target: x86_64-apple-darwin
+            archive: zip
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Compile and release
+        uses: rust-build/rust-build.action@v1.3.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          RUSTTARGET: ${{ matrix.target }}
+          ARCHIVE_TYPES: ${{ matrix.archive }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,9 +117,9 @@ dependencies = [
 "actix-utils",
 "actix-web",
 "futures-util",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
- "time 0.3.12",
+ "time 0.3.13",
 ]

 [[package]]
@@ -143,7 +143,7 @@ dependencies = [
 "http",
 "log",
 "regex",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -244,12 +244,12 @@ dependencies = [
 "once_cell",
 "pin-project-lite",
 "regex",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "serde_urlencoded",
 "smallvec",
 "socket2",
- "time 0.3.12",
+ "time 0.3.13",
 "url",
 ]

@@ -475,7 +475,7 @@ dependencies = [
 "percent-encoding",
 "pin-project-lite",
 "rand",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "serde_urlencoded",
 "tokio",
@@ -505,7 +505,7 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
 dependencies = [
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -600,7 +600,7 @@ dependencies = [
 "derive_builder 0.11.1",
 "mime",
 "mime_guess",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "sha2 0.10.2",
 "walkdir",
@@ -632,9 +632,9 @@ dependencies = [

 [[package]]
 name = "combine"
-version = "4.6.4"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
 "bytes",
 "futures-core",
@@ -653,7 +653,7 @@ dependencies = [
 "lazy_static",
 "nom 5.1.2",
 "rust-ini",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde-hjson",
 "serde_json",
 "toml",
@@ -698,7 +698,7 @@ dependencies = [
 "rand",
 "sha2 0.10.2",
 "subtle",
- "time 0.3.12",
+ "time 0.3.13",
 "version_check",
 ]

@@ -863,7 +863,7 @@ version = "0.1.0"
 dependencies = [
 "async-trait",
 "libmcaptcha",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "thiserror",
 "url",
@@ -1043,7 +1043,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
 dependencies = [
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -1058,9 +1058,9 @@ dependencies = [

 [[package]]
 name = "email_address"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8684b7c9cb4857dfa1e5b9629ef584ba618c9b93bae60f58cb23f4f271d0468e"
+checksum = "b1b32a7a2580c4473f10f66b512c34bdd7d33c5e3473227ca833abdb5afe4809"

 [[package]]
 name = "encoding_rs"
@@ -1593,20 +1593,20 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.127"
+version = "0.2.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
+checksum = "64de3cc433455c14174d42e554d4027ee631c4d046d43e3ecc6efc4636cdc7a7"

 [[package]]
 name = "libm"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145"
+checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"

 [[package]]
 name = "libmcaptcha"
 version = "0.2.2"
-source = "git+https://github.com/mCaptcha/libmcaptcha?tag=0.2.2#62841b383e3406113fb1ff1db67ee6aeafd8aaf4"
+source = "git+https://github.com/mCaptcha/libmcaptcha?branch=master#4efe8cdfee94766dd85647ad6f1ecc1b486b40a7"
 dependencies = [
 "actix",
 "crossbeam-channel",
@@ -1618,7 +1618,7 @@ dependencies = [
 "pretty_env_logger",
 "rand",
 "redis",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "tokio",
 ]
@@ -1741,7 +1741,7 @@ dependencies = [
 "rand",
 "rust-embed",
 "sailfish",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "sqlx",
 "tokio",
@@ -1887,7 +1887,7 @@ dependencies = [
 "autocfg",
 "num-integer",
 "num-traits 0.2.15",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -1914,7 +1914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
 dependencies = [
 "num-traits 0.2.15",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -1947,7 +1947,7 @@ dependencies = [
 "autocfg",
 "num-integer",
 "num-traits 0.2.15",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -2222,7 +2222,7 @@ dependencies = [
 "bincode",
 "derive_builder 0.11.1",
 "num",
- "serde 1.0.142",
+ "serde 1.0.143",
 "sha2 0.10.2",
 ]

@@ -2234,7 +2234,7 @@ dependencies = [
 "bincode",
 "derive_builder 0.11.1",
 "num",
- "serde 1.0.142",
+ "serde 1.0.143",
 "sha2 0.10.2",
 ]

@@ -2565,7 +2565,7 @@ dependencies = [
 "memchr",
 "proc-macro2",
 "quote",
- "serde 1.0.142",
+ "serde 1.0.143",
 "syn",
 "toml",
 ]
@@ -2667,9 +2667,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"

 [[package]]
 name = "serde"
-version = "1.0.142"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2"
+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
 dependencies = [
 "serde_derive",
 ]
@@ -2688,9 +2688,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.142"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e"
+checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2705,7 +2705,7 @@ checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
 dependencies = [
 "itoa 1.0.3",
 "ryu",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -2717,7 +2717,7 @@ dependencies = [
 "form_urlencoded",
 "itoa 1.0.3",
 "ryu",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -2898,7 +2898,7 @@ dependencies = [
 "rand",
 "rsa",
 "rustls",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "sha-1",
 "sha2 0.10.2",
@@ -2928,7 +2928,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_json",
 "sha2 0.10.2",
 "sqlx-core",
@@ -2986,7 +2986,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
 "proc-macro2",
 "quote",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_derive",
 "syn",
 ]
@@ -3000,7 +3000,7 @@ dependencies = [
 "base-x",
 "proc-macro2",
 "quote",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_derive",
 "serde_json",
 "sha1 0.6.1",
@@ -3024,7 +3024,7 @@ dependencies = [
 "parking_lot 0.12.1",
 "phf_shared",
 "precomputed-hash",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -3143,12 +3143,11 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f"
+checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45"
 dependencies = [
 "itoa 1.0.3",
- "js-sys",
 "libc",
 "num_threads",
 "time-macros 0.2.4",
@@ -3284,7 +3283,7 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
@@ -3382,14 +3381,14 @@ dependencies = [
 "idna",
 "matches",
 "percent-encoding",
- "serde 1.0.142",
+ "serde 1.0.143",
 ]

 [[package]]
 name = "urlencoding"
-version = "2.1.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
+checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"

 [[package]]
 name = "utf-8"
@@ -3406,7 +3405,7 @@ dependencies = [
 "idna",
 "lazy_static",
 "regex",
- "serde 1.0.142",
+ "serde 1.0.143",
 "serde_derive",
 "serde_json",
 "url",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,8 @@ log = "0.4"
 lazy_static = "1.4"


-libmcaptcha = { version = "0.2.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"], tag ="0.2.2" }
+#libmcaptcha = { version = "0.2.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"], tag ="0.2.2" }
+libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
 #libmcaptcha = { path = "../libmcaptcha", features = ["full"]}

 rand = "0.8"
--- a/1
+++ b/1
@@ -38,6 +38,7 @@ COPY --from=cacher /src/target target
 #COPY --from=cacher /src/db/db-migrations/target /src/db/db-migrations/target 
 #COPY --from=cacher /src/utils/cache-bust/target /src/utils/cache-bust/target 
 COPY --from=frontend /src/static/cache/bundle/ /src/static/cache/bundle/
+COPY --from=frontend /src/docs/openapi/dist/ /src/docs/openapi/dist/
 RUN cargo --version
 RUN make cache-bust
 RUN cargo build --release
--- a/db/db-core/Cargo.toml
+++ b/db/db-core/Cargo.toml
@@ -13,7 +13,8 @@ async-trait = "0.1.51"
 thiserror = "1.0.30"
 serde = { version = "1", features = ["derive"]}
 url = { version  = "2.2.2", features = ["serde"] }
-libmcaptcha = {  version = "0.2.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["minimal"], default-features = false, tag = "0.2.2"}
+#libmcaptcha = {  version = "0.2.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["minimal"], default-features = false, tag = "0.2.2"}
+libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }

 [features]
 default = []
--- a/db/db-sqlx-maria/src/lib.rs
+++ b/db/db-sqlx-maria/src/lib.rs
@@ -73,9 +73,6 @@ impl Connect for ConnectionOptions {
                if fresh.disable_logging {
                    connect_options.disable_statement_logging();
                }
-                sqlx::mysql::MySqlConnectOptions::from_str(&fresh.url)
-                    .unwrap()
-                    .disable_statement_logging();
                fresh
                    .pool_options
                    .connect_with(connect_options)
--- a/db/db-sqlx-postgres/src/lib.rs
+++ b/db/db-sqlx-postgres/src/lib.rs
@@ -73,9 +73,6 @@ impl Connect for ConnectionOptions {
                if fresh.disable_logging {
                    connect_options.disable_statement_logging();
                }
-                sqlx::postgres::PgConnectOptions::from_str(&fresh.url)
-                    .unwrap()
-                    .disable_statement_logging();
                fresh
                    .pool_options
                    .connect_with(connect_options)
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+# 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/>.
+
+# publish.sh: grab bin from docker container, pack, sign and upload
+# $2: binary version
+# $3: Docker img tag
+# $4: dumbserve password
+
+set -xEeuo  pipefail
+
+DUMBSERVE_USERNAME=mcaptcha
+DUMBSERVE_PASSWORD=$4
+DUMBSERVE_HOST="https://$DUMBSERVE_USERNAME:$DUMBSERVE_PASSWORD@dl.mcaptcha.org"
+
+NAME=mcaptcha
+KEY=0CBABF3084E84E867A76709750BE39D10ECE01FB
+
+TMP_DIR=$(mktemp -d)
+FILENAME="$NAME-$2-linux-amd64"
+TARBALL=$FILENAME.tar.gz
+TARGET_DIR="$TMP_DIR/$FILENAME/"
+mkdir -p $TARGET_DIR
+DOCKER_IMG="mcaptcha/$NAME:$3"
+
+
+get_bin(){
+	echo "[*] Grabbing binary"
+	container_id=$(docker create $DOCKER_IMG)
+	docker cp $container_id:/usr/local/bin/$NAME $TARGET_DIR/
+	docker rm -v $container_id
+}
+
+copy() {
+	echo "[*] Copying dist assets"
+	cp README.md  $TARGET_DIR
+	cp LICENSE.md $TARGET_DIR
+	cp CHANGELOG.md $TARGET_DIR
+	cp docker-compose.yml $TARGET_DIR
+
+	mkdir $TARGET_DIR/docs
+	cp docs/DEPLOYMENT.md $TARGET_DIR/docs
+	cp docs/CONFIGURATION.md $TARGET_DIR/docs
+
+	get_bin
+}
+
+
+
+pack() {
+	echo "[*] Creating dist tarball"
+	pushd $TMP_DIR
+	tar -cvzf $TARBALL $FILENAME
+	popd
+}
+
+checksum() {
+	echo "[*] Generating dist tarball checksum"
+	pushd $TMP_DIR
+	sha256sum $TARBALL > $TARBALL.sha256
+	popd
+}
+
+sign() {
+	echo "[*] Signing dist tarball checksum"
+	pushd $TMP_DIR
+	export GPG_TTY=$(tty)
+	gpg --verbose \
+		--pinentry-mode loopback \
+		--batch --yes \
+		--passphrase $GPG_PASSWORD \
+		--local-user $KEY \
+		--output $TARBALL.asc \
+		--sign --detach \
+		--armor $TARBALL
+	popd
+}
+
+delete_dir() {
+	curl --location --request DELETE "$DUMBSERVE_HOST/api/v1/files/delete" \
+		--header 'Content-Type: application/json' \
+		--data-raw "{
+			\"path\": \"$1\"
+		}"
+}
+
+upload_dist() {
+	upload_dir="mCaptcha/$1"
+	delete_dir $upload_dir
+
+	pushd $TMP_DIR
+	for file in $TARBALL $TARBALL.asc $TARBALL.sha256
+	do
+		curl -v \
+			-F upload=@$file  \
+			"$DUMBSERVE_HOST/api/v1/files/upload?path=$upload_dir"
+	done
+	popd
+}
+
+publish() {
+	copy
+	pack
+	checksum
+	sign
+	upload_dist $2
+}
+
+$1 $@
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -14,8 +14,8 @@
 * 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::env;
 use std::path::Path;
+use std::{env, fs};

 use config::{Config, ConfigError, Environment, File};
 use derive_more::Display;
@@ -152,25 +152,34 @@ impl Settings {
            .expect("unable to set capatcha.enable_stats default config");

        if let Ok(path) = env::var("MCAPTCHA_CONFIG") {
-            s.merge(File::with_name(&path))?;
+            let absolute_path = Path::new(&path).canonicalize().unwrap();
+            log::info!(
+                "Loading config file from {}",
+                absolute_path.to_str().unwrap()
+            );
+            s.merge(File::with_name(absolute_path.to_str().unwrap()))?;
        } else if Path::new(CURRENT_DIR).exists() {
+            let absolute_path = fs::canonicalize(CURRENT_DIR).unwrap();
+            log::info!(
+                "Loading config file from {}",
+                absolute_path.to_str().unwrap()
+            );
            // merging default config from file
-            s.merge(File::with_name(CURRENT_DIR))?;
+            s.merge(File::with_name(absolute_path.to_str().unwrap()))?;
        } else if Path::new(ETC).exists() {
+            log::info!("{}", format!("Loading config file from {}", ETC));
            s.merge(File::with_name(ETC))?;
        } else {
-            log::warn!("configuration file not found");
+            log::warn!("Configuration file not found");
        }

        s.merge(Environment::with_prefix("MCAPTCHA").separator("_"))?;

        check_url(&s);

-        match env::var("PORT") {
-            Ok(val) => {
-                s.set("server.port", val).unwrap();
-            }
-            Err(e) => warn!("couldn't interpret PORT: {}", e),
+        if let Ok(val) = env::var("PORT") {
+            s.set("server.port", val).unwrap();
+            log::info!("Overriding [server].port with environment variable");
        }

        match env::var("DATABASE_URL") {
@@ -180,6 +189,7 @@ impl Settings {
                let database_type = DBType::from_url(&url).unwrap();
                s.set("database.database_type", database_type.to_string())
                    .unwrap();
+                log::info!("Overriding [database].url and [database].database_type with environment variable");
            }
            Err(e) => {
                set_database_url(&mut s);
@@ -215,8 +225,11 @@ fn set_database_url(s: &mut Config) {
            r"postgres://{}:{}@{}:{}/{}",
            s.get::<String>("database.username")
                .expect("Couldn't access database username"),
-            s.get::<String>("database.password")
-                .expect("Couldn't access database password"),
+            urlencoding::encode(
+                s.get::<String>("database.password")
+                    .expect("Couldn't access database password")
+                    .as_str()
+            ),
            s.get::<String>("database.hostname")
                .expect("Couldn't access database hostname"),
            s.get::<String>("database.port")
--- a/templates/auth/register/index.html
+++ b/templates/auth/register/index.html
@@ -8,6 +8,16 @@
    class="auth__logo" alt="mcaptcha logo" />


+    <. if !crate::SETTINGS.allow_registration { .>
+      <table class="reg-closed__table">
+        <thead class="reg-closed__table-heading">
+          <tr><th colspan="4" class="reg-closed__table-title-text">Registration closed</th></tr>
+        </thead>
+        <tbody class="reg-closed__body">
+          <tr><td class="reg-closed__body-text">This mCaptcha instance is closed for registrations.</td></tr>
+        </tbody>
+      </table>
+    <. } else {.>
  <form
 	  method="POST"
 	  action="<.= crate::V1_API_ROUTES.auth.register .>"
@@ -73,5 +83,6 @@
      <a href="<.= crate::PAGES.auth.login .>" class="auth__secondary-action__link">Log in</a>
    </p>
 	<. include!("../demo-user-banner.html"); .>
+  <. } .>
 </div>
 <. include!("../../components/footers.html"); .>
--- a/templates/auth/register/main.scss
+++ b/templates/auth/register/main.scss
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Gusted <postmaster@gusted.xyz>
+ *
+ * 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/>.
+ */
+
+@import '../../components/table/main';
+
+.reg-closed__table {
+  @include table;
+  margin: auto;
+}
+
+.reg-closed__table-title-text {
+  @include table__title-text;
+}
+
+.reg-closed__body-text {
+  display: block;
+  margin: 0.5em 0;
+}
--- a/templates/widget/index.html
+++ b/templates/widget/index.html
@@ -19,11 +19,12 @@
 		<span id="widget__verification-text--before">I'm not a robot</span>
 		<span id="widget__verification-text--during">Processing...</span>
 		<span id="widget__verification-text--after">Verified!</span>
-		<span id="widget__verification-text--error">Something wen't wrong</span>
+		<span id="widget__verification-text--error">Something went wrong</span>
      </label>
      <div class="widget__mcaptcha-details">
        <a href="<.= crate::PKG_HOMEPAGE .>" 
 			class="widget__mcaptcha-logo-container"
+			target="_blank"
 		 >
          <img
            class="widget__mcaptcha-logo"
@@ -33,12 +34,14 @@
          <p class="widget__mcaptcha-brand-name">mCaptcha</p>
        </a>
        <div class="widget__mcaptcha-info-container">
-			<a class="widget__mcaptcha-info-link"
-			 href="<.= crate::PKG_HOMEPAGE .><.= crate::PAGES.privacy .>">
+		  <a class="widget__mcaptcha-info-link"
+			target="_blank"
+			href="<.= crate::PKG_HOMEPAGE .><.= crate::PAGES.privacy .>">
            Privacy
          </a>
 		  <a class="widget__mcaptcha-info-link"
-			  href="<.= crate::PKG_HOMEPAGE .><.= crate::PAGES.security .>">
+		  	target="_blank"
+			href="<.= crate::PKG_HOMEPAGE .><.= crate::PAGES.security .>">
            Terms
          </a>
        </div>
--- a/yarn.lock
+++ b/yarn.lock
@@ -533,6 +533,46 @@
    "@types/yargs" "^16.0.0"
    chalk "^4.0.0"

+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@mcaptcha/core-glue@^0.1.0-alpha-3":
  version "0.1.0-alpha-3"
  resolved "https://registry.yarnpkg.com/@mcaptcha/core-glue/-/core-glue-0.1.0-alpha-3.tgz#16c11cb3751b6421999353dc10c032afd08ffa8b"
@@ -1079,9 +1119,9 @@ acorn@^7.1.1:
  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==

 acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
-  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==

 agent-base@6:
  version "6.0.2"
@@ -3830,9 +3870,9 @@ nanocolors@^0.1.12:
  integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==

 nanoid@^3.1.28:
-  version "3.1.29"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.29.tgz#214fb2d7a33e1a5bef4757b779dfaeb6a4e5aeb4"
-  integrity sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==

 natural-compare@^1.4.0:
  version "1.4.0"
@@ -4809,9 +4849,9 @@ source-map-js@^0.6.2:
  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==

 source-map-support@^0.5.6, source-map-support@~0.5.20:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
  dependencies:
    buffer-from "^1.0.0"
    source-map "^0.6.0"
@@ -4826,7 +4866,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

-source-map@^0.7.3, source-map@~0.7.2:
+source-map@^0.7.3:
  version "0.7.3"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -5017,12 +5057,13 @@ terser-webpack-plugin@^5.1.3:
    terser "^5.7.2"

 terser@^5.7.2:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351"
-  integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
  dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
    commander "^2.20.0"
-    source-map "~0.7.2"
    source-map-support "~0.5.20"

 test-exclude@^6.0.0:
Author	SHA1	Message	Date
Aravinth Manivannan	cadc15a7a1	fix: copy OpenAPI build from build container to final container fixes: https://github.com/mCaptcha/mCaptcha/issues/59	2023-01-17 03:54:54 +05:30
Aravinth Manivannan	c1f6ce3ae2	Merge pull request #52 from Gusted/close-register-page Hide register page when registrations are closed	2022-11-07 13:39:34 +05:30
Gusted	864549cb4c	Fix copyright	2022-11-06 19:42:22 +01:00
Gusted	5713d4b1ae	Hide register page when registrations are closed - Improve UX for "private" instances.	2022-10-24 22:47:07 +02:00
Aravinth Manivannan	ac502b7c08	Merge pull request #51 from Gusted/fix-compiling Fix compiling	2022-10-24 21:22:34 +05:30
Gusted	8dc690ca01	Remove redunant format	2022-10-24 16:22:10 +02:00
Gusted	a4f9c92b32	Update cargo	2022-10-22 21:53:18 +02:00
Gusted	8826f6df8f	Fix compiling - I made some mistakes while checking my two previous PRs(Seems like I don't understand Rust that great after all). - Do the url encoding only on the password part, not only the whole URL. - Fix `temporary value dropped while borrowed` compile error.	2022-10-22 21:28:58 +02:00
Aravinth Manivannan	af35fdb48e	Merge pull request #46 from Gusted/relax-port-env Allow `PORT` environment to be not set	2022-10-18 15:51:22 +05:30
Gusted	9fd8ffd666	Add more logging for configuration/env	2022-10-17 19:49:42 +02:00
Aravinth Manivannan	521abd82d6	Merge pull request #47 from Gusted/encode-url-postgres Encode connection URL to database	2022-10-17 15:42:02 +05:30
Gusted	021f2fe5b4	Encode connection URL to database - If you have a database password that contains characters like `#` or `*`, sqlx will error about a InvalidPort, this is due to not encoding the url. [See issue on sqlx](https://github.com/launchbadge/sqlx/issues/1624). - Removed useless statements.	2022-10-16 23:37:24 +02:00
Gusted	b3e0ff6769	Allow `PORT` environment to be not set - It's quite weird to require the `PORT` environment to be set, when it already can be set via the config file.	2022-10-16 23:07:10 +02:00
Aravinth Manivannan	97abca2520	Merge pull request #45 from DarianAnjuhal/master feat: open mail link with target=_blank	2022-10-12 15:28:13 +05:30
Daniel Antlinger	96a6c98c10	feat: open mail link with target=_blank	2022-10-12 11:50:55 +02:00
realaravinth	9d285573d7	fix: typo in widget	2022-09-26 16:40:40 +05:30
Aravinth Manivannan	d506d291c3	Merge pull request #43 from DarianAnjuhal/master feat: open links from widget in new pages target=_blank	2022-09-07 23:31:56 +05:30
Daniel Antlinger	223e8fb8c2	feat: open links from widget in new pages target=_blank	2022-09-07 14:05:25 +02:00
realaravinth	2abf57d16b	fix: set correct upload dir	2022-08-15 18:01:41 +05:30
realaravinth	b3ee57d042	fix: configure gpg key	2022-08-15 17:37:48 +05:30
realaravinth	8c65edd257	fix: upload path	2022-08-15 17:25:22 +05:30
realaravinth	9f521fe199	feat: publish mcaptcha bin to dl.mcaptcha.org	2022-08-15 17:03:46 +05:30
realaravinth	8ac1e2b81e	feat: package and sign dist assets	2022-08-15 17:03:46 +05:30
Aravinth Manivannan	5db58d477b	Merge pull request #24 from mCaptcha/dependabot/npm_and_yarn/nanoid-3.3.4 Bump nanoid from 3.1.29 to 3.3.4	2022-08-14 01:32:55 +05:30
Aravinth Manivannan	db03cd3b1f	Merge pull request #34 from mCaptcha/dependabot/npm_and_yarn/terser-5.14.2 chore(deps): bump terser from 5.9.0 to 5.14.2	2022-08-14 01:32:25 +05:30
realaravinth	e5e89bd8a0	chore: bump libmcaptcha, switch to master	2022-08-13 01:58:40 +05:30
Aravinth Manivannan	2dd6f063c5	Merge pull request #40 from Gusted/automate-releases Automate releases via Github Actions	2022-08-12 18:39:48 +05:30
Gusted	bb81e7fb9b	Automate releases via Github Actions - Use Github Actions to compile static linked binaries for the three major OS and upload them to Github Releases.	2022-08-12 14:55:57 +02:00
dependabot[bot]	8a667ad71f	chore(deps): bump terser from 5.9.0 to 5.14.2 Bumps [terser](https://github.com/terser/terser) from 5.9.0 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-20 06:01:46 +00:00
dependabot[bot]	72cff2a470	Bump nanoid from 3.1.29 to 3.3.4 Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.29 to 3.3.4. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.29...3.3.4) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-07 10:54:21 +00:00