cache buster version lock in

.dockerignore

@@ -1,14 +0,0 @@
-/target
-tarpaulin-report.html
-.env
-cobertura.xml
-prod/
-node_modules/
-/static-assets/bundle
-./templates/**/*.js
-/static/cache/bundle/*
-src/cache_buster_data.json
-
-browser/target
-browser/cobertura.xml
-browser/docs

.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"

.eslintrc.js

@@ -1,21 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/ban-types": "off",
-    indent: ["error", 2],
-    "linebreak-style": ["error", "unix"],
-    quotes: ["error", "double"],
-    semi: ["error", "always"],
-  },
-};

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-# patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-# ko_fi: # Replace with a single Ko-fi username
-# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: mcaptcha
-issuehunt: # Replace with a single IssueHunt username
-# otechie: # Replace with a single Otechie username
-custom: ['https://mcaptcha.org/donate']

.github/workflows/clippy-fmt.yml

@@ -1,75 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - master
-      - db-abstract
-
-jobs:
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: ⚡ Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            node_modules
-            ./docs/openapi/node_modules
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - uses: actions/checkout@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: rustfmt
-      - name: Check with rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: ⚡ Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            node_modules
-            ./docs/openapi/node_modules
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - uses: actions/checkout@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-          override: true
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "14.x"
-
-      - name: Build frontend
-        run: make frontend
-
-      - name: Check with Clippy
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --all-features

.github/workflows/coverage.yml

@@ -1,135 +0,0 @@
-name: Coverage
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - master
-      - db-abstract
-
-jobs:
-  build_and_test:
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-          - stable
-            #- 1.51.0
-
-    name: ${{ matrix.version }} - x86_64-unknown-linux-gnu
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: password
-          POSTGRES_USER: postgres
-          POSTGRES_DB: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --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
-        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
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            node_modules
-            ./docs/openapi/node_modules
-            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: Install ${{ matrix.version }}
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.version }}-x86_64-unknown-linux-gnu
-          profile: minimal
-          override: true
-
-      - name: Build frontend
-        run: make frontend
-
-      - name: Run the frontend tests
-        run: make frontend-test
-
-      - name: Run migrations
-        run: make migrate
-        env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
-          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')
-        uses: actions-rs/tarpaulin@v0.1
-        with:
-          args: "-t 1200"
-        env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
-          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
-          GIT_HASH: 8e77345f1597e40c2e266cb4e6dee74888918a61
-          CACHE_BUSTER_FILE_MAP: '{"map":{"./static/bundle/main.js":"./prod/bundle/main.1417115E59909BE0A01040A45A398ADB09D928DF89CCF038FA44B14850442096.js"},"base_dir":"./prod"}'
-          COMPILED_DATE: "2021-07-21"
-
-      - name: Upload to Codecov
-        if: github.event_name == 'pull_request'
-        uses: codecov/codecov-action@v2

.github/workflows/linux.yml

@@ -1,15 +1,12 @@
-name: Build
+name: CI (Linux)
 
 on:
-  schedule:
-    - cron: "0 9 * * *"
   pull_request:
     types: [opened, synchronize, reopened]
   push:
     branches:
       - master
-      - "*"
+
-      - '!gh-pages'
 
 jobs:
   build_and_test:
@@ -17,14 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          #- 1.51.0
           - stable
-            #  - nightly
+          - nightly
 
     name: ${{ matrix.version }} - x86_64-unknown-linux-gnu
     runs-on: ubuntu-latest
 
     services:
+
       postgres:
         image: postgres
         env:
@@ -39,35 +36,6 @@ jobs:
         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
-        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
@@ -76,26 +44,15 @@ jobs:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            node_modules
-            ./docs/openapi/node_modules
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: configure GPG key
+      - uses: borales/actions-yarn@v2.0.0
-        if: (github.ref == 'refs/heads/master' || github.event_name == 'push') && github.repository == 'realaravinth/dumbserve'
-        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"
+          cmd: install # will run `yarn install` command
+      - uses: borales/actions-yarn@v2.0.0
+        with:
+          cmd: build # will run `yarn build` command
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
@@ -105,58 +62,66 @@ jobs:
           override: true
 
       - name: Run migrations
-        run: make migrate
+        uses: actions-rs/cargo@v1
-        env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
-
-      - name: build
-        run: make
-        env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
-
-            #      - name: build frontend
-            #        run: make frontend
-            #
-      - name: lint frontend
-        run: yarn lint
-
-      - name: run tests
-        run: make test
-        env:
-          POSTGRES_DATABASE_URL: "${{ env.POSTGRES_DATABASE_URL }}"
-          MARIA_DATABASE_URL: "${{ env.MARIA_DATABASE_URL }}"
-
-      - 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
+          command: run
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          args: --bin tests-migrate
-
-      - 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 }}
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
-          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+
+      - name: check build
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --all --bins --examples --tests
+        env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
+
+
+      - name: tests
+        uses: actions-rs/cargo@v1
+        timeout-minutes: 40
+        with:
+          command: test
+          args: --all --all-features --no-fail-fast
+        env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
+
+
+      - name: Generate coverage file
+        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        uses: actions-rs/tarpaulin@v0.1
+        with:
+          version: '0.15.0'
+          args: '-t 1200'
+        env:
+          DATABASE_URL: postgres://postgres:password@localhost:5432/postgres
+          # 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
+          GIT_HASH: 8e77345f1597e40c2e266cb4e6dee74888918a61 
+          OPEN_API_DOCS: 8e77345f1597e40c2e266cb4e6dee74888918a61 
+          CACHE_BUSTER_FILE_MAP: '{"map":{"./static/bundle/main.js":"./prod/bundle/main.1417115E59909BE0A01040A45A398ADB09D928DF89CCF038FA44B14850442096.js"},"base_dir":"./prod"}'
+
+      - name: Upload to Codecov
+        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        uses: codecov/codecov-action@v1
+        with:
+          file: cobertura.xml
 
       - name: generate documentation
-        if: matrix.version == 'stable' && (github.repository == 'mCaptcha/mCaptcha')
+        if: matrix.version == 'stable' && (github.repository == 'mCaptcha/guard')
-        run: make doc
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --no-deps --workspace --all-features
         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
-          GIT_HASH: 8e77345f1597e40c2e266cb4e6dee74888918a61 # dummy value
+          OPEN_API_DOCS: 8e77345f1597e40c2e266cb4e6dee74888918a61 
-          COMPILED_DATE: "2021-07-21"
 
       - name: Deploy to GitHub Pages
-        if: matrix.version == 'stable' && (github.repository == 'mCaptcha/mCaptcha')
+        if: matrix.version == 'stable' && (github.repository == 'mCaptcha/guard')
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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 }}

.gitignore

@@ -5,12 +5,3 @@ tarpaulin-report.html
 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

CHANGELOG.md

@@ -1,19 +0,0 @@
-## 0.1.0(unreleased)
-
-### 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:
-    > ...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

@@ -1,57 +1,57 @@
 [package]
-name = "mcaptcha"
+name = "guard"
 version = "0.1.0"
 description = "mCaptcha - a PoW-based CAPTCHA system"
 homepage = "https://mcaptcha.org"
-repository = "https://github.com/mCaptcha/mCaptcha"
+repository = "https://github.com/mCaptcha/guard"
 documentation = "https://mcaptcha.org/docs/"
-license = "AGPLv3 or later version"
+lisense = "AGPLv3 or later version"
 authors = ["realaravinth <realaravinth@batsense.net>"]
-edition = "2021"
+edition = "2018"
-default-run = "mcaptcha"
+default-run = "guard"
 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"
+name = "guard"
 path = "./src/main.rs"
 
+[[bin]]
+name = "tests-migrate"
+path = "./src/tests-migrate.rs"
+
 [dependencies]
-actix-web = "4.0.1"
+actix-web = "3.3.2"
-actix = "0.13"
+actix = "0.10"
-actix-identity = "0.4.0"
+actix-identity = "0.3"
-actix-http = "3.0.4"
+actix-http = "2.2"
-actix-rt = "2"
+actix-rt = "1"
-actix-cors = "0.6.1"
+actix-cors = "0.5.4"
-actix-service = "2.0.0"
+actix-service = "1.0.6"
-async-trait = "0.1.51"
+
+csrf = "0.4.0"
+
 mime_guess = "2.0.3"
-rust-embed = "6.4.0"
+rust-embed = "5.9.0"
-cache-buster = { git = "https://github.com/realaravinth/cache-buster" }
+cache-buster = { version = "0.1.0", git = "https://github.com/realaravinth/cache-buster" }
 
-futures = "0.3.15"
+futures = "0.3.14"
-tokio = { version = "1.14", features = ["sync"]}
+
+sqlx = { version = "0.4.0", features = [ "runtime-actix-rustls", "postgres" ] }
+argon2-creds = { version = "0.2", git = "https://github.com/realaravinth/argon2-creds", commit = "61f2d1d" }
 
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline", "mysql"] }
-argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
-#argon2-creds = { version="*", path = "../../argon2-creds/" }
 config = "0.11"
-validator = { version = "0.15", features = ["derive"]}
+validator = { version = "0.13", features = ["derive"]}
 
-derive_builder = "0.11"
+derive_builder = "0.10"
 derive_more = "0.99"
 
 serde = "1"
 serde_json = "1"
+serde_yaml = "0.8.17"
 
 url = "2.2"
-urlencoding =  "2.1.0"
 
 pretty_env_logger = "0.4"
 log = "0.4"
@@ -59,54 +59,23 @@ log = "0.4"
 lazy_static = "1.4"
 
 
-#libmcaptcha = { version = "0.2.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"], tag ="0.2.2" }
+# m_captcha = { version = "0.1.2", git = "https://github.com/mCaptcha/mCaptcha" }
-libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
+m_captcha = { branch = "master", git = "https://github.com/mCaptcha/mCaptcha" }
-#libmcaptcha = { path = "../libmcaptcha", features = ["full"]}
 
 rand = "0.8"
 
-sailfish = "0.4.0"
+sailfish = "0.3.2"
-
-mime = "0.3.16"
-
-num_cpus = "1.13.1"
-
-lettre = { version = "0.10.0-rc.3", features = [
-"builder", 
-"tokio1", 
-"tokio1-native-tls",
-"smtp-transport"
-]}
-
-openssl = { version = "0.10.29", features = ["vendored"] }
-
-
-[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"
-package = "actix-web-codegen"
-
-[dependencies.actix-auth-middleware]
-version = "0.2.0"
-git = "https://github.com/realaravinth/actix-auth-middleware"
-features = ["actix_identity_backend"]
 
 [build-dependencies]
+serde_yaml = "0.8.17"
+serde = "1"
 serde_json = "1"
-sqlx = { version = "0.5.13", features = [ "runtime-actix-rustls", "postgres", "time", "offline", "mysql" ] }
+yaml-rust = "0.4.5"
+cache-buster = { version = "0.1.0", git = "https://github.com/realaravinth/cache-buster" }
+mime = "0.3.16"
+log = "0.4"
+config = "0.11"
+url = "2.2"
 
 [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"
-
-
-[target.x86_64-unknown-linux-musl]
-linker = "x86_64"

Cross.toml

@@ -1,5 +0,0 @@
-[build.env]
-passthrough = [
-    "RUST_BACKTRACE",
-    "RUST_LOG",
-]

DEVELOPMENT.md

@@ -0,0 +1,108 @@
+# Development Setup
+
+## Setting up development environment
+
+### Toolchain
+
+You'll have to install before you can start writing code.
+
+1. Install Rust:
+   Install Cargo(Rust toolchain) using [rustup](https://rustup.rs/) with:
+
+```
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+```
+
+2. Install Node:
+   Please refer to [official instructions](https://nodejs.org/en/download/)
+
+3. Install yarn:
+   `npm install -g yarn`
+   For more details, refer to [official
+   instructions](https://yarnpkg.com/getting-started/install)
+
+4. GNU Make:
+   If you are on Linux, it's probably already installed on your machine.
+
+You can check it's existence by running:
+
+```bash
+$ make --version
+```
+
+If it's not available, you download it with your package manager or
+refer to [official instructions](https://www.gnu.org/software/make/)
+
+### External Dependencies:
+
+### Postgres databse:
+
+The backend requires a Postgres database. We have
+compiletime SQL checks so without a database available, you won't be
+able to build the project.
+
+I use Postgres in Docker.
+
+1. To install Docker, please refer to [official
+   instructions](https://docs.docker.com/engine/install/].
+
+2. Create create database user:
+
+```bash
+$ docker create --name mcaptcha-postgres \
+	-e POSTGRES_PASSWORD=password \
+	-p 5432:5432    postgres
+```
+
+3. Start database container:
+
+```bash
+$ docker start mcaptcha-postgres
+```
+
+4. Set configurations:
+
+```bash
+$ cd guard # your copy of https://github.com/mCaptcha/guard
+$ echo 'export DATABASE_URL="postgres://postgres:password@localhost:5432/postgres"' > .env
+```
+
+**NOTE: Don't use this database for other projects**
+
+5. Run migrations:
+   This step is only required when migrations are updated. The server
+   binary has inbuilt migrations manager but that can only be used after
+   the server is compiled. Since we are trying to compile the server here,
+   we can't use that.
+
+However, this project ships with a utility to run migrations!
+
+```bash
+$ cd guard # your copy of https://github.com/mCaptcha/guard
+$ cargo run --bin tests-migrate
+```
+
+That's it, you are all set!
+
+## Build commands:
+
+### Compile:
+
+```bash
+$ cd guard # your copy of https://github.com/mCaptcha/guard
+$ make
+```
+
+### Additional commands:
+
+```bash
+➜  guard git:(master) ✗ make help
+  docs      	- build documentation
+  run       	- run developer instance
+  test 		- run unit and integration tests
+  migrate   	- run database migrations
+  dev-env 	- download dependencies
+  clean     	- drop builds and environments
+  coverage 	- build test coverage in HTML format
+  xml-coverage 	- build test coverage in XML for upload to codecov
+```

Dockerfile

@@ -1,52 +0,0 @@
-FROM node:16.0.0 as frontend
-RUN set -ex; \
-    apt-get update; \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends make
-RUN mkdir -p /src/docs/openapi/
-COPY package.json yarn.lock /src/
-COPY docs/openapi/package.json docs/openapi/yarn.lock /src/docs/openapi/
-WORKDIR /src
-RUN  yarn install && cd docs/openapi && yarn install
-WORKDIR /src
-RUN mkdir -p /src/static/cache/bundle
-COPY tsconfig.json webpack.config.js jest.config.ts /src/
-COPY templates /src/templates/
-COPY docs/openapi /src/docs/openapi/
-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 . .
-COPY --from=cacher /src/target target
-#COPY --from=cacher /src/db/db-core/target /src/db/db-core/target 
-#COPY --from=cacher /src/db/db-sqlx-postgres/target /src/db/db-sqlx-postgres/target 
-#COPY --from=cacher /src/db/db-migrations/target /src/db/db-migrations/target 
-#COPY --from=cacher /src/utils/cache-bust/target /src/utils/cache-bust/target 
-COPY --from=frontend /src/static/cache/bundle/ /src/static/cache/bundle/
-RUN cargo --version
-RUN make cache-bust
-RUN cargo build --release
-
-FROM debian:bullseye as mCaptcha
-LABEL org.opencontainers.image.source https://github.com/mCaptcha/mCaptcha
-RUN useradd -ms /bin/bash -u 1001 mcaptcha
-WORKDIR /home/mcaptcha
-COPY --from=rust /src/target/release/mcaptcha /usr/local/bin/
-COPY --from=rust /src/config/default.toml /etc/mcaptcha/config.toml
-USER mcaptcha
-CMD [ "/usr/local/bin/mcaptcha" ]

Makefile

@@ -1,131 +1,49 @@
-BUNDLE = static/cache/bundle
+# WIP
-OPENAPI = docs/openapi
+default: build-frontend
-CLEAN_UP = $(BUNDLE) src/cache_buster_data.json assets
-
-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
-
-default: frontend ## Build app in debug mode
-	$(call cache_bust)
 	cargo build
 
-check: ## Check for syntax errors on all workspaces
+run: build-frontend-dev
-	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
-	$(call cache_bust)
-	cargo tarpaulin -t 1200 --out Html
-
-doc: ## Generate documentation
-	#yarn doc
-	cargo doc --no-deps --workspace --all-features
-
-docker: ## Build Docker image
-	docker build -t mcaptcha/mcaptcha:master -t mcaptcha/mcaptcha:latest .
-
-docker-publish: docker ## Build and publish Docker image
-	docker push mcaptcha/mcaptcha:master 
-	docker push mcaptcha/mcaptcha:latest
-
-env: ## Setup development environtment
-	cargo fetch
-	$(call frontend_env)
-
-frontend-env: ## Install frontend deps
-	$(call frontend_env)
-
-frontend: ## Build frontend
-	$(call frontend_env)
-	cd $(OPENAPI) && yarn build
-	yarn install
-	@-rm -rf $(BUNDLE)
-	@-mkdir $(BUNDLE)
-	yarn build
-	@yarn run sass -s \
-		compressed templates/main.scss  \
-		./static/cache/bundle/css/main.css
-	@yarn run sass -s \
-		compressed templates/mobile.scss  \
-		./static/cache/bundle/css/mobile.css
-	@yarn run sass -s \
-		compressed templates/widget/main.scss  \
-		./static/cache/bundle/css/widget.css
-	@./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
-	yarn lint
-	cd $(OPENAPI)&& yarn test
-
-migrate: ## Run database migrations
-	cd db/db-migrations/ && cargo run
-
-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
 
+dev-env:
+	cargo fetch
+	yarn install
 
-sqlx-offline-data: ## prepare sqlx offline data
+docs:
-	cd db/db-sqlx-postgres && cargo sqlx prepare  \
+	cargo doc --no-deps --workspace --all-features
-		--database-url=${POSTGRES_DATABASE_URL} -- \
-		--all-features
-	cd db/db-sqlx-maria && cargo sqlx prepare  \
-		--database-url=${MARIA_DATABASE_URL} -- \
-		--all-features
-#	cd db/db-sqlx-sqlite/ \
-#		&& DATABASE_URL=${SQLITE_DATABASE_URL} cargo sqlx prepare
 
-test-db: ## run tests on database
+build-frontend-dev:
-	cd db/db-sqlx-postgres &&\
+	yarn start
-		DATABASE_URL=${POSTGRES_DATABASE_URL}\
-		cargo test --no-fail-fast
-test: frontend-test frontend ## Run all available tests
-	$(call cache_bust)
-	cd db/db-sqlx-postgres &&\
-		DATABASE_URL=${POSTGRES_DATABASE_URL}\
-		cargo test --no-fail-fast
-	cd db/db-sqlx-maria &&\
-		DATABASE_URL=${MARIA_DATABASE_URL}\
-		cargo test --no-fail-fast
-	cargo test --no-fail-fast
-#	./scripts/tests.sh
 
-xml-test-coverage: migrate ## Generate code coverage report in XML format
+build-frontend:
-	$(call cache_bust)
+	yarn build
+
+test: migrate
+	cargo test
+
+xml-test-coverage: migrate
 	cargo tarpaulin -t 1200 --out Xml
 
-help: ## Prints help for targets with comments
+coverage: migrate
-	@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	cargo tarpaulin -t 1200 --out Html
+
+release: build-frontend
+	cargo build --release
+
+clean:
+	cargo clean
+	yarn clean
+
+migrate:
+	cargo run --bin tests-migrate
+
+help:
+	@echo  '  docs      	- build documentation'
+	@echo  '  run       	- run developer instance'
+	@echo  '  test 		- run unit and integration tests'
+	@echo  '  migrate   	- run database migrations'
+	@echo  '  dev-env 	- download dependencies'
+	@echo  '  clean     	- drop builds and environments'
+	@echo  '  coverage 	- build test coverage in HTML format'
+	@echo  '  xml-coverage 	- build test coverage in XML for upload to codecov'
+	@echo  ''

README.md

@@ -1,131 +1,80 @@
 <div align="center">
-<img width="100px" alt="mcaptcha logo" src="./docs/res/icon-trans.png" />
+  <h1>mCaptcha Guard</h1>
-  <h1>mCaptcha</h1>
   <p>
-    <strong>
+    <strong>Back-end component of mCaptcha</strong>
-Proof of work based, privacy respecting CAPTCHA system with a kickass UX. 
-</strong>
   </p>
 
-[![Documentation](https://img.shields.io/badge/docs-master-blue?style=flat-square)](https://mcaptcha.github.io/mCaptcha/mCaptcha/)
+[![Documentation](https://img.shields.io/badge/docs-master-blue)](https://mcaptcha.github.io/guard/guard/)
-[![Build](https://github.com/mCaptcha/mCaptcha/actions/workflows/linux.yml/badge.svg)](https://github.com/mCaptcha/mCaptcha/actions/workflows/linux.yml)
+![CI (Linux)](<https://github.com/mCaptcha/guard/workflows/CI%20(Linux)/badge.svg>)
-[![Docker](https://img.shields.io/docker/pulls/mcaptcha/mcaptcha)](https://hub.docker.com/r/mcaptcha/mcaptcha)
+[![dependency status](https://deps.rs/repo/github/mCaptcha/guard/status.svg)](https://deps.rs/repo/github/mCaptcha/guard)
-[![dependency status](https://deps.rs/repo/github/mCaptcha/mCaptcha/status.svg?style=flat-square)](https://deps.rs/repo/github/mCaptcha/mCaptcha)
+[![codecov](https://codecov.io/gh/mCaptcha/guard/branch/master/graph/badge.svg)](https://codecov.io/gh/mCaptcha/guard)
-[![codecov](https://codecov.io/gh/mCaptcha/mCaptcha/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/mCaptcha/mCaptcha)
 <br />
-[![AGPL License](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square)](http://www.gnu.org/licenses/agpl-3.0)
+[![AGPL License](https://img.shields.io/badge/license-AGPL-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)
-[![Chat](https://img.shields.io/badge/matrix-+mcaptcha:matrix.batsense.net-purple?style=flat-square)](https://matrix.to/#/+mcaptcha:matrix.batsense.net)
-
-**STATUS: ACTIVE DEVELOPMENT**
 
 </div>
 
 </div>
 
-**Skip to [demo](#demo)**
+Guard is the back-end component of [mCaptcha](https://mcaptcha.org)
+system.
 
-[mCaptcha](https://mcaptcha.org) is a privacy respecting, _free_ CAPTCHA
+**STATUS: UNUSABLE BUT ACTIVE DEVELOPMENT**
-system with a kickass UX. Your users no longer have to interact with
-ridiculous image-based CAPTCHA system, wasting precious mental
-bandwidth. Instead, your computer will do the work for you, [see for
-yourself!](https://demo.mcaptcha.org/widget/?sitekey=pHy0AktWyOKuxZDzFfoaewncWecCHo23)
 
-## How does it work?
+### Development:
 
-mCaptcha uses SHA256 based proof-of-work(PoW) to rate limit users.
+See [DEVELOPMENT.md](./DEVELOPMENT.md)
 
-When a user wants to do something on an mCaptcha-protected website,
+### How to build
 
-1. they will have to generate proof-of-work(a bunch of math that will takes
+- Install Cargo using [rustup](https://rustup.rs/) with:
-   time to compute) and submit it to mCaptcha.
 
-2. We'll validate the proof:
+```
-
+$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-   - **if validation is unsuccessful**, they will be prevented from
-     accessing their target website
-   - **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.
-
-4. The target website should validate the user-submitted token with mCaptcha
-   before processing the user's request.
-
-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
-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
-to their request.
-
-## Why use mCaptcha?
-
-- [x] **Free software, privacy focused**
-- [x] **Seamless UX** - No more annoying CAPTCHAs!
-- [x] **No tracking:** Our CAPTCHA routes are cookie free!
-- [x] **IP address independent:** your users are behind a NAT? We got you covered!
-- [x] **Resistant to replay attacks:** proof-of-work configurations have
-      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
-      will be rejected.
-
-## Demo
-
-## Client-side widget:
-
-mCaptcha's UX is super silent, solving CAPTCHAs have never been more
-easier. One click and you are on your way.
-To observe mCaptcha in action, open dev tools and
-monitor console and network activity.
-
-1. [Link to widget](https://demo.mcaptcha.org/widget/?sitekey=pHy0AktWyOKuxZDzFfoaewncWecCHo23)
-
-2. [Video](https://github.com/mCaptcha/mCaptcha/blob/master/docs/res/widget-in-action.mp4?raw=true):
-
-### Demo servers are available at:
-
-- https://demo.mcaptcha.org/
-- 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
-development, database frequently wiped).
-
-### Self-hosted:
-
-Clone the repo and run the following from the root of the repo:
-
-```bash
-git clone https://github.com/mCaptcha/mCaptcha.git
-docker-compose up -d
 ```
 
-After the containers are up, visit [http://localhost:7000](http://localhost:7000) and login with the default credentials:
+- Clone the repository with:
 
-- username: aaronsw 
+```
-- password: password
+$ git clone https://github.com/mCaptcha/guard
+```
 
+- Build with Cargo:
 
-It takes a while to build the image so please be patient :)
+```
+$ cd guard && cargo build
+```
 
-See [DEPLOYMENT.md](./docs/DEPLOYMENT.md) detailed alternate deployment
+### Configuration:
-methods.
 
-## Development:
+Guard is highly configurable.
+Configuration is applied/merged in the following order:
 
-See [HACKING.md](./docs/HACKING.md)
+1. `config/default.toml`
+2. environment variables.
 
-## Deployment:
+#### Setup
 
-See [DEPLOYMENT.md](./docs/DEPLOYMENT.md)
+##### Environment variables:
 
-## Configuration:
+Setting environment variables are optional. The configuration files have
+all the necessary parameters listed. By setting environment variables,
+you will be overriding the values set in the configuration files.
 
-See [CONFIGURATION.md](./docs/CONFIGURATION.md)
+###### Database:
+
+| Name                      | Value                                  |
+| ------------------------- | -------------------------------------- |
+| `GUARD_DATEBASE_PASSWORD` | Postgres password                      |
+| `GUARD_DATEBASE_NAME`     | Postgres database name                 |
+| `GUARD_DATEBASE_PORT`     | Postgres port                          |
+| `GUARD_DATEBASE_HOSTNAME` | Postgres hostmane                      |
+| `GUARD_DATEBASE_USERNAME` | Postgres username                      |
+| `GUARD_DATEBASE_POOL`     | Postgres database connection pool size |
+
+###### Server:
+
+| Name                                | Value                                               |
+| ----------------------------------- | --------------------------------------------------- |
+| `GUARD_SERVER_PORT` (or) `PORT`\*\* | The port on which you want wagon to listen to       |
+| `GUARD_SERVER_IP`                   | The IP address on which you want wagon to listen to |
+| `GUARD_SERVER_STATIC_FILES_DIR`     | Path to directory containing static files           |

build.rs

@@ -1,22 +1,26 @@
 /*
- * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
+* Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
- *
+*
- * This program is free software: you can redistribute it and/or modify
+* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
+* it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
+* published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+* License, or (at your option) any later version.
- *
+*
- * This program is distributed in the hope that it will be useful,
+* This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+* GNU Affero General Public License for more details.
- *
+*
- * You should have received a copy of the GNU Affero General Public License
+* 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/>.
+* along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
+
 use std::process::Command;
 
-use sqlx::types::time::OffsetDateTime;
+use cache_buster::BusterBuilder;
+
+#[path = "./src/settings.rs"]
+mod settings;
 
 fn main() {
     // note: add error checking yourself.
@@ -27,6 +31,35 @@ fn main() {
     let git_hash = String::from_utf8(output.stdout).unwrap();
     println!("cargo:rustc-env=GIT_HASH={}", git_hash);
 
-    let now = OffsetDateTime::now_utc().format("%y-%m-%d");
+    let yml = include_str!("./openapi.yaml");
-    println!("cargo:rustc-env=COMPILED_DATE={}", &now);
+    let api_json: serde_json::Value = serde_yaml::from_str(yml).unwrap();
+    println!(
+        "cargo:rustc-env=OPEN_API_DOCS={}",
+        serde_json::to_string(&api_json).unwrap()
+    );
+    cache_bust();
+}
+
+fn cache_bust() {
+    let settings = settings::Settings::new().unwrap();
+    let types = vec![
+        mime::IMAGE_PNG,
+        mime::IMAGE_SVG,
+        mime::IMAGE_JPEG,
+        mime::IMAGE_GIF,
+        mime::APPLICATION_JAVASCRIPT,
+        mime::TEXT_CSS,
+    ];
+
+    let config = BusterBuilder::default()
+        .source("./static")
+        .result("./prod")
+        .prefix(settings.server.url_prefix)
+        .mime_types(types)
+        .copy(true)
+        .follow_links(true)
+        .build()
+        .unwrap();
+
+    config.process().unwrap();
 }

code_of_conduct.md

@@ -1,132 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-- The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][mozilla coc].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][faq]. Translations are available
-at [https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-[mozilla coc]: https://github.com/mozilla/diversity
-[faq]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

config/default.toml

@@ -1,42 +1,4 @@
 debug = true
-source_code = "https://github.com/mCaptcha/mCaptcha"
-commercial = false
-allow_demo = true
-allow_registration = true
-
-[server]
-# Please set a unique value, your mCaptcha instance's security depends on this being 
-# unique
-cookie_secret = "Zae0OOxf^bOJ#zN^&k7VozgW&QAx%n02TQFXpRMG4cCU0xMzgu3dna@tQ9dvc&TlE6p*n#kXUdLZJCQsuODIV%r$@o4%770ePQB7m#dpV!optk01NpY0@615w5e2Br4d"
-# 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= "0.0.0.0" 
-# enter your hostname, eg: example.com
-domain = "localhost"
-# Set true if you have setup TLS with a reverse proxy like Nginx.
-# Does HTTPS redirect and sends additional headers that can only be used if
-# HTTPS available to improve security
-proxy_has_tls = false
-#url_prefix = ""
-
-[captcha]
-# Please set a unique value, your mCaptcha instance's security depends on this being 
-# unique
-salt = "asdl;kjfhjawehfpa;osdkjasdvjaksndfpoanjdfainsdfaijdsfajlkjdsaf;ajsdfweroire"
-# 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
-peak_sustainable_traffic_difficulty = 3000000 # roughly 1.5s
-broke_my_site_traffic_difficulty = 5000000  # greater than 3.5s
-duration = 30 # cooldown period in seconds
 
 [database]
 # This section deals with the database location and how to access it
@@ -52,23 +14,26 @@ username = "postgres"
 password = "password"
 name = "postgres"
 pool = 4
-database_type="postgres" # "postgres", "maria"
 
-[redis]
+# This section deals with the configuration of the actual server
-# This section deals with the database location and how to access it
+[server]
-# Please note that at the moment, we have support for only postgresqa.
+# Please set a unique value, your mCaptcha instance's security depends on this being 
-# Example, if you are Batman, your config would be:
+# unique
-# hostname = "batcave.org"
+cookie_secret = "Zae0OOxf^bOJ#zN^&k7VozgW&QAx%n02TQFXpRMG4cCU0xMzgu3dna@tQ9dvc&TlE6p*n#kXUdLZJCQsuODIV%r$@o4%770ePQB7m#dpV!optk01NpY0@615w5e2Br4d"
-# port = "5432"
+# The port at which you want authentication to listen to
-# username = "batman"
+# takes a number, choose from 1000-10000 if you dont know what you are doing
-# password = "somereallycomplicatedBatmanpassword"
+port = 7000
-url = "redis://127.0.0.1"
+#IP address. Enter 0.0.0.0 to listen on all availale addresses
-pool = 4
+ip= "0.0.0.0" 
+# enter your hostname, eg: example.com
+domain = "localhost"
+allow_registration = true
+url_prefix = "/test"
 
-[smtp]
+[pow]
-from = "admin@localhost"
+# Please set a unique value, your mCaptcha instance's security depends on this being 
-reply = "admin@localhost"
+# unique
-url = "127.0.0.1"
+salt = "asdl;kjfhjawehfpa;osdkjasdvjaksndfpoanjdfainsdfaijdsfajlkjdsaf;ajsdfweroire"
-port = 10025
+# garbage collection period to manage mCaptcha system
-username = "admin"
+# leave untouched if you don't know what you are doing
-password = "password"
+gc = 30

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.2", git = "https://github.com/mCaptcha/libmcaptcha", features = ["minimal"], default-features = false, tag = "0.2.2"}
-libmcaptcha = { branch = "master", git = "https://github.com/mCaptcha/libmcaptcha", features = ["full"] }
-
-[features]
-default = []
-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,355 +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>>;
-}
-
-#[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,298 +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();
-
-    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,21 +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" ] }
-
-[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/sqlx-data.json

@@ -1,886 +0,0 @@
-{
-  "db": "MySQL",
-  "1367dceb151a766a901b5dd771d0b75d0bc61d2fef17a94a90c8ffa0065e2c44": {
-    "describe": {
-      "columns": [
-        {
-          "name": "time",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1185
-            },
-            "max_size": 19,
-            "type": "Timestamp"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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"
-  },
-  "22e697114c3ed5b0156cdceab11a398f1ef3a804f482e1cd948bc615ef95fc92": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 5
-      }
-    },
-    "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            ), ?, ?, ?)"
-  },
-  "34b29417f9ff3f4d5987df0ce81023b1985eb84e560602b36182f55de6cd9d83": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "INSERT INTO mcaptcha_pow_confirmed_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)"
-  },
-  "3812693a9ae4402d900bcbf680981e6194073bd1937af11a77daa3776fb4c873": {
-    "describe": {
-      "columns": [
-        {
-          "name": "captcha_key",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "name",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "config_id",
-          "ordinal": 2,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 515
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "duration",
-          "ordinal": 3,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT captcha_key, name, config_id, duration FROM mcaptcha_config WHERE\n            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?) "
-  },
-  "3a8381eb0f0542a492d9dd51368e769e2b313e0576a1873e5c7630011e463daf": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 4
-      }
-    },
-    "query": "UPDATE mcaptcha_config SET name = ?, duration = ?\n            WHERE user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)\n            AND captcha_key = ?"
-  },
-  "413ea53cea8b8f114fc009bad527b054a68a94477dfcc50d860d45bbd864d4f1": {
-    "describe": {
-      "columns": [
-        {
-          "name": "email",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        true
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT email FROM mcaptcha_users WHERE name = ?"
-  },
-  "598a8202942771eff460faa6f09bd3fb1fc910d5fab7edb07c49dadbbaeb1cb8": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "INSERT INTO mcaptcha_pow_fetched_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)"
-  },
-  "5d5a106981345e9f62bc2239c00cdc683d3aaaa820d63da300dc51e3f6f363d3": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 3
-      }
-    },
-    "query": "INSERT INTO mcaptcha_users \n        (name , password,  secret) VALUES (?, ?, ?)"
-  },
-  "66ec7df10484f8e0206f3c97afc9136021589556c38dbbed341d6574487f79f2": {
-    "describe": {
-      "columns": [
-        {
-          "name": "config_id",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 515
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "SELECT config_id FROM mcaptcha_config\n                        WHERE\n                            captcha_key = ? \n                        AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)"
-  },
-  "676a9f1761c3b63cf16d7d4dd6261507cc7707feb32d458f4b946ed9caa53721": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "UPDATE mcaptcha_users set name = ?\n            WHERE name = ?"
-  },
-  "6d1b6e5e58ca2ba285cab7b050bbdc43de1f3e46cf7d420bc95c124a1c7c9d1f": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "DELETE FROM mcaptcha_users WHERE name = (?)"
-  },
-  "6d43e6ceb54a0ff8a803bd96dd9134b15da01d48776ac0cf3d66a2997dadce5e": {
-    "describe": {
-      "columns": [
-        {
-          "name": "difficulty_factor",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "visitor_threshold",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "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;"
-  },
-  "74d68a86f852d3d85957e94ed04e8acd8e6144744f7b13e383ebcb2bcf3360ae": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 4
-      }
-    },
-    "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                    )));"
-  },
-  "7838ade4a48068e25c6f117ee8e38f088b867b1ab08a7dd0269b76891266ace6": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "UPDATE mcaptcha_users set secret = ?\n        WHERE name = ?"
-  },
-  "7894dda54cd65559fe3b81bab7df8cc848e21ed5c7f5e88951bf1c98c78ed820": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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            )"
-  },
-  "89386c46668a2653a54687e65958af5cf7a8da268339a1f5a379ede47b3c6d2a": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 5
-      }
-    },
-    "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                      );"
-  },
-  "8acbf84d4801e86221d8f6324ae50488a0986182d66b20ad414bce4e2ac18eca": {
-    "describe": {
-      "columns": [
-        {
-          "name": "duration",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT duration FROM mcaptcha_config  \n            where captcha_key= ?"
-  },
-  "8e6026abf7c0e8ab90ee8eb7ada9f66962ab6999d3127944b058d6f96346e72f": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 3
-      }
-    },
-    "query": "UPDATE mcaptcha_config SET captcha_key = ? \n        WHERE captcha_key = ? AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)"
-  },
-  "8ec8bbde0c02a99f74d12e6778f123a973283e6d56b6861b30f559768617848a": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 4
-      }
-    },
-    "query": "insert into mcaptcha_users \n        (name , password, email, secret) values (?, ?, ?, ?)"
-  },
-  "9c435148ed5655e79dd1e73e3566ce23b7c6d38edcedbb988c95813c5da893ed": {
-    "describe": {
-      "columns": [
-        {
-          "name": "config_id",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 515
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "duration",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "name",
-          "ordinal": 2,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "captcha_key",
-          "ordinal": 3,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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 = ?) "
-  },
-  "9cb416de904872d66af90baa0024f382ce6f8344464c607fe6e6c2572816dfc2": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "UPDATE mcaptcha_users set email = ?\n            WHERE name = ?"
-  },
-  "a89c066db044cddfdebee6a0fd0d80a5a26dcb7ecc00a9899f5634b72ea0a952": {
-    "describe": {
-      "columns": [
-        {
-          "name": "config_id",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 515
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT config_id from mcaptcha_config WHERE captcha_key = ?"
-  },
-  "b9258c2494d95701d19703cf5cd05a222057a0ccad943192138b1a4a94bf823b": {
-    "describe": {
-      "columns": [
-        {
-          "name": "secret",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 200,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT secret  FROM mcaptcha_users WHERE ID = (\n                    SELECT user_id FROM mcaptcha_config WHERE captcha_key = ?\n                    )"
-  },
-  "b95e5a60a202cb646d5e76df8c7395e4bf881a6dd14e28e6f2e8b93e0536b331": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "DELETE FROM mcaptcha_config where captcha_key= (?)\n                AND\n            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)"
-  },
-  "b9b0c63380bc0dfdea8aae092dcefceb316fe94667d74f53d53063810cdd2ba8": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 515
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "heading",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "message",
-          "ordinal": 2,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 1000,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "received",
-          "ordinal": 3,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1185
-            },
-            "max_size": 19,
-            "type": "Timestamp"
-          }
-        },
-        {
-          "name": "name",
-          "ordinal": 4,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "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"
-  },
-  "caa1638ee510ef62b86817e5d2baeaca8dfa432c23d7630c0e70737211a4680b": {
-    "describe": {
-      "columns": [
-        {
-          "name": "name",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT name from mcaptcha_users WHERE email = ?"
-  },
-  "cad5b403470f26c565e74a1dca19b7dee066141dec0f708070067e34d5bf72cc": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "UPDATE mcaptcha_users set password = ?\n            WHERE name = ?"
-  },
-  "cf333541509213f11a9bf7119dcb3289bb77abf1482fc1d47e7f5bb27bdc8d97": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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"
-  },
-  "d05b84966f4e70c53789221f961bf3637f404f3ba45e880115e97ed1ba5a2809": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 4
-      }
-    },
-    "query": "INSERT INTO mcaptcha_config\n        (`captcha_key`, `user_id`, `duration`, `name`)\n        VALUES (?, (SELECT ID FROM mcaptcha_users WHERE name = ?), ?, ?)"
-  },
-  "d4b92e8099cd29cfdb99aadeeada739bb6858667fc65f528ec484e98a9da21bc": {
-    "describe": {
-      "columns": [
-        {
-          "name": "time",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1185
-            },
-            "max_size": 19,
-            "type": "Timestamp"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "SELECT time FROM mcaptcha_pow_solved_stats \n            WHERE 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"
-  },
-  "daac5e937aeac2f106eb89154b431fa8bd1bd7baa95e51704fdcdf50bd970a1d": {
-    "describe": {
-      "columns": [
-        {
-          "name": "time",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 1185
-            },
-            "max_size": 19,
-            "type": "Timestamp"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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"
-  },
-  "dd5ff10b88fa6f374e105b6bed9e34e0870ac8dd7ce36dfb09d13a1b7005b2eb": {
-    "describe": {
-      "columns": [
-        {
-          "name": "name",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "password",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4113
-            },
-            "max_size": 262140,
-            "type": "Blob"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT name, password  FROM mcaptcha_users WHERE name = ?"
-  },
-  "dd9b4dec39405ff19af21faabb6a7c3bb3207e7e785fe15357146b88c6c27f01": {
-    "describe": {
-      "columns": [
-        {
-          "name": "secret",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 200,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT secret  FROM mcaptcha_users WHERE name = ?"
-  },
-  "df6de3b96afcfb7f364f98954995e506b19e80e7f88204405d970c360ad5e1a0": {
-    "describe": {
-      "columns": [
-        {
-          "name": "difficulty_factor",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "visitor_threshold",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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;"
-  },
-  "e2b0b85f2afac1cbca43ce684641bf75ef070e44ce3d00404fc6151d2f4d7bcf": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "INSERT INTO mcaptcha_pow_solved_stats \n        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)"
-  },
-  "e6569a6064d0e07abea4c0bd4686cdfdaac64f0109ac40efaed06a744a2eaf5e": {
-    "describe": {
-      "columns": [
-        {
-          "name": "name",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        }
-      ],
-      "nullable": [
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT name from mcaptcha_users WHERE name = ?"
-  },
-  "e91116ebce127833488130cf1060e0817e5677f39588632452b8d621688c405a": {
-    "describe": {
-      "columns": [
-        {
-          "name": "avg_traffic",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "peak_sustainable_traffic",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 4097
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        },
-        {
-          "name": "broke_my_site_traffic",
-          "ordinal": 2,
-          "type_info": {
-            "char_set": 63,
-            "flags": {
-              "bits": 0
-            },
-            "max_size": 11,
-            "type": "Long"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        true
-      ],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "query": "SELECT \n          avg_traffic, \n          peak_sustainable_traffic, \n          broke_my_site_traffic \n        FROM \n          mcaptcha_sitekey_user_provided_avg_traffic \n        WHERE \n          config_id = (\n            SELECT \n              config_id \n            FROM \n              mcaptcha_config \n            WHERE \n              captcha_key = ? \n              AND user_id = (\n                SELECT \n                  id \n                FROM \n                  mcaptcha_users \n                WHERE \n                  NAME = ?\n              )\n          )\n        "
-  },
-  "ed943cbf7e16536d81010255ce2f5beb207b2b9d44cb859fa9f2233405b80ae0": {
-    "describe": {
-      "columns": [
-        {
-          "name": "name",
-          "ordinal": 0,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4101
-            },
-            "max_size": 400,
-            "type": "VarString"
-          }
-        },
-        {
-          "name": "password",
-          "ordinal": 1,
-          "type_info": {
-            "char_set": 224,
-            "flags": {
-              "bits": 4113
-            },
-            "max_size": 262140,
-            "type": "Blob"
-          }
-        }
-      ],
-      "nullable": [
-        false,
-        false
-      ],
-      "parameters": {
-        "Right": 1
-      }
-    },
-    "query": "SELECT name, password  FROM mcaptcha_users WHERE email = ?"
-  },
-  "fc717ff0827ccfaa1cc61a71cc7f71c348ebb03d35895c54b011c03121ad2385": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Right": 2
-      }
-    },
-    "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            );"
-  }
-}

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/lib.rs

@@ -1,965 +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::str::FromStr;
-
-use db_core::dev::*;
-
-use sqlx::mysql::MySqlPoolOptions;
-use sqlx::types::time::OffsetDateTime;
-use sqlx::ConnectOptions;
-use sqlx::MySqlPool;
-
-pub mod errors;
-#[cfg(test)]
-pub mod tests;
-
-#[derive(Clone)]
-pub struct Database {
-    pub pool: MySqlPool,
-}
-
-/// Use an existing database pool
-pub struct Conn(pub MySqlPool);
-
-/// Connect to database
-pub enum ConnectionOptions {
-    /// fresh connection
-    Fresh(Fresh),
-    /// existing connection
-    Existing(Conn),
-}
-
-pub struct Fresh {
-    pub pool_options: MySqlPoolOptions,
-    pub disable_logging: bool,
-    pub url: String,
-}
-
-pub mod dev {
-    pub use super::errors::*;
-    pub use super::Database;
-    pub use db_core::dev::*;
-    pub use prelude::*;
-    pub use sqlx::Error;
-}
-
-pub mod prelude {
-    pub use super::*;
-    pub use db_core::prelude::*;
-}
-
-#[async_trait]
-impl Connect for ConnectionOptions {
-    type Pool = Database;
-    async fn connect(self) -> DBResult<Self::Pool> {
-        let pool = match self {
-            Self::Fresh(fresh) => {
-                let mut connect_options =
-                    sqlx::mysql::MySqlConnectOptions::from_str(&fresh.url).unwrap();
-                if fresh.disable_logging {
-                    connect_options.disable_statement_logging();
-                }
-                sqlx::mysql::MySqlConnectOptions::from_str(&fresh.url)
-                    .unwrap()
-                    .disable_statement_logging();
-                fresh
-                    .pool_options
-                    .connect_with(connect_options)
-                    .await
-                    .map_err(|e| DBError::DBError(Box::new(e)))?
-            }
-
-            Self::Existing(conn) => conn.0,
-        };
-        Ok(Database { pool })
-    }
-}
-
-use dev::*;
-
-#[async_trait]
-impl Migrate for Database {
-    async fn migrate(&self) -> DBResult<()> {
-        sqlx::migrate!("./migrations/")
-            .run(&self.pool)
-            .await
-            .map_err(|e| DBError::DBError(Box::new(e)))?;
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl MCDatabase for Database {
-    /// ping DB
-    async fn ping(&self) -> bool {
-        use sqlx::Connection;
-
-        if let Ok(mut con) = self.pool.acquire().await {
-            con.ping().await.is_ok()
-        } else {
-            false
-        }
-    }
-
-    /// register a new user
-    async fn register(&self, p: &Register) -> DBResult<()> {
-        let res = if let Some(email) = &p.email {
-            sqlx::query!(
-                "insert into mcaptcha_users 
-        (name , password, email, secret) values (?, ?, ?, ?)",
-                &p.username,
-                &p.hash,
-                &email,
-                &p.secret,
-            )
-            .execute(&self.pool)
-            .await
-        } else {
-            sqlx::query!(
-                "INSERT INTO mcaptcha_users 
-        (name , password,  secret) VALUES (?, ?, ?)",
-                &p.username,
-                &p.hash,
-                &p.secret,
-            )
-            .execute(&self.pool)
-            .await
-        };
-        res.map_err(map_register_err)?;
-        Ok(())
-    }
-
-    /// delete a user
-    async fn delete_user(&self, username: &str) -> DBResult<()> {
-        sqlx::query!("DELETE FROM mcaptcha_users WHERE name = (?)", username)
-            .execute(&self.pool)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-        Ok(())
-    }
-
-    /// check if username exists
-    async fn username_exists(&self, username: &str) -> DBResult<bool> {
-        match sqlx::query!("SELECT name from mcaptcha_users WHERE name = ?", username,)
-            .fetch_one(&self.pool)
-            .await
-        {
-            Ok(_) => Ok(true),
-            Err(sqlx::Error::RowNotFound) => Ok(false),
-            Err(e) => Err(map_register_err(e)),
-        }
-    }
-
-    /// get user email
-    async fn get_email(&self, username: &str) -> DBResult<Option<String>> {
-        struct Email {
-            email: Option<String>,
-        }
-
-        let res = sqlx::query_as!(
-            Email,
-            "SELECT email FROM mcaptcha_users WHERE name = ?",
-            username
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-        Ok(res.email)
-    }
-
-    /// check if email exists
-    async fn email_exists(&self, email: &str) -> DBResult<bool> {
-        match sqlx::query!("SELECT name from mcaptcha_users WHERE email = ?", email)
-            .fetch_one(&self.pool)
-            .await
-        {
-            Ok(_) => Ok(true),
-            Err(sqlx::Error::RowNotFound) => Ok(false),
-            Err(e) => Err(map_register_err(e)),
-        }
-    }
-
-    /// update a user's email
-    async fn update_email(&self, p: &UpdateEmail) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_users set email = ?
-            WHERE name = ?",
-            &p.new_email,
-            &p.username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(())
-    }
-
-    /// get a user's password
-    async fn get_password(&self, l: &Login) -> DBResult<NameHash> {
-        struct Password {
-            name: String,
-            password: String,
-        }
-
-        let rec = match l {
-            Login::Username(u) => sqlx::query_as!(
-                Password,
-                r#"SELECT name, password  FROM mcaptcha_users WHERE name = ?"#,
-                u,
-            )
-            .fetch_one(&self.pool)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?,
-
-            Login::Email(e) => sqlx::query_as!(
-                Password,
-                r#"SELECT name, password  FROM mcaptcha_users WHERE email = ?"#,
-                e,
-            )
-            .fetch_one(&self.pool)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?,
-        };
-
-        let res = NameHash {
-            hash: rec.password,
-            username: rec.name,
-        };
-
-        Ok(res)
-    }
-
-    /// update user's password
-    async fn update_password(&self, p: &NameHash) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_users set password = ?
-            WHERE name = ?",
-            &p.hash,
-            &p.username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(())
-    }
-
-    /// update username
-    async fn update_username(&self, current: &str, new: &str) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_users set name = ?
-            WHERE name = ?",
-            new,
-            current,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(())
-    }
-
-    /// get a user's secret
-    async fn get_secret(&self, username: &str) -> DBResult<Secret> {
-        let secret = sqlx::query_as!(
-            Secret,
-            r#"SELECT secret  FROM mcaptcha_users WHERE name = ?"#,
-            username,
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(secret)
-    }
-
-    /// get a user's secret from a captcha key
-    async fn get_secret_from_captcha(&self, key: &str) -> DBResult<Secret> {
-        let secret = sqlx::query_as!(
-            Secret,
-            r#"SELECT secret  FROM mcaptcha_users WHERE ID = (
-                    SELECT user_id FROM mcaptcha_config WHERE captcha_key = ?
-                    )"#,
-            key,
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(secret)
-    }
-
-    /// update a user's secret
-    async fn update_secret(&self, username: &str, secret: &str) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_users set secret = ?
-        WHERE name = ?",
-            &secret,
-            &username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(())
-    }
-
-    /// create new captcha
-    async fn create_captcha(&self, username: &str, p: &CreateCaptcha) -> DBResult<()> {
-        sqlx::query!(
-            "INSERT INTO mcaptcha_config
-        (`captcha_key`, `user_id`, `duration`, `name`)
-        VALUES (?, (SELECT ID FROM mcaptcha_users WHERE name = ?), ?, ?)",
-            p.key,
-            username,
-            p.duration as i32,
-            p.description,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        Ok(())
-    }
-
-    /// Get captcha config
-    async fn get_captcha_config(&self, username: &str, key: &str) -> DBResult<Captcha> {
-        let captcha = sqlx::query_as!(
-            InternaleCaptchaConfig,
-            "SELECT `config_id`, `duration`, `name`, `captcha_key` from mcaptcha_config WHERE
-                        `captcha_key` = ? AND
-                        user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?) ",
-            &key,
-            &username,
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(captcha.into())
-    }
-
-    /// Get all captchas belonging to user
-    async fn get_all_user_captchas(&self, username: &str) -> DBResult<Vec<Captcha>> {
-        let mut res = sqlx::query_as!(
-            InternaleCaptchaConfig,
-            "SELECT captcha_key, name, config_id, duration FROM mcaptcha_config WHERE
-            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?) ",
-            &username,
-        )
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        let mut captchas = Vec::with_capacity(res.len());
-
-        res.drain(0..).for_each(|r| captchas.push(r.into()));
-
-        Ok(captchas)
-    }
-
-    /// update captcha metadata; doesn't change captcha key
-    async fn update_captcha_metadata(
-        &self,
-        username: &str,
-        p: &CreateCaptcha,
-    ) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_config SET name = ?, duration = ?
-            WHERE user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)
-            AND captcha_key = ?",
-            p.description,
-            p.duration,
-            username,
-            p.key,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(())
-    }
-
-    /// update captcha key; doesn't change metadata
-    async fn update_captcha_key(
-        &self,
-        username: &str,
-        old_key: &str,
-        new_key: &str,
-    ) -> DBResult<()> {
-        sqlx::query!(
-            "UPDATE mcaptcha_config SET captcha_key = ? 
-        WHERE captcha_key = ? AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-            new_key,
-            old_key,
-            username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(())
-    }
-
-    /// Add levels to captcha
-    async fn add_captcha_levels(
-        &self,
-        username: &str,
-        captcha_key: &str,
-        levels: &[Level],
-    ) -> DBResult<()> {
-        use futures::future::try_join_all;
-        let mut futs = Vec::with_capacity(levels.len());
-
-        for level in levels.iter() {
-            let difficulty_factor = level.difficulty_factor as i32;
-            let visitor_threshold = level.visitor_threshold as i32;
-            let fut = sqlx::query!(
-                "INSERT INTO mcaptcha_levels (
-            difficulty_factor, 
-            visitor_threshold,
-            config_id) VALUES  (
-            ?, ?, (
-                SELECT config_id FROM mcaptcha_config WHERE
-                captcha_key = (?) AND user_id = (
-                SELECT ID FROM mcaptcha_users WHERE name = ?
-                    )));",
-                difficulty_factor,
-                visitor_threshold,
-                &captcha_key,
-                username,
-            )
-            .execute(&self.pool);
-            futs.push(fut);
-        }
-
-        try_join_all(futs)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(())
-    }
-
-    /// check if captcha exists
-    async fn captcha_exists(
-        &self,
-        username: Option<&str>,
-        captcha_key: &str,
-    ) -> DBResult<bool> {
-        //        let mut exists = false;
-
-        #[allow(dead_code)]
-        struct ConfigId {
-            config_id: i32,
-        }
-        let res = match username {
-            Some(username) => {
-                sqlx::query_as!(
-                    ConfigId,
-                    "SELECT config_id FROM mcaptcha_config
-                        WHERE
-                            captcha_key = ? 
-                        AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-                    captcha_key,
-                    username
-                )
-                .fetch_one(&self.pool)
-                .await
-                //                if let Some(x) = x.exists {
-                //                    exists = x;
-                //                };
-            }
-
-            None => {
-                sqlx::query_as!(
-                    ConfigId,
-                    "SELECT config_id from mcaptcha_config WHERE captcha_key = ?",
-                    &captcha_key,
-                )
-                .fetch_one(&self.pool)
-                .await
-            } //if let Some(x) = x.exists {
-              //    exists = x;
-              //};
-        };
-        match res {
-            Ok(_) => Ok(true),
-            Err(sqlx::Error::RowNotFound) => Ok(false),
-            Err(e) => Err(map_register_err(e)),
-        }
-    }
-
-    /// Delete all levels of a captcha
-    async fn delete_captcha_levels(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<()> {
-        sqlx::query!(
-            "DELETE FROM mcaptcha_levels 
-        WHERE config_id = (
-            SELECT config_id FROM mcaptcha_config where captcha_key= (?) 
-            AND user_id = (
-            SELECT ID from mcaptcha_users WHERE name = ?
-            )
-            )",
-            captcha_key,
-            username
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(())
-    }
-
-    /// Delete captcha
-    async fn delete_captcha(&self, username: &str, captcha_key: &str) -> DBResult<()> {
-        sqlx::query!(
-            "DELETE FROM mcaptcha_config where captcha_key= (?)
-                AND
-            user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)",
-            captcha_key,
-            username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(())
-    }
-
-    /// Get captcha levels
-    async fn get_captcha_levels(
-        &self,
-        username: Option<&str>,
-        captcha_key: &str,
-    ) -> DBResult<Vec<Level>> {
-        struct I32Levels {
-            difficulty_factor: i32,
-            visitor_threshold: i32,
-        }
-        let levels = match username {
-            None => sqlx::query_as!(
-                I32Levels,
-                "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE
-            config_id = (
-                SELECT config_id FROM mcaptcha_config where captcha_key= (?)
-                ) ORDER BY difficulty_factor ASC;",
-                captcha_key,
-            )
-            .fetch_all(&self.pool)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?,
-
-            Some(username) => sqlx::query_as!(
-                I32Levels,
-                "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE
-            config_id = (
-                SELECT config_id FROM mcaptcha_config where captcha_key= (?)
-                AND user_id = (SELECT ID from mcaptcha_users WHERE name = ?)
-                )
-            ORDER BY difficulty_factor ASC;",
-                captcha_key,
-                username
-            )
-            .fetch_all(&self.pool)
-            .await
-            .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?,
-        };
-
-        let mut new_levels = Vec::with_capacity(levels.len());
-        for l in levels.iter() {
-            new_levels.push(Level {
-                difficulty_factor: l.difficulty_factor as u32,
-                visitor_threshold: l.visitor_threshold as u32,
-            });
-        }
-        Ok(new_levels)
-    }
-
-    /// Get captcha's cooldown period
-    async fn get_captcha_cooldown(&self, captcha_key: &str) -> DBResult<i32> {
-        struct DurationResp {
-            duration: i32,
-        }
-
-        let resp = sqlx::query_as!(
-            DurationResp,
-            "SELECT duration FROM mcaptcha_config  
-            where captcha_key= ?",
-            captcha_key,
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(resp.duration)
-    }
-    /// Add traffic configuration
-    async fn add_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-        pattern: &TrafficPattern,
-    ) -> DBResult<()> {
-        sqlx::query!(
-            "INSERT INTO mcaptcha_sitekey_user_provided_avg_traffic (
-            config_id,
-            avg_traffic,
-            peak_sustainable_traffic,
-            broke_my_site_traffic
-            ) VALUES ( 
-             (SELECT config_id FROM mcaptcha_config where captcha_key= (?)
-             AND user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)
-            ), ?, ?, ?)",
-            //payload.avg_traffic,
-            captcha_key,
-            username,
-            pattern.avg_traffic as i32,
-            pattern.peak_sustainable_traffic as i32,
-            pattern.broke_my_site_traffic.as_ref().map(|v| *v as i32),
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-        Ok(())
-    }
-
-    /// Get traffic configuration
-    async fn get_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<TrafficPattern> {
-        struct Traffic {
-            peak_sustainable_traffic: i32,
-            avg_traffic: i32,
-            broke_my_site_traffic: Option<i32>,
-        }
-        let res = sqlx::query_as!(
-            Traffic,
-            "SELECT 
-          avg_traffic, 
-          peak_sustainable_traffic, 
-          broke_my_site_traffic 
-        FROM 
-          mcaptcha_sitekey_user_provided_avg_traffic 
-        WHERE 
-          config_id = (
-            SELECT 
-              config_id 
-            FROM 
-              mcaptcha_config 
-            WHERE 
-              captcha_key = ? 
-              AND user_id = (
-                SELECT 
-                  id 
-                FROM 
-                  mcaptcha_users 
-                WHERE 
-                  NAME = ?
-              )
-          )
-        ",
-            captcha_key,
-            username
-        )
-        .fetch_one(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::TrafficPatternNotFound))?;
-        Ok(TrafficPattern {
-            broke_my_site_traffic: res.broke_my_site_traffic.as_ref().map(|v| *v as u32),
-            avg_traffic: res.avg_traffic as u32,
-            peak_sustainable_traffic: res.peak_sustainable_traffic as u32,
-        })
-    }
-
-    /// Delete traffic configuration
-    async fn delete_traffic_pattern(
-        &self,
-        username: &str,
-        captcha_key: &str,
-    ) -> DBResult<()> {
-        sqlx::query!(
-            "DELETE FROM mcaptcha_sitekey_user_provided_avg_traffic
-        WHERE config_id = (
-            SELECT config_id 
-            FROM 
-                mcaptcha_config 
-            WHERE
-                captcha_key = ?
-            AND 
-                user_id = (SELECT ID FROM mcaptcha_users WHERE name = ?)
-            );",
-            captcha_key,
-            username,
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::TrafficPatternNotFound))?;
-        Ok(())
-    }
-
-    /// create new notification
-    async fn create_notification(&self, p: &AddNotification) -> DBResult<()> {
-        let now = now_unix_time_stamp();
-        sqlx::query!(
-            "INSERT INTO mcaptcha_notifications (
-              heading, message, tx, rx, received)
-              VALUES  (
-              ?, ?,
-                  (SELECT ID FROM mcaptcha_users WHERE name = ?),
-                  (SELECT ID FROM mcaptcha_users WHERE name = ?),
-                  ?
-                      );",
-            p.heading,
-            p.message,
-            p.from,
-            p.to,
-            now
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(map_register_err)?;
-
-        Ok(())
-    }
-
-    /// get all unread notifications
-    async fn get_all_unread_notifications(
-        &self,
-        username: &str,
-    ) -> DBResult<Vec<Notification>> {
-        let mut inner_notifications = sqlx::query_file_as!(
-            InnerNotification,
-            "./src/get_all_unread_notifications.sql",
-            &username
-        )
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::AccountNotFound))?;
-
-        let mut notifications = Vec::with_capacity(inner_notifications.len());
-
-        inner_notifications
-            .drain(0..)
-            .for_each(|n| notifications.push(n.into()));
-
-        Ok(notifications)
-    }
-
-    /// mark a notification read
-    async fn mark_notification_read(&self, username: &str, id: i32) -> DBResult<()> {
-        sqlx::query_file_as!(
-            Notification,
-            "./src/mark_notification_read.sql",
-            id,
-            &username
-        )
-        .execute(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::NotificationNotFound))?;
-
-        Ok(())
-    }
-
-    /// record PoWConfig fetches
-    async fn record_fetch(&self, key: &str) -> DBResult<()> {
-        let now = now_unix_time_stamp();
-        let _ = sqlx::query!(
-        "INSERT INTO mcaptcha_pow_fetched_stats 
-        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-        key,
-        &now,
-    )
-    .execute(&self.pool)
-    .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-        Ok(())
-    }
-
-    /// record PoWConfig solves
-    async fn record_solve(&self, key: &str) -> DBResult<()> {
-        let now = OffsetDateTime::now_utc();
-        let _ = sqlx::query!(
-        "INSERT INTO mcaptcha_pow_solved_stats 
-        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-        key,
-        &now,
-    )
-    .execute(&self.pool)
-    .await
-    .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-        Ok(())
-    }
-
-    /// record PoWConfig confirms
-    async fn record_confirm(&self, key: &str) -> DBResult<()> {
-        let now = now_unix_time_stamp();
-        let _ = sqlx::query!(
-        "INSERT INTO mcaptcha_pow_confirmed_stats 
-        (config_id, time) VALUES ((SELECT config_id FROM mcaptcha_config where captcha_key= ?), ?)",
-        key,
-        &now
-    )
-    .execute(&self.pool)
-    .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-        Ok(())
-    }
-
-    /// fetch PoWConfig fetches
-    async fn fetch_config_fetched(&self, user: &str, key: &str) -> DBResult<Vec<i64>> {
-        let records = sqlx::query_as!(
-            Date,
-            "SELECT time FROM mcaptcha_pow_fetched_stats
-            WHERE 
-                config_id = (
-                    SELECT 
-                        config_id FROM mcaptcha_config 
-                    WHERE 
-                        captcha_key = ?
-                    AND
-                        user_id = (
-                        SELECT 
-                            ID FROM mcaptcha_users WHERE name = ?))
-                ORDER BY time DESC",
-            &key,
-            &user,
-        )
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(Date::dates_to_unix(records))
-    }
-
-    /// fetch PoWConfig solves
-    async fn fetch_solve(&self, user: &str, key: &str) -> DBResult<Vec<i64>> {
-        let records = sqlx::query_as!(
-            Date,
-            "SELECT time FROM mcaptcha_pow_solved_stats 
-            WHERE config_id = (
-                SELECT config_id FROM mcaptcha_config 
-                WHERE 
-                    captcha_key = ?
-                AND
-                     user_id = (
-                        SELECT 
-                            ID FROM mcaptcha_users WHERE name = ?)) 
-                ORDER BY time DESC",
-            &key,
-            &user
-        )
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(Date::dates_to_unix(records))
-    }
-
-    /// fetch PoWConfig confirms
-    async fn fetch_confirm(&self, user: &str, key: &str) -> DBResult<Vec<i64>> {
-        let records = sqlx::query_as!(
-            Date,
-            "SELECT time FROM mcaptcha_pow_confirmed_stats 
-            WHERE 
-                config_id = (
-                    SELECT config_id FROM mcaptcha_config 
-                WHERE 
-                    captcha_key = ?
-                AND
-                     user_id = (
-                        SELECT 
-                            ID FROM mcaptcha_users WHERE name = ?))
-                ORDER BY time DESC",
-            &key,
-            &user
-        )
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| map_row_not_found_err(e, DBError::CaptchaNotFound))?;
-
-        Ok(Date::dates_to_unix(records))
-    }
-}
-
-#[derive(Clone)]
-struct Date {
-    time: OffsetDateTime,
-}
-
-impl Date {
-    fn dates_to_unix(mut d: Vec<Self>) -> Vec<i64> {
-        let mut dates = Vec::with_capacity(d.len());
-        d.drain(0..)
-            .for_each(|x| dates.push(x.time.unix_timestamp()));
-        dates
-    }
-}
-
-fn now_unix_time_stamp() -> OffsetDateTime {
-    OffsetDateTime::now_utc()
-}
-
-#[derive(Debug, Clone, PartialEq)]
-/// Represents notification
-pub struct InnerNotification {
-    /// receiver name  of the notification
-    pub name: String,
-    /// heading of the notification
-    pub heading: String,
-    /// message of the notification
-    pub message: String,
-    /// when notification was received
-    pub received: OffsetDateTime,
-    /// db assigned ID of the notification
-    pub id: i32,
-}
-
-impl From<InnerNotification> for Notification {
-    fn from(n: InnerNotification) -> Self {
-        Notification {
-            name: Some(n.name),
-            heading: Some(n.heading),
-            message: Some(n.message),
-            received: Some(n.received.unix_timestamp()),
-            id: Some(n.id),
-        }
-    }
-}
-
-#[derive(Clone)]
-struct InternaleCaptchaConfig {
-    config_id: i32,
-    duration: i32,
-    name: String,
-    captcha_key: String,
-}
-
-impl From<InternaleCaptchaConfig> for Captcha {
-    fn from(i: InternaleCaptchaConfig) -> Self {
-        Self {
-            config_id: i.config_id,
-            duration: i.duration,
-            description: i.name,
-            key: i.captcha_key,
-        }
-    }
-}

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"
-}