Compare commits
39 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fd85ce34f | ||
|
|
6deb5eb9f2 | ||
|
|
481208caf2 | ||
|
|
65443a1464 | ||
|
|
71269fe041 | ||
|
|
d1876b8dd7 | ||
|
|
eb6cf7f380 | ||
|
|
4331c798d9 | ||
|
|
c55932c41a | ||
|
|
eb16452d8b | ||
|
|
62747aa88f | ||
|
|
5867b0f468 | ||
|
|
1bce797a78 | ||
|
|
d82f401f3b | ||
|
|
9c17ec2df5 | ||
|
|
85da974092 | ||
|
|
12cee833fc | ||
|
|
6a7bb0db56 | ||
|
|
b1a2884cca | ||
|
|
88c78553a8 | ||
|
|
193726c427 | ||
|
|
9c02724c42 | ||
|
|
6ca008fc57 | ||
|
|
736037aaf7 | ||
|
|
038c697cb1 | ||
|
|
292745bae9 | ||
|
|
f3dd8d97b6 | ||
|
|
18677eeb48 | ||
|
|
20f5f0cbb2 | ||
|
|
c5506c16f4 | ||
|
|
be099d9cea | ||
|
|
cad8045f79 | ||
|
|
42a6bc509a | ||
|
|
8e88e74f28 | ||
|
|
9091144b0b | ||
|
|
c3ff2cb20c | ||
|
|
9ed39cef8c | ||
|
|
852376d597 | ||
|
|
eddf5155a0 |
10
.github/workflows/docs-to-issues.yml
vendored
10
.github/workflows/docs-to-issues.yml
vendored
@@ -37,21 +37,21 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
|
||||
with:
|
||||
fetch-depth: 2
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
|
||||
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
|
||||
with:
|
||||
node-version: '20'
|
||||
node-version: '24.12.0'
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install gray-matter
|
||||
|
||||
- name: Detect changed files
|
||||
id: changes
|
||||
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
|
||||
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
|
||||
with:
|
||||
script: |
|
||||
const fs = require('fs');
|
||||
@@ -90,7 +90,7 @@ jobs:
|
||||
|
||||
- name: Process issue files
|
||||
id: process
|
||||
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
|
||||
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
|
||||
env:
|
||||
DRY_RUN: ${{ github.event.inputs.dry_run || 'false' }}
|
||||
with:
|
||||
|
||||
21
.github/workflows/renovate.yml
vendored
21
.github/workflows/renovate.yml
vendored
@@ -2,7 +2,7 @@ name: Renovate
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 5 * * *' # daily 05:00 EST
|
||||
- cron: '0 5 * * *' # daily 05:00 UTC
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
@@ -18,28 +18,11 @@ jobs:
|
||||
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
|
||||
with:
|
||||
fetch-depth: 1
|
||||
- name: Choose Renovate Token
|
||||
run: |
|
||||
# Prefer explicit tokens (GITHUB_TOKEN > CPMP_TOKEN) if provided; otherwise use the default GITHUB_TOKEN
|
||||
if [ -n "${{ secrets.GITHUB_TOKEN }}" ]; then
|
||||
echo "Using GITHUB_TOKEN" >&2
|
||||
echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
|
||||
else
|
||||
echo "Using default GITHUB_TOKEN from Actions" >&2
|
||||
echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
|
||||
fi
|
||||
|
||||
- name: Fail-fast if token not set
|
||||
run: |
|
||||
if [ -z "${{ env.GITHUB_TOKEN }}" ]; then
|
||||
echo "ERROR: No Renovate token provided. Set GITHUB_TOKEN, CPMP_TOKEN, or rely on default GITHUB_TOKEN." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Run Renovate
|
||||
uses: renovatebot/github-action@502904f1cefdd70cba026cb1cbd8c53a1443e91b # v44.1.0
|
||||
with:
|
||||
configurationFile: .github/renovate.json
|
||||
token: ${{ env.GITHUB_TOKEN }}
|
||||
token: ${{ secrets.RENOVATE_TOKEN }}
|
||||
env:
|
||||
LOG_LEVEL: info
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -81,9 +81,7 @@ charon.db
|
||||
*~
|
||||
.DS_Store
|
||||
*.xcf
|
||||
.vscode/
|
||||
.vscode/launch.json
|
||||
.vscode.backup*/
|
||||
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Logs & Temp Files
|
||||
|
||||
22
.vscode/launch.json
vendored
Normal file
22
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Attach to Backend (Docker)",
|
||||
"type": "go",
|
||||
"request": "attach",
|
||||
"mode": "remote",
|
||||
"substitutePath": [
|
||||
{
|
||||
"from": "${workspaceFolder}",
|
||||
"to": "/app"
|
||||
}
|
||||
],
|
||||
"port": 2345,
|
||||
"host": "127.0.0.1",
|
||||
"showLog": true,
|
||||
"trace": "log",
|
||||
"logOutput": "rpc"
|
||||
}
|
||||
]
|
||||
}
|
||||
252
.vscode/tasks.json
vendored
Normal file
252
.vscode/tasks.json
vendored
Normal file
@@ -0,0 +1,252 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Build: Local Docker Image",
|
||||
"type": "shell",
|
||||
"command": "docker build -t charon:local .",
|
||||
"group": "build",
|
||||
"problemMatcher": [],
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "new"
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Build: Backend",
|
||||
"type": "shell",
|
||||
"command": "cd backend && go build ./...",
|
||||
"group": "build",
|
||||
"problemMatcher": ["$go"]
|
||||
},
|
||||
{
|
||||
"label": "Build: Frontend",
|
||||
"type": "shell",
|
||||
"command": "cd frontend && npm run build",
|
||||
"group": "build",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Build: All",
|
||||
"type": "shell",
|
||||
"dependsOn": ["Build: Backend", "Build: Frontend"],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Test: Backend Unit Tests",
|
||||
"type": "shell",
|
||||
"command": "cd backend && go test ./...",
|
||||
"group": "test",
|
||||
"problemMatcher": ["$go"]
|
||||
},
|
||||
{
|
||||
"label": "Test: Backend with Coverage",
|
||||
"type": "shell",
|
||||
"command": "scripts/go-test-coverage.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Test: Frontend",
|
||||
"type": "shell",
|
||||
"command": "cd frontend && npm run test",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Test: Frontend with Coverage",
|
||||
"type": "shell",
|
||||
"command": "scripts/frontend-test-coverage.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Pre-commit (All Files)",
|
||||
"type": "shell",
|
||||
"command": "source .venv/bin/activate && pre-commit run --all-files",
|
||||
"group": "test",
|
||||
"problemMatcher": [],
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "shared"
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Lint: Go Vet",
|
||||
"type": "shell",
|
||||
"command": "cd backend && go vet ./...",
|
||||
"group": "test",
|
||||
"problemMatcher": ["$go"]
|
||||
},
|
||||
{
|
||||
"label": "Lint: GolangCI-Lint (Docker)",
|
||||
"type": "shell",
|
||||
"command": "cd backend && docker run --rm -v $(pwd):/app:ro -w /app golangci/golangci-lint:latest golangci-lint run -v",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Frontend",
|
||||
"type": "shell",
|
||||
"command": "cd frontend && npm run lint",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Frontend (Fix)",
|
||||
"type": "shell",
|
||||
"command": "cd frontend && npm run lint -- --fix",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: TypeScript Check",
|
||||
"type": "shell",
|
||||
"command": "cd frontend && npm run type-check",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Markdownlint",
|
||||
"type": "shell",
|
||||
"command": "npx markdownlint '**/*.md' --ignore node_modules --ignore .venv --ignore test-results --ignore codeql-db --ignore codeql-agent-results",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Markdownlint (Fix)",
|
||||
"type": "shell",
|
||||
"command": "npx markdownlint '**/*.md' --fix --ignore node_modules --ignore .venv --ignore test-results --ignore codeql-db --ignore codeql-agent-results",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Lint: Hadolint Dockerfile",
|
||||
"type": "shell",
|
||||
"command": "docker run --rm -i hadolint/hadolint < Dockerfile",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Security: Trivy Scan",
|
||||
"type": "shell",
|
||||
"command": "docker run --rm -v $(pwd):/app aquasec/trivy:latest fs --scanners vuln,secret,misconfig /app",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Security: Go Vulnerability Check",
|
||||
"type": "shell",
|
||||
"command": "cd backend && go run golang.org/x/vuln/cmd/govulncheck@latest ./...",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Docker: Start Dev Environment",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose.dev.yml up -d",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Docker: Stop Dev Environment",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose.dev.yml down",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Docker: Start Local Environment",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose.local.yml up -d",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Docker: Stop Local Environment",
|
||||
"type": "shell",
|
||||
"command": "docker compose -f docker-compose.local.yml down",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Docker: View Logs",
|
||||
"type": "shell",
|
||||
"command": "docker compose logs -f",
|
||||
"group": "none",
|
||||
"problemMatcher": [],
|
||||
"isBackground": true
|
||||
},
|
||||
{
|
||||
"label": "Docker: Prune Unused Resources",
|
||||
"type": "shell",
|
||||
"command": "docker system prune -f",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Integration: Run All",
|
||||
"type": "shell",
|
||||
"command": "scripts/integration-test.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": [],
|
||||
"presentation": {
|
||||
"reveal": "always",
|
||||
"panel": "new"
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Integration: Coraza WAF",
|
||||
"type": "shell",
|
||||
"command": "scripts/coraza_integration.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Integration: CrowdSec",
|
||||
"type": "shell",
|
||||
"command": "scripts/crowdsec_integration.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Integration: CrowdSec Decisions",
|
||||
"type": "shell",
|
||||
"command": "scripts/crowdsec_decision_integration.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Integration: CrowdSec Startup",
|
||||
"type": "shell",
|
||||
"command": "scripts/crowdsec_startup_test.sh",
|
||||
"group": "test",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Utility: Check Version Match Tag",
|
||||
"type": "shell",
|
||||
"command": "scripts/check-version-match-tag.sh",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Utility: Clear Go Cache",
|
||||
"type": "shell",
|
||||
"command": "scripts/clear-go-cache.sh",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
},
|
||||
{
|
||||
"label": "Utility: Bump Beta Version",
|
||||
"type": "shell",
|
||||
"command": "scripts/bump_beta.sh",
|
||||
"group": "none",
|
||||
"problemMatcher": []
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -48,7 +48,7 @@ RUN --mount=type=cache,target=/app/frontend/node_modules/.cache \
|
||||
npm run build
|
||||
|
||||
# ---- Backend Builder ----
|
||||
FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine AS backend-builder
|
||||
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS backend-builder
|
||||
# Copy xx helpers for cross-compilation
|
||||
COPY --from=xx / /
|
||||
|
||||
@@ -98,7 +98,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
|
||||
# ---- Caddy Builder ----
|
||||
# Build Caddy from source to ensure we use the latest Go version and dependencies
|
||||
# This fixes vulnerabilities found in the pre-built Caddy images (e.g. CVE-2025-59530, stdlib issues)
|
||||
FROM --platform=$BUILDPLATFORM golang:1.25.5-alpine AS caddy-builder
|
||||
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS caddy-builder
|
||||
ARG TARGETOS
|
||||
ARG TARGETARCH
|
||||
ARG CADDY_VERSION
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/Wikid82/charon/backend
|
||||
|
||||
go 1.25.5
|
||||
go 1.25
|
||||
|
||||
require (
|
||||
github.com/containrrr/shoutrrr v0.8.0
|
||||
@@ -11,6 +11,7 @@ require (
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
github.com/oschwald/geoip2-golang v1.13.0
|
||||
github.com/oschwald/geoip2-golang/v2 v2.0.1
|
||||
github.com/prometheus/client_golang v1.23.2
|
||||
github.com/robfig/cron/v3 v3.0.1
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
|
||||
@@ -135,6 +135,7 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
|
||||
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
|
||||
github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=
|
||||
github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=
|
||||
github.com/oschwald/geoip2-golang/v2 v2.0.1/go.mod h1:qdVmcPgrTJ4q2eP9tHq/yldMTdp2VMr33uVdFbHBiBc=
|
||||
github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU=
|
||||
github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
||||
|
||||
1303
package-lock.json
generated
1303
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -8,6 +8,6 @@
|
||||
"tldts": "^7.0.19"
|
||||
},
|
||||
"devDependencies": {
|
||||
"markdownlint-cli2": "^0.15.0"
|
||||
"markdownlint-cli2": "^0.20.0"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user