Restructure: preparing 0.3.0

.github/dependabot.yml

@@ -5,23 +5,30 @@ version: 2
 updates:
   # Enable version updates for cargo
   - package-ecosystem: "cargo"
-    # Look for `Cargo.toml` and `lock` files in the `root` directory
     directory: "/"
-    # Check the crates.io for updates every day (weekdays)
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/dap-bin"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/dap-lib"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/legacy"
     schedule:
       interval: "daily"
 
   # Enable version updates for Docker
   - package-ecosystem: "docker"
-    # Look for a `Dockerfile` in the `root` directory
-    directory: "/"
-    # Check for updates everyday
+    directory: "/docker"
     schedule:
       interval: "daily"
 
   # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      # Check for updates everyday
       interval: "daily"

.github/workflows/release-docker.yml

@@ -0,0 +1,113 @@
+name: Nightly and release build
+
+on:
+  push:
+    branches:
+      - "develop"
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+env:
+  GHCR: ghcr.io
+  GHCR_IMAGE_NAME: ${{ github.repository }}
+  DH_REGISTRY_NAME: jqtype/doh-auth-proxy
+
+jobs:
+  docker_build_and_push:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' }} || ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true }}
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.GHCR }}/${{ env.GHCR_IMAGE_NAME }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.GHCR }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Release Build and push x86_64
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true }}
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ env.GHCR }}/${{ env.GHCR_IMAGE_NAME }}:latest
+            ${{ env.DH_REGISTRY_NAME }}:latest
+          file: ./docker/Dockerfile
+          cache-from: type=gha,scope=doh-auth-proxy-latest
+          cache-to: type=gha,mode=max,scope=doh-auth-proxy-latest
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Nightly build and push x86_64
+        if: ${{ (github.ref_name == 'develop') && (github.event_name == 'push') }}
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ env.GHCR }}/${{ env.GHCR_IMAGE_NAME }}:nightly
+            ${{ env.DH_REGISTRY_NAME }}:nightly
+          file: ./docker/Dockerfile
+          cache-from: type=gha,scope=doh-auth-proxy-nightly
+          cache-to: type=gha,mode=max,scope=doh-auth-proxy-nightly
+          labels: ${{ steps.meta.outputs.labels }}
+
+  dispatch_release:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true }}
+    needs: docker_build_and_push
+    steps:
+      - name: check pull_request title
+        uses: kaisugi/[email protected]
+        id: regex-match
+        with:
+          text: ${{ github.event.pull_request.title }}
+          regex: "^(\\d+\\.\\d+\\.\\d+)$"
+
+      - name: checkout
+        if: ${{ steps.regex-match.outputs.match != '' }}
+        uses: actions/checkout@v4
+
+      - name: build release binary
+        if: ${{ steps.regex-match.outputs.match != '' }}
+        id: "build"
+        run: |
+          cargo build --release --package doh-auth-proxy
+          cp ./target/release/doh-auth-proxy /tmp/doh-auth-proxy
+          cd /tmp
+          tar zcvf doh-auth-proxy-x86_64-unknown-linux-gnu.tar.gz doh-auth-proxy
+
+      - name: release
+        if: ${{ steps.regex-match.outputs.match != ''}}
+        uses: softprops/action-gh-release@v1
+        with:
+          files: /tmp/assets/*.tar.gz
+          name: ${{ github.event.pull_request.title }}
+          tag_name: ${{ github.event.pull_request.title }}
+          body: ${{ github.event.pull_request.body }}
+          draft: true
+          prerelease: false
+          generate_release_notes: true

.github/workflows/test.yml

@@ -1,21 +1,20 @@
-name: Unit test for some mods in doh-auth-proxy
+name: Unit tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [main, develop]
   pull_request:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Run unit tests
-      run: |
-        cargo test --verbose
+      - uses: actions/checkout@v4
+      - name: Run unit tests
+        run: |
+          cargo test --verbose

.gitignore

@@ -3,7 +3,7 @@
 .vscode
 log
 plugins
-!src/plugins
+!**/src/plugins
 
 # Generated by Cargo
 # will have compiled files and executables

CHANGELOG.md

@@ -13,7 +13,18 @@
 You should also include the user name that made the change.
 -->
 
-## 0.1.6 (unreleased)
+## 0.3.0 (Unreleased)
+
+### Improvements
+
+- Totally restructured and reimplemented all components
+- Support multiple bootstrap resolvers.
+- Periodic health check of all path candidates.
+- Periodic nexthop IP address resolution via the proxy itself, bootstrap resolver is only used at the first time and fall-back.
+- Periodic fetching of access token with refresh token.
+- Hot reloading of configuration files, including block and override files.
+
+## 0.2.0
 
 ### Improvements
 
@@ -22,6 +33,7 @@ You should also include the user name that made the change.
 - Change inner structure of proxy's supplemental services other than UDP/TCP acceptors.
 
 ## 0.1.5 (Jun. 6, 2022)
+
 ### Improvements
 
 - Update override-list format to use individual lines for representing multiple matching for a name, i.e., (name, IPv4) and (name, IPv6).

Cargo.toml

@@ -1,83 +1,8 @@
-[package]
-name = "doh-auth-proxy"
-description = "DNS Proxy for DoH, ODoH and Mutualized ODoH with Authorization"
-version = "0.2.0"
-authors = ["Jun Kurihara"]
-homepage = "https://github.com/junkurihara/doh-auth-proxy"
-repository = "https://github.com/junkurihara/doh-auth-proxy"
-license = "MIT"
-readme = "README.md"
-categories = [
-  "asynchronous",
-  "network-programming",
-  "command-line-utilities",
-  "web-programming::http-client",
-]
-keywords = [
-  "dns",
-  "https",
-  "dns-over-https",
-  "doh",
-  "oblivious-dns-over-https",
-  "odoh",
-  "mutualized-odoh",
-  "proxy",
-  "authorization",
-]
-edition = "2021"
+[workspace]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-data-encoding = "2.4.0"
-clap = { version = "4.4.3", default-features = false, features = [
-  "std",
-  "cargo",
-  "wrap_help",
-] }
-tokio = { version = "1.32.0", features = [
-  "net",
-  "rt-multi-thread",
-  "time",
-  "sync",
-  "macros",
-] }
-futures = { version = "0.3.28", default-features = false }
-reqwest = { version = "0.11.20", default-features = false, features = [
-  "default",
-  "trust-dns",
-  "json",
-] }
-url = "2.4.1"
-trust-dns-proto = { version = "0.23.0", default-features = false }
-trust-dns-resolver = { version = "0.23.0", default-features = false, features = [
-  "tokio-runtime",
-] }
-anyhow = "1.0.75"
-dotenv = "0.15.0"
-serde_json = "1.0.107"
-jwt-simple = "0.11.6"
-p256 = { version = "0.13.2", features = ["jwk", "pem"] }
-chrono = "0.4.30"
-odoh-rs = { git = "https://github.com/junkurihara/odoh-rs.git" }
-rand = "0.8.5"
-bytes = "1.5.0"
-urlencoding = "2.1.3"
-toml = { version = "0.8", default-features = false, features = ["parse"] }
-serde = "1.0.188"
-hashlink = "0.8.4"
-cedarwood = "0.4.6"
-regex = "1.9.5"
-rustc-hash = "1.1.0"
-mimalloc = { version = "*", default-features = false }
-
-
-# logging
-tracing = { version = "0.1.37" }
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-
-[dev-dependencies]
-trust-dns-client = "0.23.0"
+members = ["dap-bin", "dap-lib", "legacy"]
+exclude = ["legacy"]
+resolver = "2"
 
 [profile.release]
 codegen-units = 1