diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3f0ad0c..86a7875 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +github: [ 'bjdgyc' ] # 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 @@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -custom: ['https://github.com/bjdgyc/anylink/blob/main/doc/README.md'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: [ 'https://github.com/bjdgyc/anylink/blob/main/doc/README.md' ] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 811c0f9..b347c85 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,13 +13,14 @@ name: "CodeQL" on: workflow_dispatch: - + schedule: + - cron: '32 5 * * 1' # push: # branches: [ "main", "dev" ] # pull_request: # branches: [ "main", "dev" ] -# schedule: -# - cron: '32 12 * * 5' + + jobs: analyze: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f25818b..a503c70 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -3,10 +3,10 @@ name: Go on: workflow_dispatch: -# push: -# branches: [ "main", "dev" ] -# pull_request: -# branches: [ "main", "dev" ] + push: + branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 007e27f..d0933b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: push: tags: - "v0.*" + - "v1.*" jobs: Build: @@ -46,7 +47,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} logout: true - - name: pre bash + - name: Pre bash shell: bash run: | appVer=`cat version` @@ -65,8 +66,8 @@ jobs: uses: docker/build-push-action@v5 with: push: true - #cache-from: type=gha,scope=anylink - #cache-to: type=gha,mode=max,scope=anylink + cache-from: type=gha,scope=anylink + cache-to: type=gha,mode=max,scope=anylink context: . file: ./docker/Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 diff --git a/doc/question.md b/doc/question.md index 97ea89e..7167844 100644 --- a/doc/question.md +++ b/doc/question.md @@ -46,6 +46,12 @@ mobile_dpd = 15 > > 如经常出现 timeout 的错误信息,应根据当前防火墙的设置,适当减小dpd数值 +### 关于审计日志 audit_interval 参数 + +> 默认值 `audit_interval = 600` 表示相同日志600秒内只记录一次,不同日志首次出现立即记录 +> +> 去重key的格式: 16字节源IP地址 + 16字节目的IP地址 + 2字节目的端口 + 1字节协议类型 + 16字节域名MD5 + ### 反向代理问题 > anylink 仅支持四层反向代理,不支持七层反向代理 diff --git a/server/handler/payload_access_audit.go b/server/handler/payload_access_audit.go index a3cc0c2..d3d91b7 100644 --- a/server/handler/payload_access_audit.go +++ b/server/handler/payload_access_audit.go @@ -135,6 +135,7 @@ func logAudit(userName string, pl *sessdata.Payload) { ipSrc := waterutil.IPv4Source(pl.Data) ipDst := waterutil.IPv4Destination(pl.Data) b := getByte51() + // key格式 16字节源IP地址 + 16字节目的IP地址 + 2字节目的端口 + 1字节协议类型 + 16字节域名MD5 key := *b copy(key[:16], ipSrc) copy(key[16:32], ipDst) diff --git a/version b/version index 6dadeb2..1bfc953 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10.3-test \ No newline at end of file +0.10.4 \ No newline at end of file