feat: WIP docker compose from source configuration

.env_sample

@@ -1,2 +0,0 @@
-export POSTGRES_DATABASE_URL="postgres://postgres:password@localhost:5432/postgres"
-export MARIA_DATABASE_URL="mysql://maria:password@localhost:3306/maria"

.github/workflows/clippy-fmt.yml

@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - master
-      - db-abstract
 
 jobs:
   fmt:

.github/workflows/coverage.yml

@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - master
-      - db-abstract
 
 jobs:
   build_and_test:
@@ -34,39 +33,11 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
-
       mcaptcha-redis:
         image: mcaptcha/cache
         ports:
           - 6379:6379
 
-      mcaptcha-smtp:
-        image: maildev/maildev
-        env:
-          MAILDEV_WEB_PORT: "1080"
-          MAILDEV_INCOMING_USER: "admin"
-          MAILDEV_INCOMING_PASS: "password"
-        ports:
-          - 1080:1080
-          - 10025:1025
-
-
-      maria:
-        image: mariadb:10
-        env: 
-          MARIADB_USER: "maria"
-          MARIADB_PASSWORD: "password"
-          MARIADB_ROOT_PASSWORD: "password"
-          MARIADB_DATABASE: "maria"
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=10
-        ports:
-          - 3306:3306
-
-
     steps:
       - uses: actions/checkout@v2
       - name: ⚡ Cache
@@ -80,18 +51,13 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-
-      - name: load env
-        run: |
-          source .env_sample \
-            && echo "POSTGRES_DATABASE_URL=$POSTGRES_DATABASE_URL" >> $GITHUB_ENV \
-            && echo "MARIA_DATABASE_URL=$MARIA_DATABASE_URL" >> $GITHUB_ENV
-
-
       - uses: actions/setup-node@v2
         with:
           node-version: "16.x"
 
+      - name: start smtp server
+        run: docker run -d -p 1080:1080 -p 10025:1025  maildev/maildev --incoming-user admin --incoming-pass password
+
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
         with:
@@ -103,26 +69,23 @@ jobs:
         run: make frontend
 
       - name: Run the frontend tests
-        run: make test.frontend
+        run: make frontend-test
 
       - name: Run migrations
         run: make migrate
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
 
       - name: build frontend
         run: make frontend
 
       - name: Generate coverage file
-        if: github.event_name == 'pull_request'
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        #if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: actions-rs/tarpaulin@v0.1
         with:
           args: "-t 1200"
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
           # GIT_HASH is dummy value. I guess build.rs is skipped in tarpaulin
           # execution so this value is required for preventing meta tests from
           # panicking
@@ -131,5 +94,5 @@ jobs:
           COMPILED_DATE: "2021-07-21"
 
       - name: Upload to Codecov
-        if: github.event_name == 'pull_request'
+        if: (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: codecov/codecov-action@v2

.github/workflows/linux.yml

@@ -8,8 +8,6 @@ on:
   push:
     branches:
       - master
-      - "*"
-      - '!gh-pages'
 
 jobs:
   build_and_test:
@@ -38,35 +36,10 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
-
       mcaptcha-redis:
         image: mcaptcha/cache
         ports:
           - 6379:6379
-      mcaptcha-smtp:
-        image: maildev/maildev
-        env:
-          MAILDEV_WEB_PORT: "1080"
-          MAILDEV_INCOMING_USER: "admin"
-          MAILDEV_INCOMING_PASS: "password"
-        ports:
-          - 1080:1080
-          - 10025:1025
-
-      maria:
-        image: mariadb:10
-        env: 
-          MARIADB_USER: "maria"
-          MARIADB_PASSWORD: "password"
-          MARIADB_ROOT_PASSWORD: "password"
-          MARIADB_DATABASE: "maria"
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=10
-        ports:
-          - 3306:3306
 
     steps:
       - uses: actions/checkout@v2
@@ -81,21 +54,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 \
-            && echo "POSTGRES_DATABASE_URL=$POSTGRES_DATABASE_URL" >> $GITHUB_ENV \
-            && echo "MARIA_DATABASE_URL=$MARIA_DATABASE_URL" >> $GITHUB_ENV
-
       - uses: actions/setup-node@v2
         with:
-          node-version: "16.x"
+          node-version: '16.x'
+
+      - name: start smtp server
+        run: docker run -d -p 1080:1080 -p 10025:1025  maildev/maildev --incoming-user admin --incoming-pass password
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
@@ -104,20 +68,15 @@ jobs:
           profile: minimal
           override: true
 
-      - name: install nightwatch dep
-        run: sudo apt-get install xvfb
-
       - name: Run migrations
         run: make migrate
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
 
       - name: build
         run: make
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
 
             #      - name: build frontend
             #        run: make frontend
@@ -128,36 +87,13 @@ jobs:
       - name: run tests
         run: make test
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
+          
-
-      - name: run integration tests
-        run: make test.integration
-
-      - name: Login to DockerHub
-        if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'mCaptcha/mCaptcha'
-        uses: docker/login-action@v1
-        with:
-          username: mcaptcha
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: publish docker images
-        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
         env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
           GIT_HASH: 8e77345f1597e40c2e266cb4e6dee74888918a61 # dummy value
           COMPILED_DATE: "2021-07-21"
 

.github/workflows/tagged-release.yml

@@ -1,32 +0,0 @@
-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 }}

CHANGELOG.md

@@ -2,18 +2,4 @@
 
 ### Changed
 
--   ([`7d0e4c6`](https://github.com/mCaptcha/mCaptcha/commit/7d0e4c6be4b0769921cda7681858ebe16ec9a07b)) Add `secret` parameter to token verification request payload(`/api/v1/pow/siteverify`) to mitigate a security issue that @gusted found:
+-   Rename pow section in settings to captcha and add options to configure([`42544ec42`](https://github.com/mCaptcha/mCaptcha/commit/42544ec421e0c3ec4a8d132e6101ab4069bf0065))
-    > ...A malicious user could grab the sitekey
-    > and use that sitekey with mcaptcha to use it for their own server.
-    > While they can now go abuse it for illegal stuff or other stuff.
-    > You might decide, oh I don't want this! and terminate a legitimate
-    > siteKey.
-    > New request payload:
-    ```json
-    {
-    	"secret": "<your-users-secret>", // found in /settings in the dashbaord
-    	"token": "<token-presented-by-the-user>",
-    	"key": "<your-sitekey>"
-    }
-    ```
--   ([`42544ec42`](https://github.com/mCaptcha/mCaptcha/commit/42544ec421e0c3ec4a8d132e6101ab4069bf0065)) Rename pow section in settings to captcha and add options to configure

Cargo.toml

@@ -13,15 +13,14 @@ build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-
-[workspace]
-exclude = ["db/db-migrations", "utils/cache-bust"]
-memebers = [".", "db/db-core", "db/db-sqlx-postgres", "db/db-sqlx-maria"]
-
 [[bin]]
 name = "mcaptcha"
 path = "./src/main.rs"
 
+[[bin]]
+name = "tests-migrate"
+path = "./src/tests-migrate.rs"
+
 [dependencies]
 actix-web = "4.0.1"
 actix = "0.13"
@@ -30,7 +29,7 @@ actix-http = "3.0.4"
 actix-rt = "2"
 actix-cors = "0.6.1"
 actix-service = "2.0.0"
-async-trait = "0.1.51"
+#my-codegen = {version="0.5.0-beta.5", package = "actix-web-codegen", git ="https://github.com/realaravinth/actix-web"}
 mime_guess = "2.0.3"
 rust-embed = "6.4.0"
 cache-buster = { git = "https://github.com/realaravinth/cache-buster" }
@@ -38,7 +37,7 @@ cache-buster = { git = "https://github.com/realaravinth/cache-buster" }
 futures = "0.3.15"
 tokio = { version = "1.14", features = ["sync"]}
 
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline", "mysql"] }
+sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline" ] }
 argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
 #argon2-creds = { version="*", path = "../../argon2-creds/" }
 config = "0.11"
@@ -59,8 +58,7 @@ log = "0.4"
 lazy_static = "1.4"
 
 
-libmcaptcha = { version = "0.2.3", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"], tag ="0.2.3" }
+libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
-#libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
 #libmcaptcha = { path = "../libmcaptcha", features = ["full"]}
 
 rand = "0.8"
@@ -69,8 +67,6 @@ sailfish = "0.4.0"
 
 mime = "0.3.16"
 
-num_cpus = "1.13.1"
-
 lettre = { version = "0.10.0-rc.3", features = [
 "builder", 
 "tokio1", 
@@ -78,18 +74,7 @@ lettre = { version = "0.10.0-rc.3", features = [
 "smtp-transport"
 ]}
 
-openssl = { version = "0.10.48", features = ["vendored"] }
+openssl = { version = "0.10.29", features = ["vendored"] }
-uuid = { version = "1.4.0", features = ["v4", "serde"] }
-
-
-[dependencies.db-core]
-path = "./db/db-core"
-
-[dependencies.db-sqlx-postgres]
-path = "./db/db-sqlx-postgres"
-
-[dependencies.db-sqlx-maria]
-path = "./db/db-sqlx-maria"
 
 [dependencies.my-codegen]
 git = "https://github.com/realaravinth/actix-web"
@@ -102,10 +87,12 @@ features = ["actix_identity_backend"]
 
 [build-dependencies]
 serde_json = "1"
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline", "mysql" ] }
+cache-buster = { version = "0.2.0", git = "https://github.com/realaravinth/cache-buster" }
+mime = "0.3.16"
+sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline" ] }
 
 [dev-dependencies]
-pow_sha256 = { version = "0.3.1", git = "https://github.com/mcaptcha/pow_sha256", tag="0.3.1" }
+pow_sha256 = { version = "0.2.1", git = "https://github.com/mcaptcha/pow_sha256" }
 awc = "3.0.0"
 
 

Dockerfile

@@ -17,33 +17,23 @@ COPY Makefile /src/
 COPY scripts /src/scripts
 RUN make frontend
 
-FROM rust:latest as planner
-RUN cargo install cargo-chef
-WORKDIR /src
-COPY . /src/
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM rust:latest as cacher
-WORKDIR /src/
-RUN cargo install cargo-chef
-COPY --from=planner /src/recipe.json recipe.json
-RUN cargo chef cook --release --recipe-path recipe.json
-
 FROM rust:latest as rust
 WORKDIR /src
-COPY . .
+RUN mkdir src && echo "fn main() {}" > src/main.rs
-COPY --from=cacher /src/target target
+COPY Cargo.toml .
-#COPY --from=cacher /src/db/db-core/target /src/db/db-core/target 
+RUN sed -i '/.*build.rs.*/d' Cargo.toml
-#COPY --from=cacher /src/db/db-sqlx-postgres/target /src/db/db-sqlx-postgres/target 
+COPY Cargo.lock .
-#COPY --from=cacher /src/db/db-migrations/target /src/db/db-migrations/target 
+COPY migrations /src/migrations
-#COPY --from=cacher /src/utils/cache-bust/target /src/utils/cache-bust/target 
+COPY sqlx-data.json /src/
-COPY --from=frontend /src/static/cache/bundle/ /src/static/cache/bundle/
+COPY src/tests-migrate.rs /src/src/tests-migrate.rs
-COPY --from=frontend /src/docs/openapi/dist/ /src/docs/openapi/dist/
+COPY src/settings.rs /src/src/settings.rs
 RUN cargo --version
-RUN make cache-bust
 RUN cargo build --release
+COPY . /src
+COPY --from=frontend /src/static/cache/bundle/ /src/static/cache/bundle/
+RUN cargo build --release 
 
-FROM debian:bullseye as mCaptcha
+FROM debian:bullseye
 LABEL org.opencontainers.image.source https://github.com/mCaptcha/mCaptcha
 RUN useradd -ms /bin/bash -u 1001 mcaptcha
 WORKDIR /home/mcaptcha

Makefile

@@ -2,96 +2,22 @@ BUNDLE = static/cache/bundle
 OPENAPI = docs/openapi
 CLEAN_UP = $(BUNDLE) src/cache_buster_data.json assets
 
-define deploy_dependencies ## deploy dependencies
-	@-docker create --name ${db}  \
-		-e POSTGRES_PASSWORD=password  \
-		-p 5432:5432   \
-		postgres
-	@-docker create  \
-		-p 3306:3306  \
-		--name ${mdb} \
-		--env MARIADB_USER=maria \
-		--env MARIADB_PASSWORD=password  \
-		--env MARIADB_ROOT_PASSWORD=password  \
-		--env MARIADB_DATABASE=maria  \
-		mariadb:latest
-	@-docker create  \
-		-p 6379:6379 \
-		--name mcaptcha-cache \
-		mcaptcha/cache:latest
-	docker start ${db}
-	docker start ${mdb}
-	docker start mcaptcha-cache
-endef
-
-define run_migrations ## run database migrations
-	cd db/db-migrations/ && cargo run
-endef
-
-define run_dev_migrations ## run database migrations
-	cd db/db-sqlx-maria/ && \
-		DATABASE_URL=${MARIA_DATABASE_URL} sqlx migrate run
-	cd db/db-sqlx-postgres/ && \
-		DATABASE_URL=${POSTGRES_DATABASE_URL} sqlx migrate run
-endef
-
 define frontend_env ## install frontend deps
 	yarn install
 	cd docs/openapi && yarn install
 endef
 
-define cache_bust ## run cache_busting program
-	cd utils/cache-bust && cargo run
-endef
-
-
-define test_frontend ## run frontend tests
-	cd $(OPENAPI)&& yarn test
-	yarn test
-endef
-
-define test_db_sqlx_postgres
-	cd db/db-sqlx-postgres &&\
-		DATABASE_URL=${POSTGRES_DATABASE_URL}\
-		cargo test --no-fail-fast
-endef
-
-define test_db_sqlx_maria
-	cd db/db-sqlx-maria &&\
-		DATABASE_URL=${MARIA_DATABASE_URL}\
-		cargo test --no-fail-fast
-endef
-
-define test_core
-	cargo test --no-fail-fast
-endef
-
-
-
 default: frontend ## Build app in debug mode
-	$(call cache_bust)
 	cargo build
 
-check: ## Check for syntax errors on all workspaces
-	cargo check --workspace --tests --all-features
-	cd utils/cache-bust && cargo check --tests --all-features
-	cd db/db-migrations && cargo check --tests --all-features
-	cd db/db-sqlx-postgres &&\
-		DATABASE_URL=${POSTGRES_DATABASE_URL}\
-		cargo check
-	cd db/db-sqlx-maria &&\
-		DATABASE_URL=${MARIA_DATABASE_URL}\
-		cargo check
-	cd db/db-core/ && cargo check
-
-cache-bust: ## Run cache buster on static assets
-	$(call cache_bust)
-
 clean: ## Delete build artifacts
 	@cargo clean
 	@yarn cache clean
 	@-rm $(CLEAN_UP)
 
+coverage: migrate ## Generate code coverage report in HTML format
+	cargo tarpaulin -t 1200 --out Html
+
 doc: ## Generate documentation
 	#yarn doc
 	cargo doc --no-deps --workspace --all-features
@@ -107,19 +33,6 @@ env: ## Setup development environtment
 	cargo fetch
 	$(call frontend_env)
 
-env.db: ## Deploy dependencies
-	$(call deploy_dependencies)
-	sleep 5
-	$(call run_migrations)
-
-env.db.recreate: ## Deploy dependencies from scratch
-	@-docker rm -f ${db}
-	@-docker rm -f ${mdb}
-	@-docker rm -f mcaptcha-cache
-	$(call deploy_dependencies)
-	sleep 5
-	$(call run_migrations)
-
 frontend-env: ## Install frontend deps
 	$(call frontend_env)
 
@@ -142,6 +55,10 @@ frontend: ## Build frontend
 	@./scripts/librejs.sh
 	@./scripts/cachebust.sh
 
+frontend-test: ## Run frontend tests
+	cd $(OPENAPI)&& yarn test
+	yarn test
+
 lint: ## Lint codebase
 	cargo fmt -v --all -- --emit files
 	cargo clippy --workspace --tests --all-features
@@ -149,63 +66,20 @@ lint: ## Lint codebase
 	cd $(OPENAPI)&& yarn test
 
 migrate: ## Run database migrations
-	$(call run_migrations)
+	cargo run --bin tests-migrate
-
-migrate.dev: ## Run database migrations during development
-	$(call run_dev_migrations)
 
 release: frontend ## Build app with release optimizations
-	$(call cache_bust)
 	cargo build --release
 
 run: frontend ## Run app in debug mode
-	$(call cache_bust)
 	cargo run
 
+test: frontend-test frontend ## Run all available tests
+	./scripts/tests.sh
+#	cargo test --all-features --no-fail-fast
 
-db.sqlx.offline: ## prepare sqlx offline data
+xml-test-coverage: migrate ## Generate code coverage report in XML format
-	cd db/db-sqlx-postgres && cargo sqlx prepare  \
-		--database-url=${POSTGRES_DATABASE_URL} -- \
-		--all-features
-	cd db/db-sqlx-maria && cargo sqlx prepare  \
-		--database-url=${MARIA_DATABASE_URL} -- \
-		--all-features
-
-test: frontend ## Run all available tests
-	$(call test_frontend)
-	$(call cache_bust)
-	$(call test_db_sqlx_postgres)
-	$(call test_db_sqlx_maria)
-	$(call test_core)
-#	./scripts/tests.sh
-
-test.cov.html: migrate ## Generate code coverage report in HTML format
-	$(call cache_bust)
-	cargo tarpaulin -t 1200 --out Html
-
-test.cov.xml: migrate ## Generate code coverage report in XML format
-	$(call cache_bust)
 	cargo tarpaulin -t 1200 --out Xml
 
-
-test.core: ## Run all core tests
-	$(call test_core)
-
-test.db: ## Run all database driver tests
-	$(call test_db_sqlx_postgres)
-	$(call test_db_sqlx_maria)
-
-test.db.pg: ## Run Postgres database driver tests
-	$(call test_db_sqlx_postgres)
-
-test.db.maria: ## Run Maria database driver tests
-	$(call test_db_sqlx_maria)
-
-test.frontend: ## Run frontend tests
-	$(call test_frontend)
-
-test.integration: ## run integration tests with nightwatch.js
-	./scripts/integration.sh
-
 help: ## Prints help for targets with comments
-	@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-].+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -32,18 +32,18 @@ yourself!](https://demo.mcaptcha.org/widget/?sitekey=pHy0AktWyOKuxZDzFfoaewncWec
 
 ## How does it work?
 
-mCaptcha uses SHA256 based proof-of-work (PoW) to rate limit users.
+mCaptcha uses SHA256 based proof-of-work(PoW) to rate limit users.
 
-When a user wants to do something on a mCaptcha-protected website,
+When a user wants to do something on an mCaptcha-protected website,
 
-1. they will have to generate proof-of-work (a bunch of math that will takes
+1. they will have to generate proof-of-work(a bunch of math that will takes
    time to compute) and submit it to mCaptcha.
 
 2. We'll validate the proof:
 
-    - **if validation is unsuccessful**, they will be prevented from
+   - **if validation is unsuccessful**, they will be prevented from
-      accessing their target website
+     accessing their target website
-    - **if validation is successful**, read on,
+   - **if validation is successful**, read on,
 
 3. They will be issued a token that they should submit along
    with their request/form submission to the target website.
@@ -54,8 +54,8 @@ When a user wants to do something on a mCaptcha-protected website,
 The whole process is automated from the user's POV. All they have to do
 is click on a button to initiate the process.
 
-mCaptcha makes interacting with websites (computationally) expensive for
+mCaptcha makes interacting with websites (computationally)expensive for
-the user. A well-behaving user will experience a slight delay (no delay
+the user. A well-behaving user will experience a slight delay(no delay
 when under moderate load to 2s when under attack; PoW difficulty is
 variable) but if someone wants to hammer your site, they will have to do
 more work to send requests than your server will have to do to respond
@@ -63,14 +63,14 @@ to their request.
 
 ## Why use mCaptcha?
 
--   [x] **Free software, privacy focused**
+- [x] **Free software, privacy focused**
--   [x] **Seamless UX** - No more annoying CAPTCHAs!
+- [x] **Seamless UX** - No more annoying CAPTCHAs!
--   [x] **No tracking:** Our CAPTCHA routes are cookie free!
+- [x] **No tracking:** Our CAPTCHA routes are cookie free!
--   [x] **IP address independent:** your users are behind a NAT? We got you covered!
+- [x] **IP address independent:** your users are behind a NAT? We got you covered!
--   [x] **Resistant to replay attacks:** proof-of-work configurations have
+- [x] **Resistant to replay attacks:** proof-of-work configurations have
-        short lifetimes (30s) and can be used only once. If a user submits a
+      short lifetimes(30s) and can be used only once. If a user submits a
-        PoW to an already used configuration or an expired one, their proof
+      PoW to an already used configuration or an expired one, their proof
-        will be rejected.
+      will be rejected.
 
 ## Demo
 
@@ -87,15 +87,15 @@ monitor console and network activity.
 
 ### Demo servers are available at:
 
--   https://demo.mcaptcha.org/
+- https://demo.mcaptcha.org/
--   https://demo2.mcaptcha.org/ (runs on a Raspberry Pi!)
+- https://demo2.mcaptcha.org/ (runs on a Raspberry Pi!)
 
 > Core functionality is working but it's still very much
 > work-in-progress. Since we don't have a stable release yet, hosted
 > demo servers might be a few versions behind `master`. Please check footer for
 > build commit.
 
-Feel free to provide bogus information while signing up (project under
+Feel free to provide bogus information while signing up(project under
 development, database frequently wiped).
 
 ### Self-hosted:
@@ -103,18 +103,12 @@ development, database frequently wiped).
 Clone the repo and run the following from the root of the repo:
 
 ```bash
-git clone https://github.com/mCaptcha/mCaptcha.git
+$ docker-compose -d up
-docker-compose up -d
 ```
 
-After the containers are up, visit [http://localhost:7000](http://localhost:7000) and login with the default credentials:
-
--   username: aaronsw
--   password: password
-
 It takes a while to build the image so please be patient :)
 
-See [DEPLOYMENT.md](./docs/DEPLOYMENT.md) detailed alternate deployment
+See [DEPLOYMENT.md](./docs/DEPLOYMET.md) detailed alternate deployment
 methods.
 
 ## Development:
@@ -123,26 +117,8 @@ See [HACKING.md](./docs/HACKING.md)
 
 ## Deployment:
 
-See [DEPLOYMENT.md](./docs/DEPLOYMENT.md)
+See [DEPLOYMENT.md](./docs/DEPLOYMET.md)
 
 ## Configuration:
 
 See [CONFIGURATION.md](./docs/CONFIGURATION.md)
-
-## Funding
-
-### NLnet
-
-<div align="center">
-	<img
-		height="150px"
-		alt="NLnet NGIZero logo"
-		src="./docs/third-party/NGIZero-green.hex.svg"
-	/>
-</div>
-
-<br />
-
-2023 development is funded through the [NGI0 Entrust
-Fund](https://nlnet.nl/entrust), via [NLnet](https://nlnet.nl/). Please
-see [here](https://nlnet.nl/project/mCaptcha/) for more details.

build.rs

@@ -16,12 +16,13 @@
  */
 use std::process::Command;
 
+use cache_buster::{BusterBuilder, NoHashCategory};
 use sqlx::types::time::OffsetDateTime;
 
 fn main() {
     // note: add error checking yourself.
     let output = Command::new("git")
-        .args(["rev-parse", "HEAD"])
+        .args(&["rev-parse", "HEAD"])
         .output()
         .unwrap();
     let git_hash = String::from_utf8(output.stdout).unwrap();
@@ -29,4 +30,32 @@ fn main() {
 
     let now = OffsetDateTime::now_utc().format("%y-%m-%d");
     println!("cargo:rustc-env=COMPILED_DATE={}", &now);
+
+    cache_bust();
+}
+
+fn cache_bust() {
+    //    until APPLICATION_WASM gets added to mime crate
+    //    PR: https://github.com/hyperium/mime/pull/138
+    //    let types = vec![
+    //        mime::IMAGE_PNG,
+    //        mime::IMAGE_SVG,
+    //        mime::IMAGE_JPEG,
+    //        mime::IMAGE_GIF,
+    //        mime::APPLICATION_JAVASCRIPT,
+    //        mime::TEXT_CSS,
+    //    ];
+
+    println!("cargo:rerun-if-changed=static/cache");
+    let no_hash = vec![NoHashCategory::FileExtentions(vec!["wasm"])];
+
+    let config = BusterBuilder::default()
+        .source("./static/cache/")
+        .result("./assets")
+        .no_hash(no_hash)
+        .follow_links(true)
+        .build()
+        .unwrap();
+
+    config.process().unwrap();
 }

config/default.toml

@@ -11,7 +11,7 @@ cookie_secret = "Zae0OOxf^bOJ#zN^&k7VozgW&QAx%n02TQFXpRMG4cCU0xMzgu3dna@tQ9dvc&T
 # The port at which you want authentication to listen to
 # takes a number, choose from 1000-10000 if you dont know what you are doing
 port = 7000
-#IP address. Enter 0.0.0.0 to listen on all available addresses
+#IP address. Enter 0.0.0.0 to listen on all availale addresses
 ip= "0.0.0.0" 
 # enter your hostname, eg: example.com
 domain = "localhost"
@@ -28,9 +28,6 @@ salt = "asdl;kjfhjawehfpa;osdkjasdvjaksndfpoanjdfainsdfaijdsfajlkjdsaf;ajsdfwero
 # garbage collection period to manage mCaptcha system
 # leave untouched if you don't know what you are doing
 gc = 30
-runners = 4
-queue_length = 2000
-enable_stats = true
 
 [captcha.default_difficulty_strategy]
 avg_traffic_difficulty =  50000 # almost instant solution
@@ -52,7 +49,6 @@ username = "postgres"
 password = "password"
 name = "postgres"
 pool = 4
-database_type="postgres" # "postgres", "maria"
 
 [redis]
 # This section deals with the database location and how to access it

db/db-core/.gitignore

@@ -1,2 +0,0 @@
-/target
-/Cargo.lock

db/db-core/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "db-core"
-version = "0.1.0"
-edition = "2021"
-homepage = "https://mcaptcha.org"
-repository = "https://github.com/mCaptcha/mCaptcha"
-documentation = "https://mcaptcha.org/docs/"
-license = "AGPLv3 or later version"
-authors = ["realaravinth <realaravinth@batsense.net>"]
-
-[dependencies] 
-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.3", git = "https://github.com/mCaptcha/libmcaptcha", features = ["minimal"], default-features = false, tag = "0.2.3"}
-#libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
-
-[features]
-default = []
-test = []
-
-[dev-dependencies]
-serde_json = "1"

db/db-core/src/errors.rs

@@ -1,61 +0,0 @@
-/*
- * 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/>.
- */
-//! represents all the ways a trait can fail using this crate
-use std::error::Error as StdError;
-
-//use derive_more::{error, Error as DeriveError};
-use thiserror::Error;
-
-/// Error data structure grouping various error subtypes
-#[derive(Debug, Error)]
-pub enum DBError {
-    /// errors that are specific to a database implementation
-    #[error("{0}")]
-    DBError(#[source] BoxDynError),
-    /// Username is taken
-    #[error("Username is taken")]
-    UsernameTaken,
-    /// Email is taken
-    #[error("Email is taken")]
-    EmailTaken,
-    /// Secret is taken
-    #[error("Secret is taken")]
-    SecretTaken,
-    /// Captcha key is taken
-    #[error("Captcha key is taken")]
-    CaptchaKeyTaken,
-    /// Account not found
-    #[error("Account not found")]
-    AccountNotFound,
-
-    /// Captcha not found
-    #[error("Captcha not found")]
-    CaptchaNotFound,
-    /// Traffic pattern not found
-    #[error("Traffic pattern not found")]
-    TrafficPatternNotFound,
-
-    /// Notification not found
-    #[error("Notification not found")]
-    NotificationNotFound,
-}
-
-/// Convenience type alias for grouping driver-specific errors
-pub type BoxDynError = Box<dyn StdError + 'static + Send + Sync>;
-
-/// Generic result data structure
-pub type DBResult<V> = std::result::Result<V, DBError>;

db/db-core/src/lib.rs

@@ -1,429 +0,0 @@
-/*
- * 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/>.
- */
-
-#![warn(missing_docs)]
-//! # `mCaptcha` database operations
-//!
-//! Traits and datastructures used in mCaptcha to interact with database.
-//!
-//! To use an unsupported database with mCaptcha, traits present within this crate should be
-//! implemented.
-//!
-//!
-//! ## Organisation
-//!
-//! Database functionality is divided across various modules:
-//!
-//! - [errors](crate::auth): error data structures used in this crate
-//! - [ops](crate::ops): meta operations like connection pool creation, migrations and getting
-//! connection from pool
-use serde::{Deserialize, Serialize};
-
-pub use libmcaptcha::defense::Level;
-
-pub mod errors;
-pub mod ops;
-#[cfg(feature = "test")]
-pub mod tests;
-
-use dev::*;
-pub use ops::GetConnection;
-
-pub mod prelude {
-    //! useful imports for users working with a supported database
-
-    pub use super::errors::*;
-    pub use super::ops::*;
-    pub use super::*;
-}
-
-pub mod dev {
-    //! useful imports for supporting a new database
-    pub use super::prelude::*;
-    pub use async_trait::async_trait;
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-/// Data required to register a new user
-pub struct Register<'a> {
-    /// username of new user
-    pub username: &'a str,
-    /// secret of new user
-    pub secret: &'a str,
-    /// hashed password of new use
-    pub hash: &'a str,
-    /// Optionally, email of new use
-    pub email: Option<&'a str>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-/// data required to update them email of a user
-pub struct UpdateEmail<'a> {
-    /// username of the user
-    pub username: &'a str,
-    /// new email address of the user
-    pub new_email: &'a str,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-/// types of credentials used as identifiers during login
-pub enum Login<'a> {
-    /// username as login
-    Username(&'a str),
-    /// email as login
-    Email(&'a str),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
-/// type encapsulating username and hashed password of a user
-pub struct NameHash {
-    /// username
-    pub username: String,
-    /// hashed password
-    pub hash: String,
-}
-
-#[async_trait]
-/// mCaptcha's database requirements. To implement support for $Database, kindly implement this
-/// trait.
-pub trait MCDatabase: std::marker::Send + std::marker::Sync + CloneSPDatabase {
-    /// ping DB
-    async fn ping(&self) -> bool;
-
-    /// register a new user
-    async fn register(&self, p: &Register) -> DBResult<()>;
-
-    /// delete a user
-    async fn delete_user(&self, username: &str) -> DBResult<()>;
-
-    /// check if username exists
-    async fn username_exists(&self, username: &str) -> DBResult<bool>;
-
-    /// get user email
-    async fn get_email(&self, username: &str) -> DBResult<Option<String>>;
-
-    /// check if email exists
-    async fn email_exists(&self, email: &str) -> DBResult<bool>;
-
-    /// update a user's email
-    async fn update_email(&self, p: &UpdateEmail) -> DBResult<()>;
-
-    /// get a user's password
-    async fn get_password(&self, l: &Login) -> DBResult<NameHash>;
-
-    /// update user's password
-    async fn update_password(&self, p: &NameHash) -> DBResult<()>;
-
-    /// update username
-    async fn update_username(&self, current: &str, new: &str) -> DBResult<()>;
-
-    /// get a user's secret
-    async fn get_secret(&self, username: &str) -> DBResult<Secret>;
-
-    /// get a user's secret from a captcha key
-    async fn get_secret_from_captcha(&self, key: &str) -> DBResult<Secret>;
-
-    /// update a user's secret
-    async fn update_secret(&self, username: &str, secret: &str) -> DBResult<()>;
-
-    /// create new captcha
-    async fn create_captcha(&self, username: &str, p: &CreateCaptcha) -> DBResult<()>;
-
-    /// Get captcha config
-    async fn get_captcha_config(&self, username: &str, key: &str) -> DBResult<Captcha>;
-
-    /// Get all captchas belonging to user
-    async fn get_all_user_captchas(&self, username: &str) -> DBResult<Vec<Captcha>>;
-
-    /// update captcha metadata; doesn't change captcha key
-    async fn update_captcha_metadata(
-        &self,
-        username: &str,
-        p: &CreateCaptcha,
-    ) -> DBResult<()>;
-
-    /// update captcha key; doesn't change metadata
-    async fn update_captcha_key(
-        &self,
-        username: &str,
-        old_key: &str,
-        new_key: &str,
-    ) -> DBResult<()>;
-
-    /// Add levels to captcha
-    async fn add_captcha_levels(
-        &self,
-        username: &str,
-        captcha_key: &str,
-        levels: &[Level],
-    ) -> DBResult<()>;
-
-    /// check if captcha exists
-    async fn captcha_exists(
-        &self,
-        username: Option<&str>,
-        captcha_key: &str,
-    ) -> DBResult<bool>;
-
-    /// Delete all levels of a captcha
-    async fn delete_captcha_levels(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<()>;
-
-    /// Delete captcha
-    async fn delete_captcha(&self, username: &str, captcha_key: &str) -> DBResult<()>;
-
-    /// Get captcha levels
-    async fn get_captcha_levels(
-        &self,
-        username: Option<&str>,
-        captcha_key: &str,
-    ) -> DBResult<Vec<Level>>;
-
-    /// Get captcha's cooldown period
-    async fn get_captcha_cooldown(&self, captcha_key: &str) -> DBResult<i32>;
-
-    /// Add traffic configuration
-    async fn add_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-        pattern: &TrafficPattern,
-    ) -> DBResult<()>;
-
-    /// Get traffic configuration
-    async fn get_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<TrafficPattern>;
-
-    /// Delete traffic configuration
-    async fn delete_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<()>;
-
-    /// create new notification
-    async fn create_notification(&self, p: &AddNotification) -> DBResult<()>;
-
-    /// get all unread notifications
-    async fn get_all_unread_notifications(
-        &self,
-        username: &str,
-    ) -> DBResult<Vec<Notification>>;
-
-    /// mark a notification read
-    async fn mark_notification_read(&self, username: &str, id: i32) -> DBResult<()>;
-
-    /// record PoWConfig fetches
-    async fn record_fetch(&self, key: &str) -> DBResult<()>;
-
-    /// record PoWConfig solves
-    async fn record_solve(&self, key: &str) -> DBResult<()>;
-
-    /// record PoWConfig confirms
-    async fn record_confirm(&self, key: &str) -> DBResult<()>;
-
-    /// fetch PoWConfig fetches
-    async fn fetch_config_fetched(&self, user: &str, key: &str) -> DBResult<Vec<i64>>;
-
-    /// fetch PoWConfig solves
-    async fn fetch_solve(&self, user: &str, key: &str) -> DBResult<Vec<i64>>;
-
-    /// fetch PoWConfig confirms
-    async fn fetch_confirm(&self, user: &str, key: &str) -> DBResult<Vec<i64>>;
-
-    /// record PoW timing
-    async fn analysis_save(
-        &self,
-        captcha_id: &str,
-        d: &CreatePerformanceAnalytics,
-    ) -> DBResult<()>;
-
-    /// fetch PoW analytics
-    async fn analytics_fetch(
-        &self,
-        captcha_id: &str,
-        limit: usize,
-        offset: usize,
-    ) -> DBResult<Vec<PerformanceAnalytics>>;
-
-    /// Create psuedo ID against campaign ID to publish analytics
-    async fn analytics_create_psuedo_id_if_not_exists(
-        &self,
-        captcha_id: &str,
-    ) -> DBResult<()>;
-
-    /// Get psuedo ID from campaign ID
-    async fn analytics_get_psuedo_id_from_capmaign_id(
-        &self,
-        captcha_id: &str,
-    ) -> DBResult<String>;
-
-    /// Get campaign ID from psuedo ID
-    async fn analytics_get_capmaign_id_from_psuedo_id(
-        &self,
-        psuedo_id: &str,
-    ) -> DBResult<String>;
-
-    /// Delete all records for campaign
-    async fn analytics_delete_all_records_for_campaign(
-        &self,
-        campaign_id: &str,
-    ) -> DBResult<()>;
-
-    /// Get publishing status of pow analytics for captcha ID/ campaign ID
-    async fn analytics_captcha_is_published(&self, campaign_id: &str) -> DBResult<bool> {
-        match self
-            .analytics_get_psuedo_id_from_capmaign_id(campaign_id)
-            .await
-        {
-            Ok(_) => Ok(true),
-            Err(errors::DBError::CaptchaNotFound) => Ok(false),
-            Err(e) => Err(e),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq)]
-/// Log Proof-of-Work CAPTCHA performance analytics
-pub struct CreatePerformanceAnalytics {
-    /// time taken to generate proof
-    pub time: u32,
-    /// difficulty factor for which the proof was generated
-    pub difficulty_factor: u32,
-    /// worker/client type: wasm, javascript, python, etc.
-    pub worker_type: String,
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq)]
-/// Proof-of-Work CAPTCHA performance analytics
-pub struct PerformanceAnalytics {
-    /// log ID
-    pub id: usize,
-    /// time taken to generate proof
-    pub time: u32,
-    /// difficulty factor for which the proof was generated
-    pub difficulty_factor: u32,
-    /// worker/client type: wasm, javascript, python, etc.
-    pub worker_type: String,
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq)]
-/// Captcha statistics with time recorded in UNIX epoch formats
-pub struct StatsUnixTimestamp {
-    /// times at which the configuration were fetched
-    pub config_fetches: Vec<i64>,
-    /// times at which the PoW was solved
-    pub solves: Vec<i64>,
-    /// times at which the PoW token was verified
-    pub confirms: Vec<i64>,
-}
-
-#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq)]
-/// Represents notification
-pub struct Notification {
-    /// receiver name  of the notification
-    pub name: Option<String>,
-    /// heading of the notification
-    pub heading: Option<String>,
-    /// message of the notification
-    pub message: Option<String>,
-    /// when notification was received
-    pub received: Option<i64>,
-    /// db assigned ID of the notification
-    pub id: Option<i32>,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-/// Data required to add notification
-pub struct AddNotification<'a> {
-    /// who is the notification addressed to?
-    pub to: &'a str,
-    /// notification sender
-    pub from: &'a str,
-    /// heading of the notification
-    pub heading: &'a str,
-    /// message of the notification
-    pub message: &'a str,
-}
-
-#[derive(Default, PartialEq, Serialize, Deserialize, Clone, Debug)]
-/// User's traffic pattern; used in generating a captcha configuration
-pub struct TrafficPattern {
-    /// average traffic of user's website
-    pub avg_traffic: u32,
-    /// the peak traffic that the user's website can handle
-    pub peak_sustainable_traffic: u32,
-    /// traffic that bought the user's website down; optional
-    pub broke_my_site_traffic: Option<u32>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
-/// data required to create new captcha
-pub struct CreateCaptcha<'a> {
-    /// cool down duration
-    pub duration: i32,
-    /// description of the captcha
-    pub description: &'a str,
-    /// secret key of the captcha
-    pub key: &'a str,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
-/// Data representing a captcha
-pub struct Captcha {
-    /// Database assigned ID
-    pub config_id: i32,
-    /// cool down duration
-    pub duration: i32,
-    /// description of the captcha
-    pub description: String,
-    /// secret key of the captcha
-    pub key: String,
-}
-
-#[derive(Clone, Debug, Deserialize, PartialEq, Default, Serialize)]
-/// datastructure representing a user's secret
-pub struct Secret {
-    /// user's secret
-    pub secret: String,
-}
-/// Trait to clone MCDatabase
-pub trait CloneSPDatabase {
-    /// clone DB
-    fn clone_db(&self) -> Box<dyn MCDatabase>;
-}
-
-impl<T> CloneSPDatabase for T
-where
-    T: MCDatabase + Clone + 'static,
-{
-    fn clone_db(&self) -> Box<dyn MCDatabase> {
-        Box::new(self.clone())
-    }
-}
-
-impl Clone for Box<dyn MCDatabase> {
-    fn clone(&self) -> Self {
-        (**self).clone_db()
-    }
-}

db/db-core/src/ops.rs

@@ -1,49 +0,0 @@
-/*
- * 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/>.
- */
-//! meta operations like migration and connecting to a database
-use crate::dev::*;
-
-/// Database operations trait(migrations, pool creation and fetching connection from pool)
-pub trait DBOps: GetConnection + Migrate {}
-
-/// Get database connection
-#[async_trait]
-pub trait GetConnection {
-    /// database connection type
-    type Conn;
-    /// database specific error-type
-    /// get connection from connection pool
-    async fn get_conn(&self) -> DBResult<Self::Conn>;
-}
-
-/// Create database connection
-#[async_trait]
-pub trait Connect {
-    /// database specific pool-type
-    type Pool: MCDatabase;
-    /// database specific error-type
-    /// create connection pool
-    async fn connect(self) -> DBResult<Self::Pool>;
-}
-
-/// database migrations
-#[async_trait]
-pub trait Migrate: MCDatabase {
-    /// database specific error-type
-    /// run migrations
-    async fn migrate(&self) -> DBResult<()>;
-}

db/db-core/src/tests.rs

@@ -1,352 +0,0 @@
-/*
- * 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/>.
- */
-//! Test utilities
-use crate::errors::*;
-use crate::prelude::*;
-
-/// test all database functions
-pub async fn database_works<'a, T: MCDatabase>(
-    db: &T,
-    p: &Register<'a>,
-    c: &CreateCaptcha<'a>,
-    l: &[Level],
-    tp: &TrafficPattern,
-    an: &AddNotification<'a>,
-) {
-    assert!(db.ping().await, "ping test");
-
-    if db.username_exists(p.username).await.unwrap() {
-        db.delete_user(p.username).await.unwrap();
-        assert!(
-            !db.username_exists(p.username).await.unwrap(),
-            "user is deleted so username shouldn't exist"
-        );
-    }
-
-    assert!(matches!(
-        db.get_secret(&p.username).await,
-        Err(DBError::AccountNotFound)
-    ));
-
-    db.register(p).await.unwrap();
-
-    assert!(matches!(db.register(&p).await, Err(DBError::UsernameTaken)));
-
-    // testing get secret
-    let secret = db.get_secret(p.username).await.unwrap();
-    assert_eq!(secret.secret, p.secret, "user secret matches");
-
-    // testing update secret: setting secret = username
-    db.update_secret(p.username, p.username).await.unwrap();
-
-    let secret = db.get_secret(p.username).await.unwrap();
-    assert_eq!(
-        secret.secret, p.username,
-        "user secret matches username; as set by previous step"
-    );
-
-    // testing get_password
-
-    // with username
-    let name_hash = db.get_password(&Login::Username(p.username)).await.unwrap();
-    assert_eq!(name_hash.hash, p.hash, "user password matches");
-
-    assert_eq!(name_hash.username, p.username, "username matches");
-
-    // with email
-    let mut name_hash = db
-        .get_password(&Login::Email(p.email.as_ref().unwrap()))
-        .await
-        .unwrap();
-    assert_eq!(name_hash.hash, p.hash, "user password matches");
-    assert_eq!(name_hash.username, p.username, "username matches");
-
-    // testing get_email
-    assert_eq!(
-        db.get_email(p.username)
-            .await
-            .unwrap()
-            .as_ref()
-            .unwrap()
-            .as_str(),
-        p.email.unwrap()
-    );
-
-    // testing email exists
-    assert!(
-        db.email_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user is registered so email should exist"
-    );
-    assert!(
-        db.username_exists(p.username).await.unwrap(),
-        "user is registered so username should exist"
-    );
-
-    // update password test. setting password = username
-    name_hash.hash = name_hash.username.clone();
-    db.update_password(&name_hash).await.unwrap();
-
-    let name_hash = db.get_password(&Login::Username(p.username)).await.unwrap();
-    assert_eq!(
-        name_hash.hash, p.username,
-        "user password matches with changed value"
-    );
-    assert_eq!(name_hash.username, p.username, "username matches");
-
-    // update username to p.email
-    assert!(
-        !db.username_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user with p.email doesn't exist. pre-check to update username to p.email"
-    );
-    db.update_username(p.username, p.email.as_ref().unwrap())
-        .await
-        .unwrap();
-    assert!(
-        db.username_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user with p.email exist post-update"
-    );
-
-    // deleting user for re-registration with email = None
-    db.delete_user(p.email.as_ref().unwrap()).await.unwrap();
-    assert!(
-        !db.username_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user is deleted so username shouldn't exist"
-    );
-
-    // register with email = None
-    let mut p2 = p.clone();
-    p2.email = None;
-    db.register(&p2).await.unwrap();
-    assert!(
-        db.username_exists(p2.username).await.unwrap(),
-        "user is registered so username should exist"
-    );
-    assert!(
-        !db.email_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user registration with email is deleted; so email shouldn't exist"
-    );
-
-    // testing get_email = None
-    assert_eq!(db.get_email(p.username).await.unwrap(), None);
-
-    // testing update email
-    let update_email = UpdateEmail {
-        username: p.username,
-        new_email: p.email.as_ref().unwrap(),
-    };
-    db.update_email(&update_email).await.unwrap();
-    println!(
-        "null user email: {}",
-        db.email_exists(p.email.as_ref().unwrap()).await.unwrap()
-    );
-    assert!(
-        db.email_exists(p.email.as_ref().unwrap()).await.unwrap(),
-        "user was with empty email but email is set; so email should exist"
-    );
-
-    /*
-     * test notification workflows
-     * 1. Add notifications: a minimum of two, to mark as read and test if it has affected it
-     * 2. Get unread notifications
-     * 3. Mark a notification read, check if it has affected Step #2
-     */
-
-    // 1. add notification
-    db.create_notification(an).await.unwrap();
-    db.create_notification(an).await.unwrap();
-
-    // 2. Get notifications
-    let notifications = db.get_all_unread_notifications(an.to).await.unwrap();
-    assert_eq!(notifications.len(), 2);
-    assert_eq!(notifications[0].heading.as_ref().unwrap(), an.heading);
-
-    // 3. mark a notification read
-    db.mark_notification_read(an.to, notifications[0].id.unwrap())
-        .await
-        .unwrap();
-    let new_notifications = db.get_all_unread_notifications(an.to).await.unwrap();
-    assert_eq!(new_notifications.len(), 1);
-
-    // create captcha
-    db.create_captcha(p.username, c).await.unwrap();
-    assert!(db.captcha_exists(None, c.key).await.unwrap());
-    assert!(db.captcha_exists(Some(p.username), c.key).await.unwrap());
-
-    // get secret from captcha key
-    let secret_from_captcha = db.get_secret_from_captcha(&c.key).await.unwrap();
-    assert_eq!(secret_from_captcha.secret, p.secret, "user secret matches");
-
-    // get captcha configuration
-    let captcha = db.get_captcha_config(p.username, c.key).await.unwrap();
-    assert_eq!(captcha.key, c.key);
-    assert_eq!(captcha.duration, c.duration);
-    assert_eq!(captcha.description, c.description);
-
-    // get all captchas that belong to user
-    let all_user_captchas = db.get_all_user_captchas(p.username).await.unwrap();
-    assert_eq!(all_user_captchas.len(), 1);
-    assert_eq!(all_user_captchas[0], captcha);
-
-    // get captcha cooldown duration
-    assert_eq!(db.get_captcha_cooldown(c.key).await.unwrap(), c.duration);
-
-    // add traffic pattern
-    db.add_traffic_pattern(p.username, c.key, tp).await.unwrap();
-    assert_eq!(
-        &db.get_traffic_pattern(p.username, c.key).await.unwrap(),
-        tp
-    );
-
-    // delete traffic pattern
-    db.delete_traffic_pattern(p.username, c.key).await.unwrap();
-    assert!(
-        matches!(
-            db.get_traffic_pattern(p.username, c.key).await,
-            Err(DBError::TrafficPatternNotFound)
-        ),
-        "deletion successful; traffic pattern no longer exists"
-    );
-
-    // add captcha levels
-    db.add_captcha_levels(p.username, c.key, l).await.unwrap();
-
-    // get captcha levels with username
-    let levels = db
-        .get_captcha_levels(Some(p.username), c.key)
-        .await
-        .unwrap();
-    assert_eq!(levels, l);
-    // get captcha levels without username
-    let levels = db.get_captcha_levels(None, c.key).await.unwrap();
-    assert_eq!(levels, l);
-
-    /*
-     * Test stats
-     * 1. record fetch config
-     * 2. record solve
-     * 3. record token verify
-     * 4. fetch config fetches
-     * 5. fetch solves
-     * 6. fetch token verify
-     */
-
-    assert!(db
-        .fetch_config_fetched(p.username, c.key)
-        .await
-        .unwrap()
-        .is_empty());
-    assert!(db.fetch_solve(p.username, c.key).await.unwrap().is_empty());
-    assert!(db
-        .fetch_confirm(p.username, c.key)
-        .await
-        .unwrap()
-        .is_empty());
-
-    db.record_fetch(c.key).await.unwrap();
-    db.record_solve(c.key).await.unwrap();
-    db.record_confirm(c.key).await.unwrap();
-
-    // analytics start
-
-    db.analytics_create_psuedo_id_if_not_exists(c.key)
-        .await
-        .unwrap();
-    let psuedo_id = db
-        .analytics_get_psuedo_id_from_capmaign_id(c.key)
-        .await
-        .unwrap();
-    db.analytics_create_psuedo_id_if_not_exists(c.key)
-        .await
-        .unwrap();
-    assert_eq!(
-        psuedo_id,
-        db.analytics_get_psuedo_id_from_capmaign_id(c.key)
-            .await
-            .unwrap()
-    );
-    assert_eq!(
-        c.key,
-        db.analytics_get_capmaign_id_from_psuedo_id(&psuedo_id)
-            .await
-            .unwrap()
-    );
-
-    let analytics = CreatePerformanceAnalytics {
-        time: 0,
-        difficulty_factor: 0,
-        worker_type: "wasm".into(),
-    };
-    db.analysis_save(c.key, &analytics).await.unwrap();
-    let limit = 50;
-    let mut offset = 0;
-    let a = db.analytics_fetch(c.key, limit, offset).await.unwrap();
-    assert_eq!(a[0].time, analytics.time);
-    assert_eq!(a[0].difficulty_factor, analytics.difficulty_factor);
-    assert_eq!(a[0].worker_type, analytics.worker_type);
-    offset += 1;
-    assert!(db
-        .analytics_fetch(c.key, limit, offset)
-        .await
-        .unwrap()
-        .is_empty());
-
-    db.analytics_delete_all_records_for_campaign(c.key)
-        .await
-        .unwrap();
-    assert_eq!(db.analytics_fetch(c.key, 1000, 0).await.unwrap().len(), 0);
-    assert!(!db.analytics_captcha_is_published(c.key).await.unwrap());
-    db.analytics_delete_all_records_for_campaign(c.key)
-        .await
-        .unwrap();
-    // analytics end
-
-    assert_eq!(db.fetch_solve(p.username, c.key).await.unwrap().len(), 1);
-    assert_eq!(
-        db.fetch_config_fetched(p.username, c.key)
-            .await
-            .unwrap()
-            .len(),
-        1
-    );
-    assert_eq!(db.fetch_solve(p.username, c.key).await.unwrap().len(), 1);
-    assert_eq!(db.fetch_confirm(p.username, c.key).await.unwrap().len(), 1);
-
-    // update captcha key; set key = username;
-    db.update_captcha_key(p.username, c.key, p.username)
-        .await
-        .unwrap();
-    // checking for captcha with old key; shouldn't exist
-    assert!(!db.captcha_exists(Some(p.username), c.key).await.unwrap());
-    // checking for captcha with new key; shouldn exist
-    assert!(db
-        .captcha_exists(Some(p.username), p.username)
-        .await
-        .unwrap());
-
-    // delete captcha levels
-    db.delete_captcha_levels(p.username, c.key).await.unwrap();
-
-    // update captcha; set description = username and duration *= duration;
-    let mut c2 = c.clone();
-    c2.duration *= c2.duration;
-    c2.description = p.username;
-    db.update_captcha_metadata(p.username, &c2).await.unwrap();
-
-    // delete captcha; updated key = p.username so invoke delete with it
-    db.delete_captcha(p.username, p.username).await.unwrap();
-    assert!(!db.captcha_exists(Some(p.username), c.key).await.unwrap());
-}

db/db-migrations/.gitignore

@@ -1,2 +0,0 @@
-/target
-/Cargo.lock

db/db-migrations/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "db-migrations"
-version = "0.1.0"
-edition = "2021"
-homepage = "https://mcaptcha.org"
-repository = "https://github.com/mCaptcha/mCaptcha"
-documentation = "https://mcaptcha.org/docs/"
-license = "AGPLv3 or later version"
-authors = ["realaravinth <realaravinth@batsense.net>"]
-
-[dependencies]
-actix-rt = "2"
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline", "mysql" ] }

db/db-migrations/sqlx-data.json

@@ -1,3 +0,0 @@
-{
-  "db": "PostgreSQL"
-}

db/db-migrations/src/main.rs

@@ -1,56 +0,0 @@
-/*
- * 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::env;
-
-use sqlx::postgres::PgPoolOptions;
-use sqlx::mysql::MySqlPoolOptions;
-
-#[cfg(not(tarpaulin_include))]
-#[actix_rt::main]
-async fn main() {
-    //TODO featuregate sqlite and postgres
-    postgres_migrate().await;
-    maria_migrate().await;
-}
-
-async fn postgres_migrate() {
-    let db_url = env::var("POSTGRES_DATABASE_URL").expect("set POSTGRES_DATABASE_URL env var");
-    let db = PgPoolOptions::new()
-        .max_connections(2)
-        .connect(&db_url)
-        .await
-        .expect("Unable to form database pool");
-
-    sqlx::migrate!("../db-sqlx-postgres/migrations/")
-        .run(&db)
-        .await
-        .unwrap();
-}
-
-async fn maria_migrate() {
-    let db_url = env::var("MARIA_DATABASE_URL").expect("set POSTGRES_DATABASE_URL env var");
-    let db = MySqlPoolOptions::new()
-        .max_connections(2)
-        .connect(&db_url)
-        .await
-        .expect("Unable to form database pool");
-
-    sqlx::migrate!("../db-sqlx-maria/migrations/")
-        .run(&db)
-        .await
-        .unwrap();
-}

db/db-sqlx-maria/.gitignore

@@ -1,16 +0,0 @@
-/target
-tarpaulin-report.html
-.env
-.env
-cobertura.xml
-prod/
-node_modules/
-/static-assets/bundle
-static/cache/bundle
-./templates/**/*.js
-/static-assets/bundle/*
-src/cache_buster_data.json
-coverage
-dist
-assets
-yarn-error.log

db/db-sqlx-maria/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "db-sqlx-maria"
-version = "0.1.0"
-edition = "2021"
-homepage = "https://mcaptcha.org"
-repository = "https://github.com/mCaptcha/mCaptcha"
-documentation = "https://mcaptcha.org/docs/"
-license = "AGPLv3 or later version"
-authors = ["realaravinth <realaravinth@batsense.net>"]
-
-[dependencies]
-async-trait = "0.1.51"
-db-core = {path = "../db-core"}
-futures = "0.3.15"
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "mysql", "time", "offline" ] }
-uuid = { version = "1.4.0", features = ["v4", "serde"] }
-
-[dev-dependencies]
-actix-rt = "2"
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "mysql", "time", "offline" ] }
-db-core = {path = "../db-core", features = ["test"]}
-url = { version  = "2.2.2", features = ["serde"] }

db/db-sqlx-maria/migrations/20210310122154_mcaptcha_users.sql

@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_users (
-	name VARCHAR(100) NOT NULL UNIQUE,
-	email VARCHAR(100) UNIQUE DEFAULT NULL,
-	email_verified BOOLEAN DEFAULT NULL,
-    secret varchar(50) NOT NULL UNIQUE,
-	password TEXT NOT NULL,
-	ID INT auto_increment,
-	PRIMARY KEY(ID)
-);

db/db-sqlx-maria/migrations/20210310122617_mcaptcha_config.sql

@@ -1,16 +0,0 @@
--- TODO: changed key -> captcha_key
-
-CREATE TABLE IF NOT EXISTS mcaptcha_config (
-	config_id INT auto_increment,
-	PRIMARY KEY(config_id),
-	user_id INT NOT NULL,
-	captcha_key varchar(100) NOT NULL UNIQUE,
-	name varchar(100) NOT NULL,
-	duration integer NOT NULL DEFAULT 30,
-
-	CONSTRAINT `fk_mcaptcha_user`
-		FOREIGN KEY (user_id)
-		REFERENCES mcaptcha_users (ID)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20210310122902_mcaptcha_levels.sql

@@ -1,12 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_levels (
-	config_id INTEGER NOT NULL,
-	difficulty_factor INTEGER NOT NULL,
-	visitor_threshold INTEGER NOT NULL,
-	level_id INT auto_increment,
-	PRIMARY KEY(level_id),
-	CONSTRAINT `fk_mcaptcha_config_id`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20210430032935_mcaptcha_pow_fetched_stats.sql

@@ -1,10 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_pow_fetched_stats (
-	config_id INTEGER NOT NULL,
-	time timestamp NOT NULL DEFAULT now(),
-	CONSTRAINT `fk_mcaptcha_config_id_pow_fetched_stats`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-
-);

db/db-sqlx-maria/migrations/20210509135118_mcaptcha_pow_solved_stats.sql

@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_pow_solved_stats (
-	config_id INTEGER NOT NULL,
-	time timestamp NOT NULL DEFAULT now(),
-	CONSTRAINT `fk_mcaptcha_config_id_pow_solved_stats`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20210509135154_mcaptcha_pow_confirmed_stats.sql

@@ -1,10 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_pow_confirmed_stats (
-	config_id INTEGER NOT NULL,
-	time timestamp NOT NULL DEFAULT now(),
-	CONSTRAINT `fk_mcaptcha_config_id_pow_confirmed_stats`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-
-);

db/db-sqlx-maria/migrations/20210509151150_mcaptcha_notifications.sql

@@ -1,19 +0,0 @@
--- Add migration script here
-CREATE TABLE IF NOT EXISTS mcaptcha_notifications (
-	id INT auto_increment,
-	PRIMARY KEY(id),
-
-	tx INT NOT NULL,
-	rx INT NOT NULL,
-	heading varchar(30) NOT NULL,
-	message varchar(250) NOT NULL,
-	-- todo: mv read -> read_notification 
-	read_notification BOOLEAN DEFAULT null,
-	received timestamp NOT NULL DEFAULT now(),
-
-	CONSTRAINT `fk_mcaptcha_mcaptcha_user_notifications_tx`
-		FOREIGN KEY (tx)
-		REFERENCES mcaptcha_users (ID)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20211202141927_mcaptcha_sitekey_user_provided_avg_traffic.sql

@@ -1,13 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_sitekey_user_provided_avg_traffic (
-	config_id INT NOT NULL,
-	PRIMARY KEY(config_id),
-	avg_traffic INTEGER DEFAULT NULL,
-	peak_sustainable_traffic INTEGER DEFAULT NULL,
-	broke_my_site_traffic INT DEFAULT NULL,
-
-	CONSTRAINT `fk_mcaptcha_sitekey_user_provided_avg_trafic_config_id`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20211218133703_change_user_provided_avg_traffic_col_datatype.sql

@@ -1,3 +0,0 @@
-ALTER TABLE mcaptcha_sitekey_user_provided_avg_traffic 
-	MODIFY avg_traffic INTEGER NOT NULL,
-	MODIFY peak_sustainable_traffic INTEGER NOT NULL;

db/db-sqlx-maria/migrations/20220526114806_alter_notifications_table.sql

@@ -1,2 +0,0 @@
--- Add migration script here
-ALTER TABLE mcaptcha_notifications MODIFY heading varchar(100) NOT NULL;

db/db-sqlx-maria/migrations/20230627132800_mcaptcha_pow_analytics.sql

@@ -1,13 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_pow_analytics (
-	ID INT auto_increment,
-	PRIMARY KEY(ID),
-	config_id INTEGER NOT NULL,
-	time INTEGER NOT NULL,
-	difficulty_factor INTEGER NOT NULL,
-	worker_type VARCHAR(100) NOT NULL,
-	CONSTRAINT `fk_mcaptcha_config_id_pow_analytics`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-);

db/db-sqlx-maria/migrations/20230629185331_mcaptcha_psuedo_campaign_id.sql

@@ -1,13 +0,0 @@
-CREATE TABLE IF NOT EXISTS mcaptcha_psuedo_campaign_id (
-	ID INT auto_increment,
-	PRIMARY KEY(ID),
-	psuedo_id varchar(100) NOT NULL UNIQUE,
-	config_id INT NOT NULL,
-
-	CONSTRAINT `fk_mcaptcha_psuedo_campaign_id_config_id`
-		FOREIGN KEY (config_id)
-		REFERENCES mcaptcha_config (config_id)
-		ON DELETE CASCADE
-		ON UPDATE CASCADE
-
-);

db/db-sqlx-maria/src/errors.rs

@@ -1,55 +0,0 @@
-/*
- * 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/>.
- */
-
-//! Error-handling utilities
-use std::borrow::Cow;
-
-use db_core::dev::*;
-use sqlx::Error;
-
-/// map custom row not found error to DB error
-pub fn map_row_not_found_err(e: Error, row_not_found: DBError) -> DBError {
-    if let Error::RowNotFound = e {
-        row_not_found
-    } else {
-        map_register_err(e)
-    }
-}
-
-/// map postgres errors to [DBError](DBError) types
-pub fn map_register_err(e: Error) -> DBError {
-    if let Error::Database(err) = e {
-        if err.code() == Some(Cow::from("23000")) {
-            let msg = err.message();
-            if msg.contains("for key 'name'") {
-                DBError::UsernameTaken
-            } else if msg.contains("for key 'email'") {
-                DBError::EmailTaken
-            } else if msg.contains("for key 'secret'") {
-                DBError::SecretTaken
-            } else if msg.contains("for key 'captcha_key'") {
-                DBError::CaptchaKeyTaken
-            } else {
-                DBError::DBError(Box::new(Error::Database(err)))
-            }
-        } else {
-            DBError::DBError(Box::new(Error::Database(err)))
-        }
-    } else {
-        DBError::DBError(Box::new(e))
-    }
-}

db/db-sqlx-maria/src/get_all_unread_notifications.sql

@@ -1,24 +0,0 @@
--- gets all unread notifications a user has
-SELECT 
-    mcaptcha_notifications.id,
-    mcaptcha_notifications.heading,
-    mcaptcha_notifications.message,
-    mcaptcha_notifications.received,
-    mcaptcha_users.name
-FROM
-    mcaptcha_notifications 
-INNER JOIN 
-    mcaptcha_users 
-ON 
-    mcaptcha_notifications.tx = mcaptcha_users.id
-WHERE 
-    mcaptcha_notifications.rx = (
-        SELECT 
-            id 
-        FROM 
-            mcaptcha_users
-        WHERE
-            name = ?
-        )
-AND 
-    mcaptcha_notifications.read_notification IS NULL;

db/db-sqlx-maria/src/mark_notification_read.sql

@@ -1,14 +0,0 @@
---  mark a notification as read
-UPDATE mcaptcha_notifications
-    SET read_notification = TRUE
-WHERE 
-    mcaptcha_notifications.id = ?
-AND
-    mcaptcha_notifications.rx = (
-        SELECT
-            id
-        FROM
-            mcaptcha_users
-        WHERE
-        name = ?
-    );

db/db-sqlx-maria/src/tests.rs

@@ -1,92 +0,0 @@
-/*
- * 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/>.
- */
-#![cfg(test)]
-
-use sqlx::mysql::MySqlPoolOptions;
-use std::env;
-
-use crate::*;
-
-use db_core::tests::*;
-
-#[actix_rt::test]
-async fn everyting_works() {
-    const EMAIL: &str = "mariadbuser@foo.com";
-    const NAME: &str = "mariadbuser";
-    const PASSWORD: &str = "pasdfasdfasdfadf";
-    const SECRET1: &str = "mariadbsecret1";
-    // captcha config
-    const CAPTCHA_SECRET: &str = "mariadbcaptchasecret";
-    const CAPTCHA_DESCRIPTION: &str = "mariadbcaptchadescription";
-    const CAPTCHA_DURATION: i32 = 30;
-    // notification config
-    const HEADING: &str = "testing notifications get db mariadb";
-    const MESSAGE: &str = "testing notifications get message db mariadb";
-
-    // easy traffic pattern
-    const TRAFFIC_PATTERN: TrafficPattern = TrafficPattern {
-        avg_traffic: 500,
-        peak_sustainable_traffic: 5_000,
-        broke_my_site_traffic: Some(10_000),
-    };
-
-    const LEVELS: [Level; 3] = [
-        Level {
-            difficulty_factor: 1,
-            visitor_threshold: 1,
-        },
-        Level {
-            difficulty_factor: 2,
-            visitor_threshold: 2,
-        },
-        Level {
-            difficulty_factor: 3,
-            visitor_threshold: 3,
-        },
-    ];
-
-    const ADD_NOTIFICATION: AddNotification = AddNotification {
-        from: NAME,
-        to: NAME,
-        message: MESSAGE,
-        heading: HEADING,
-    };
-
-    let url = env::var("MARIA_DATABASE_URL").unwrap();
-    let pool_options = MySqlPoolOptions::new().max_connections(2);
-    let connection_options = ConnectionOptions::Fresh(Fresh {
-        pool_options,
-        url,
-        disable_logging: false,
-    });
-    let db = connection_options.connect().await.unwrap();
-
-    db.migrate().await.unwrap();
-    let p = Register {
-        username: NAME,
-        email: Some(EMAIL),
-        hash: PASSWORD,
-        secret: SECRET1,
-    };
-
-    let c = CreateCaptcha {
-        duration: CAPTCHA_DURATION,
-        key: CAPTCHA_SECRET,
-        description: CAPTCHA_DESCRIPTION,
-    };
-    database_works(&db, &p, &c, &LEVELS, &TRAFFIC_PATTERN, &ADD_NOTIFICATION).await;
-}

db/db-sqlx-maria/target/sqlx/query-02f728d61701808148f7de4697ccab05f55e1014a2c8d1f4f1244e1ad4d831f0.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT name, password  FROM mcaptcha_users WHERE email = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "password",
-        "type_info": {
-          "type": "Blob",
-          "flags": {
-            "bits": 4113
-          },
-          "char_set": 224,
-          "max_size": 262140
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "ed943cbf7e16536d81010255ce2f5beb207b2b9d44cb859fa9f2233405b80ae0"
-}

db/db-sqlx-maria/target/sqlx/query-07e28adbb89bae614bba0c0904f15b822f0f0105b76acdf96858e7024cec58a1.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_users \n        (name , password,  secret) VALUES (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "5d5a106981345e9f62bc2239c00cdc683d3aaaa820d63da300dc51e3f6f363d3"
-}

db/db-sqlx-maria/target/sqlx/query-097b3442a187b47dc14fdf38fe17d3ab67af26919be4274c9e9e1b44a7a561f2.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_notifications (\n              heading, message, tx, rx, received)\n              VALUES  (\n              ?, ?,\n                  (SELECT ID FROM mcaptcha_users WHERE name = ?),\n                  (SELECT ID FROM mcaptcha_users WHERE name = ?),\n                  ?\n                      );",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "89386c46668a2653a54687e65958af5cf7a8da268339a1f5a379ede47b3c6d2a"
-}

db/db-sqlx-maria/target/sqlx/query-0a7a833bea3fe85f63c5c79272a9654b81ccbf502db5465dbde99bbbac8cc504.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT name, password  FROM mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "password",
-        "type_info": {
-          "type": "Blob",
-          "flags": {
-            "bits": 4113
-          },
-          "char_set": 224,
-          "max_size": 262140
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "dd5ff10b88fa6f374e105b6bed9e34e0870ac8dd7ce36dfb09d13a1b7005b2eb"
-}

db/db-sqlx-maria/target/sqlx/query-0cc3965bf873878964fcf8f49c15e8f18f3aa46704023f2c0390f2ca452a29c6.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_config SET captcha_key = ? \n        WHERE captcha_key = ? AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "8e6026abf7c0e8ab90ee8eb7ada9f66962ab6999d3127944b058d6f96346e72f"
-}

db/db-sqlx-maria/target/sqlx/query-0ea092b8e99aaf89ce8f594bb6bea1f4d1a7864c618afc8303e70834661bc322.json

@@ -1,65 +0,0 @@
-{
-  "query": "SELECT captcha_key, name, config_id, duration FROM mcaptcha_config WHERE\n            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?) ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "captcha_key",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "duration",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 1
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "3812693a9ae4402d900bcbf680981e6194073bd1937af11a77daa3776fb4c873"
-}

db/db-sqlx-maria/target/sqlx/query-0f332230c9bf9073ca76e4c2d12d830c108152dda38b21a3fb79d6d8bbafbfe4.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set email = ?\n            WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "9cb416de904872d66af90baa0024f382ce6f8344464c607fe6e6c2572816dfc2"
-}

db/db-sqlx-maria/target/sqlx/query-0f5073c130439cbd8af6a32652953bd02b384abb520cd86a0677252d195e126d.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_config SET captcha_key = ? \n        WHERE captcha_key = ? AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "8e6026abf7c0e8ab90ee8eb7ada9f66962ab6999d3127944b058d6f96346e72f"
-}

db/db-sqlx-maria/target/sqlx/query-158a5b368a1cc649ea0cad755ac3db896d0e70758d73bd2fee0b0f84100c62bf.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_sitekey_user_provided_avg_traffic\n        WHERE config_id = (\n            SELECT config_id \n            FROM \n                mcaptcha_config \n            WHERE\n                captcha_key = ?\n            AND \n                user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)\n            );",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "fc717ff0827ccfaa1cc61a71cc7f71c348ebb03d35895c54b011c03121ad2385"
-}

db/db-sqlx-maria/target/sqlx/query-1d5eb46e28800b99de9aceb23e1ab2df84b1d366d2da23fcf91bee7aeb57c150.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set password = ?\n            WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "cad5b403470f26c565e74a1dca19b7dee066141dec0f708070067e34d5bf72cc"
-}

db/db-sqlx-maria/target/sqlx/query-224e80197d11caaded6fac021109949340cee94109f4dc74a0f88f473d85f9d2.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT config_id FROM mcaptcha_config\n                        WHERE\n                            captcha_key = ? \n                        AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "66ec7df10484f8e0206f3c97afc9136021589556c38dbbed341d6574487f79f2"
-}

db/db-sqlx-maria/target/sqlx/query-24000e17c9f323b887f25c78380a7fd40e6a208ed6154b63b89a54a77b986cf9.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_levels \n        WHERE config_id = (\n            SELECT config_id FROM mcaptcha_config where captcha_key= (?) \n            AND user_id = (\n            SELECT ID from mcaptcha_users WHERE name = ?\n            )\n            )",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "7894dda54cd65559fe3b81bab7df8cc848e21ed5c7f5e88951bf1c98c78ed820"
-}

db/db-sqlx-maria/target/sqlx/query-2482c80253baa2c6f9468cad07d46dab576cd5aa60b60d91a49ad50087f27600.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT duration FROM mcaptcha_config  \n            where captcha_key= ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "duration",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 1
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "8acbf84d4801e86221d8f6324ae50488a0986182d66b20ad414bce4e2ac18eca"
-}

db/db-sqlx-maria/target/sqlx/query-25a219dac97706cb910c5e1d0f33415bc086f17e5e594ef52db2ab9c190f55ef.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set name = ?\n            WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "676a9f1761c3b63cf16d7d4dd6261507cc7707feb32d458f4b946ed9caa53721"
-}

db/db-sqlx-maria/target/sqlx/query-2669fa9729fb661d2a9849566e13682ab4a2c556073b260f24f33bee794dd8c3.json

@@ -1,65 +0,0 @@
-{
-  "query": "SELECT `config_id`, `duration`, `name`, `captcha_key` from mcaptcha_config WHERE\n                        `captcha_key` = ? AND\n                        user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?) ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "duration",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 1
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "captcha_key",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "9c435148ed5655e79dd1e73e3566ce23b7c6d38edcedbb988c95813c5da893ed"
-}

db/db-sqlx-maria/target/sqlx/query-2c61a6af4c984fe9b824ec33f0f7453131e1ec94b0ab0d8ae1c38ae7708865a7.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_config where captcha_key= (?)\n                AND\n            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "b95e5a60a202cb646d5e76df8c7395e4bf881a6dd14e28e6f2e8b93e0536b331"
-}

db/db-sqlx-maria/target/sqlx/query-2d6c8ca1532dbafc10404fc6615a4d8fc07ccc36b37b286633296352a76b9901.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE\n            config_id = (\n                SELECT config_id FROM mcaptcha_config where captcha_key= (?)\n                AND user_id = (SELECT ID from mcaptcha_users WHERE name = ?)\n                )\n            ORDER BY difficulty_factor ASC;",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "difficulty_factor",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "visitor_threshold",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "df6de3b96afcfb7f364f98954995e506b19e80e7f88204405d970c360ad5e1a0"
-}

db/db-sqlx-maria/target/sqlx/query-2f530bc3e7a262cee2b789be9716665caf3548fed8e57a1c76745096ce10f735.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_config\n        (`captcha_key`, `user_id`, `duration`, `name`)\n        VALUES (?, (SELECT ID FROM mcaptcha_users WHERE name = ?), ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "d05b84966f4e70c53789221f961bf3637f404f3ba45e880115e97ed1ba5a2809"
-}

db/db-sqlx-maria/target/sqlx/query-354bc66833932a507482b8d746667bd34fa0a4c65c2eb6a64819c5db29adb597.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_levels (\n            difficulty_factor, \n            visitor_threshold,\n            config_id) VALUES  (\n            ?, ?, (\n                SELECT config_id FROM mcaptcha_config WHERE\n                captcha_key = (?) AND user_id = (\n                SELECT ID FROM mcaptcha_users WHERE name = ?\n                    )));",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "74d68a86f852d3d85957e94ed04e8acd8e6144744f7b13e383ebcb2bcf3360ae"
-}

db/db-sqlx-maria/target/sqlx/query-3be506902d4793b86340640ec056b713566c9a76b1bdfe4ecb0ead0a4270ef13.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_config SET name = ?, duration = ?\n            WHERE user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)\n            AND captcha_key = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "3a8381eb0f0542a492d9dd51368e769e2b313e0576a1873e5c7630011e463daf"
-}

db/db-sqlx-maria/target/sqlx/query-3df96e0a9f6657c7127453a5437061469500fc3594d71dc346cc18a87b687c2f.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT email FROM mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "email",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "413ea53cea8b8f114fc009bad527b054a68a94477dfcc50d860d45bbd864d4f1"
-}

db/db-sqlx-maria/target/sqlx/query-3dffd535c14f444bb8c7e2363c74244ebed7568e412630b1bb5cffac7e075ec0.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set secret = ?\n        WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "7838ade4a48068e25c6f117ee8e38f088b867b1ab08a7dd0269b76891266ace6"
-}

db/db-sqlx-maria/target/sqlx/query-3ee4271bfb8ca5326682a07112bf9a98ee0219356d5c438c1acd91f61baf94a3.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT name from mcaptcha_users WHERE email = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "caa1638ee510ef62b86817e5d2baeaca8dfa432c23d7630c0e70737211a4680b"
-}

db/db-sqlx-maria/target/sqlx/query-3f17c7099eecb0704b8ad7b4cb02bc85f543130f5013b7a878652eca9215d36f.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set email = ?\n            WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "9cb416de904872d66af90baa0024f382ce6f8344464c607fe6e6c2572816dfc2"
-}

db/db-sqlx-maria/target/sqlx/query-3f70f1b4eb3494c358d1e360189c82bf29d50f376faf3696a0e6fe1a6d78d2ac.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE\n            config_id = (\n                SELECT config_id FROM mcaptcha_config where captcha_key= (?)\n                ) ORDER BY difficulty_factor ASC;",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "difficulty_factor",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "visitor_threshold",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "6d43e6ceb54a0ff8a803bd96dd9134b15da01d48776ac0cf3d66a2997dadce5e"
-}

db/db-sqlx-maria/target/sqlx/query-407a463705faf766780d7e6160ec1123e858756b824a9577eff6dbfc1b068b59.json

@@ -1,78 +0,0 @@
-{
-  "query": "-- gets all unread notifications a user has\nSELECT \n    mcaptcha_notifications.id,\n    mcaptcha_notifications.heading,\n    mcaptcha_notifications.message,\n    mcaptcha_notifications.received,\n    mcaptcha_users.name\nFROM\n    mcaptcha_notifications \nINNER JOIN \n    mcaptcha_users \nON \n    mcaptcha_notifications.tx = mcaptcha_users.id\nWHERE \n    mcaptcha_notifications.rx = (\n        SELECT \n            id \n        FROM \n            mcaptcha_users\n        WHERE\n            name = ?\n        )\nAND \n    mcaptcha_notifications.read_notification IS NULL;\n",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "heading",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "message",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 1000
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "received",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": {
-            "bits": 1185
-          },
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "b9b0c63380bc0dfdea8aae092dcefceb316fe94667d74f53d53063810cdd2ba8"
-}

db/db-sqlx-maria/target/sqlx/query-44e2a73d8051007d9765190efd63f0a3e3bbca2e093c6007f98f9f3e7b990f59.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_notifications (\n              heading, message, tx, rx, received)\n              VALUES  (\n              ?, ?,\n                  (SELECT ID FROM mcaptcha_users WHERE name = ?),\n                  (SELECT ID FROM mcaptcha_users WHERE name = ?),\n                  ?\n                      );",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "89386c46668a2653a54687e65958af5cf7a8da268339a1f5a379ede47b3c6d2a"
-}

db/db-sqlx-maria/target/sqlx/query-467d567db84c717a9af27e7dd9a97b5b630a8568a90675ea62334f99877fc49e.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_users WHERE name = (?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": []
-  },
-  "hash": "6d1b6e5e58ca2ba285cab7b050bbdc43de1f3e46cf7d420bc95c124a1c7c9d1f"
-}

db/db-sqlx-maria/target/sqlx/query-48bd295d14e7cd91606216abc1a9a97ead59a2b2e6d4961c05ad368deda98fb9.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_pow_confirmed_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "34b29417f9ff3f4d5987df0ce81023b1985eb84e560602b36182f55de6cd9d83"
-}

db/db-sqlx-maria/target/sqlx/query-4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_pow_solved_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "e2b0b85f2afac1cbca43ce684641bf75ef070e44ce3d00404fc6151d2f4d7bcf"
-}

db/db-sqlx-maria/target/sqlx/query-51804ba9930fef6263231c911173fd423bd6668b0450edaf6f8e5cf82f1a910f.json

@@ -1,11 +0,0 @@
-{
-  "query": "--  mark a notification as read\nUPDATE mcaptcha_notifications\n    SET read_notification = TRUE\nWHERE \n    mcaptcha_notifications.id = ?\nAND\n    mcaptcha_notifications.rx = (\n        SELECT\n            id\n        FROM\n            mcaptcha_users\n        WHERE\n        name = ?\n    );\n",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "cf333541509213f11a9bf7119dcb3289bb77abf1482fc1d47e7f5bb27bdc8d97"
-}

db/db-sqlx-maria/target/sqlx/query-5263439119ce9bb0466d1c41b561534dee5aeae341209b0cf415f17fafc569c0.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_pow_fetched_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "598a8202942771eff460faa6f09bd3fb1fc910d5fab7edb07c49dadbbaeb1cb8"
-}

db/db-sqlx-maria/target/sqlx/query-53f4fa4344f0c383ec00aa719d68937ac3e1ba71c66f68c8d6d0252e517bc269.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_sitekey_user_provided_avg_traffic (\n            config_id,\n            avg_traffic,\n            peak_sustainable_traffic,\n            broke_my_site_traffic\n            ) VALUES ( \n             (SELECT config_id FROM mcaptcha_config where captcha_key= (?)\n             AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)\n            ), ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "22e697114c3ed5b0156cdceab11a398f1ef3a804f482e1cd948bc615ef95fc92"
-}

db/db-sqlx-maria/target/sqlx/query-541a99f9b1b33e11ebc6d5499b57252f90549047b3236a48cb46a85040ceb145.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT email FROM mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "email",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "413ea53cea8b8f114fc009bad527b054a68a94477dfcc50d860d45bbd864d4f1"
-}

db/db-sqlx-maria/target/sqlx/query-55c9d90d6ae45a67b40b0c64bcc74fbfde049a7d864428ee78da111c18039587.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT duration FROM mcaptcha_config  \n            where captcha_key= ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "duration",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 1
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "8acbf84d4801e86221d8f6324ae50488a0986182d66b20ad414bce4e2ac18eca"
-}

db/db-sqlx-maria/target/sqlx/query-56963dfae6a74dc79d7ef540dcf94d3190e90c1f14accc2cf45f3655e7e1c631.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT time FROM mcaptcha_pow_fetched_stats\n            WHERE \n                config_id = (\n                    SELECT \n                        config_id FROM mcaptcha_config \n                    WHERE \n                        captcha_key = ?\n                    AND\n                        user_id = (\n                        SELECT \n                            ID FROM mcaptcha_users WHERE name = ?))\n                ORDER BY time DESC",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "time",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": {
-            "bits": 1185
-          },
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "daac5e937aeac2f106eb89154b431fa8bd1bd7baa95e51704fdcdf50bd970a1d"
-}

db/db-sqlx-maria/target/sqlx/query-60f7a6daa83aec666ce22f81a8085f92a52908da647788fbd6a78411756813ce.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT secret  FROM mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "secret",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 200
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "dd9b4dec39405ff19af21faabb6a7c3bb3207e7e785fe15357146b88c6c27f01"
-}

db/db-sqlx-maria/target/sqlx/query-60fd8426d12a2cf38e30f4603150386e4f877af81f91a75811c7be7b6ecc7784.json

@@ -1,11 +0,0 @@
-{
-  "query": "insert into mcaptcha_users \n        (name , password, email, secret) values (?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "8ec8bbde0c02a99f74d12e6778f123a973283e6d56b6861b30f559768617848a"
-}

db/db-sqlx-maria/target/sqlx/query-633e9500936890b9e8cbb5d15ae662c31b1090158fb9a3efe2b89d2aa6338930.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_pow_fetched_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "598a8202942771eff460faa6f09bd3fb1fc910d5fab7edb07c49dadbbaeb1cb8"
-}

db/db-sqlx-maria/target/sqlx/query-6e84588fec629d930a606b236d648b0cb57415ca3e8466c389978262a72e61c7.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_levels \n        WHERE config_id = (\n            SELECT config_id FROM mcaptcha_config where captcha_key= (?) \n            AND user_id = (\n            SELECT ID from mcaptcha_users WHERE name = ?\n            )\n            )",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "7894dda54cd65559fe3b81bab7df8cc848e21ed5c7f5e88951bf1c98c78ed820"
-}

db/db-sqlx-maria/target/sqlx/query-735e6994816a36a30920faa2edfca83c007c63a3807d9a5729ed87e2a2f3581b.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set password = ?\n            WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "cad5b403470f26c565e74a1dca19b7dee066141dec0f708070067e34d5bf72cc"
-}

db/db-sqlx-maria/target/sqlx/query-78980c50d503e5cb539979688a25ef4fe397a302140884873379fac67f607893.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE\n            config_id = (\n                SELECT config_id FROM mcaptcha_config where captcha_key= (?)\n                AND user_id = (SELECT ID from mcaptcha_users WHERE name = ?)\n                )\n            ORDER BY difficulty_factor ASC;",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "difficulty_factor",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "visitor_threshold",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "df6de3b96afcfb7f364f98954995e506b19e80e7f88204405d970c360ad5e1a0"
-}

db/db-sqlx-maria/target/sqlx/query-78ba1313da9936a875dd30e059364a8601b51a3297a48d6309c00807ec6cdc76.json

@@ -1,11 +0,0 @@
-{
-  "query": "UPDATE mcaptcha_users set secret = ?\n        WHERE name = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "7838ade4a48068e25c6f117ee8e38f088b867b1ab08a7dd0269b76891266ace6"
-}

db/db-sqlx-maria/target/sqlx/query-7902699be42c8a8e46fbbb4501726517e86b22c56a189f7625a6da49081b2451.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT config_id from mcaptcha_config WHERE captcha_key = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "a89c066db044cddfdebee6a0fd0d80a5a26dcb7ecc00a9899f5634b72ea0a952"
-}

db/db-sqlx-maria/target/sqlx/query-7be15faa11902f118c36c79370c268599c4f2df77829aa246a51697174d3388d.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT config_id FROM mcaptcha_config\n                        WHERE\n                            captcha_key = ? \n                        AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "66ec7df10484f8e0206f3c97afc9136021589556c38dbbed341d6574487f79f2"
-}

db/db-sqlx-maria/target/sqlx/query-7cf69b059ca4456dab967c22caef23713c00203b47ec5670cdfa42f2dc5ac5d0.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_pow_solved_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "e2b0b85f2afac1cbca43ce684641bf75ef070e44ce3d00404fc6151d2f4d7bcf"
-}

db/db-sqlx-maria/target/sqlx/query-86a129013555a1be6c521a5d3ef60e5819517c38cb2ebb192e4328a3d5d59f15.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT name, password  FROM mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "password",
-        "type_info": {
-          "type": "Blob",
-          "flags": {
-            "bits": 4113
-          },
-          "char_set": 224,
-          "max_size": 262140
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "dd5ff10b88fa6f374e105b6bed9e34e0870ac8dd7ce36dfb09d13a1b7005b2eb"
-}

db/db-sqlx-maria/target/sqlx/query-928572cf7f6fd3bbca526b256f438733cfd56f8a18febf237b356b7a8099afc7.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_users \n        (name , password,  secret) VALUES (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "5d5a106981345e9f62bc2239c00cdc683d3aaaa820d63da300dc51e3f6f363d3"
-}

db/db-sqlx-maria/target/sqlx/query-9ef46bb3ab80736fca35e69d9a86d4233bda18e6e20221baca4c933cd69c281e.json

@@ -1,39 +0,0 @@
-{
-  "query": "SELECT name, password  FROM mcaptcha_users WHERE email = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "password",
-        "type_info": {
-          "type": "Blob",
-          "flags": {
-            "bits": 4113
-          },
-          "char_set": 224,
-          "max_size": 262140
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "ed943cbf7e16536d81010255ce2f5beb207b2b9d44cb859fa9f2233405b80ae0"
-}

db/db-sqlx-maria/target/sqlx/query-9f49b26658755c993637ca328660a90a617e4be3bbb5562d85cec43b0b994df9.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT name from mcaptcha_users WHERE email = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "caa1638ee510ef62b86817e5d2baeaca8dfa432c23d7630c0e70737211a4680b"
-}

db/db-sqlx-maria/target/sqlx/query-a61bb8bd8a92308a29e047ff5efcfc957fe5ea3a60c4597d3a68404fc6da24a3.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT time FROM mcaptcha_pow_confirmed_stats \n            WHERE \n                config_id = (\n                    SELECT config_id FROM mcaptcha_config \n                WHERE \n                    captcha_key = ?\n                AND\n                     user_id = (\n                        SELECT \n                            ID FROM mcaptcha_users WHERE name = ?))\n                ORDER BY time DESC",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "time",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": {
-            "bits": 1185
-          },
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "1367dceb151a766a901b5dd771d0b75d0bc61d2fef17a94a90c8ffa0065e2c44"
-}

db/db-sqlx-maria/target/sqlx/query-a763de03e370b22dba0a91f52a1b6289e984cb818ba7f450db2896e2b9ec10f6.json

@@ -1,11 +0,0 @@
-{
-  "query": "INSERT INTO mcaptcha_levels (\n            difficulty_factor, \n            visitor_threshold,\n            config_id) VALUES  (\n            ?, ?, (\n                SELECT config_id FROM mcaptcha_config WHERE\n                captcha_key = (?) AND user_id = (\n                SELECT ID FROM mcaptcha_users WHERE name = ?\n                    )));",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "74d68a86f852d3d85957e94ed04e8acd8e6144744f7b13e383ebcb2bcf3360ae"
-}

db/db-sqlx-maria/target/sqlx/query-a7909e64e6f78e56ab2965e6789e4ddde828871e0ac862405f93a99d67d4b399.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT config_id from mcaptcha_config WHERE captcha_key = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "a89c066db044cddfdebee6a0fd0d80a5a26dcb7ecc00a9899f5634b72ea0a952"
-}

db/db-sqlx-maria/target/sqlx/query-a9fab3b549f30955ad83e58d5810558263f591a6ff7ee5ca33086407ff0bb2a1.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT name from mcaptcha_users WHERE name = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "e6569a6064d0e07abea4c0bd4686cdfdaac64f0109ac40efaed06a744a2eaf5e"
-}

db/db-sqlx-maria/target/sqlx/query-af1f242ece4bfd6bca900dc7276b369f3ff261c2a5865c50e759ab48564cc747.json

@@ -1,26 +0,0 @@
-{
-  "query": "SELECT config_id from mcaptcha_config WHERE captcha_key = ?",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "config_id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "a89c066db044cddfdebee6a0fd0d80a5a26dcb7ecc00a9899f5634b72ea0a952"
-}

db/db-sqlx-maria/target/sqlx/query-b3fb7d1ab20ed1da96c37320a3029a9b027003c1646bbe4b477a4c7d078e81c7.json

@@ -1,11 +0,0 @@
-{
-  "query": "DELETE FROM mcaptcha_sitekey_user_provided_avg_traffic\n        WHERE config_id = (\n            SELECT config_id \n            FROM \n                mcaptcha_config \n            WHERE\n                captcha_key = ?\n            AND \n                user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)\n            );",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "fc717ff0827ccfaa1cc61a71cc7f71c348ebb03d35895c54b011c03121ad2385"
-}

db/db-sqlx-maria/target/sqlx/query-bb135562b9e6935caf2808ff62906191e268a584b44a71372fce33f573631188.json

@@ -1,78 +0,0 @@
-{
-  "query": "-- gets all unread notifications a user has\nSELECT \n    mcaptcha_notifications.id,\n    mcaptcha_notifications.heading,\n    mcaptcha_notifications.message,\n    mcaptcha_notifications.received,\n    mcaptcha_users.name\nFROM\n    mcaptcha_notifications \nINNER JOIN \n    mcaptcha_users \nON \n    mcaptcha_notifications.tx = mcaptcha_users.id\nWHERE \n    mcaptcha_notifications.rx = (\n        SELECT \n            id \n        FROM \n            mcaptcha_users\n        WHERE\n            name = ?\n        )\nAND \n    mcaptcha_notifications.read_notification IS NULL;\n",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": {
-          "type": "Long",
-          "flags": {
-            "bits": 515
-          },
-          "char_set": 63,
-          "max_size": 11
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "heading",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "message",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4097
-          },
-          "char_set": 224,
-          "max_size": 1000
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "received",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": {
-            "bits": 1185
-          },
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "name",
-        "type_info": {
-          "type": "VarString",
-          "flags": {
-            "bits": 4101
-          },
-          "char_set": 224,
-          "max_size": 400
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "b9b0c63380bc0dfdea8aae092dcefceb316fe94667d74f53d53063810cdd2ba8"
-}