From 3317feb83300b86671d4d4f6c6395e105e58ffd0 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Tue, 16 Mar 2021 13:39:09 +0100 Subject: [PATCH 01/12] Add new request format to fuzz target --- .code-intelligence/ci_info | 2 ++ .../fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.code-intelligence/ci_info b/.code-intelligence/ci_info index 92db9913..13adc7c8 100755 --- a/.code-intelligence/ci_info +++ b/.code-intelligence/ci_info @@ -21,6 +21,8 @@ "org.dpppt.backend.sdk.data.util", "org.dpppt.backend.sdk.model", "org.dpppt.backend.sdk.model.gaen", + "org.dpppt.backend.sdk.model.gaen.proto", + "org.dpppt.backend.sdk.model.gaen.proto.v2", "org.dpppt.backend.sdk.model.keycloak", "org.dpppt.backend.sdk.semver", "org.dpppt.backend.sdk.utils", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json index 6a3b45a0..90c99c7d 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/7e400f47.json @@ -10,7 +10,7 @@ "headers": { }, "contentType": "APPLICATION_JSON", - "body": "{\"key\": \"dGVzdEtleTMyQnl0ZXMtLXRlc3RLZXkzMkJ5dGVzLS0=\", \"keyDate\": \"1589039479223\"}", + "body": "{\"gaenKeys\":[{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhMQ==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNiMg==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNjMw==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1}],\"delayedKeyDate\":2693232}", "isFixed": false, "webControllerId": "772282204" } From 5c3f6477d69e280687f3374d69238865a8fffa09 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 12:15:56 +0100 Subject: [PATCH 02/12] Update seeds to fit new interfaces --- .code-intelligence/campaigns/AllController-a7e91866.json | 1 + .../fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json | 4 ++-- .../fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json | 2 +- .../fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.code-intelligence/campaigns/AllController-a7e91866.json b/.code-intelligence/campaigns/AllController-a7e91866.json index abe6a947..a32976ba 100644 --- a/.code-intelligence/campaigns/AllController-a7e91866.json +++ b/.code-intelligence/campaigns/AllController-a7e91866.json @@ -15,6 +15,7 @@ "numberOfJobs": 1 } ], + "skipInitialCorpus": true, "configuredTargets": [ { "fuzzTarget": "AllController-ae4f0ca2", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json index c75dc966..9ad80d33 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/017136de.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/exposedjson/%FUZZ%1606989600000", + "uri": "/v1/exposedjson/%FUZZ%1615902606000", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json index 03c08af8..b7b0e6ca 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32637e8c.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/gaen/exposed/%FUZZ%1606989600000?publishedafter=%FUZZ%1606989600000", + "uri": "/v1/gaen/exposed/%FUZZ%1615902606000?publishedafter=%FUZZ%1615902606000", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json index d640e228..f2731552 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/32fb7c29.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/exposed/%FUZZ%1606989600000", + "uri": "/v1/exposed/%FUZZ%1615902606000", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json index 92f684ad..b128d525 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/39ef5dc3.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/gaen/exposedjson/%FUZZ%1606989600000?publishedafter=%FUZZ%1606989600000", + "uri": "/v1/gaen/exposedjson/%FUZZ%1615902606000?publishedafter=%FUZZ%1615902606000", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json index 92253651..616be149 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/53df2b8d.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/gaen/buckets/03-12-20", + "uri": "/v1/gaen/buckets/2021-03-16", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json index c7e109b6..74d2ab7a 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/b169e31f.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1", + "uri": "/v2", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json index 266735f7..f1ff014d 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/ce05e762.json @@ -6,11 +6,11 @@ "requests": [ { "method": "POST", - "uri": "/v1/exposed", + "uri": "/v2/exposed", "headers": { }, "contentType": "APPLICATION_JSON", - "body": "{\"key\": \"dGVzdEtleTMyQnl0ZXMtLXRlc3RLZXkzMkJ5dGVzLS0=\", \"keyDate\": \"1589039479223\"}", + "body": "{\"gaenKeys\":[{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhMQ==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNiMg==\",\"rollingStartNumber\":2692944,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNjMw==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":0},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1},{\"keyData\":\"dGVzdEtleTMyQnl0ZXNhYQ==\",\"rollingStartNumber\":2693088,\"rollingPeriod\":144,\"transmissionRiskLevel\":0,\"fake\":1}],\"delayedKeyDate\":2693232}", "isFixed": false, "webControllerId": "-608625832" } diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json index 7dc883e7..d9fdf060 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/e090a70e.json @@ -6,7 +6,7 @@ "requests": [ { "method": "GET", - "uri": "/v1/buckets/%FUZZ%", + "uri": "/v2/buckets/%FUZZ%", "headers": { }, "contentType": "TEXT_HTML", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json index a02d0a28..256943b0 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/f8a604c7.json @@ -6,7 +6,7 @@ "requests": [ { "method": "POST", - "uri": "/v1/exposedlist", + "uri": "/v2/exposedlist", "headers": { }, "contentType": "APPLICATION_JSON", diff --git a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json index 38920fd1..13a14a6a 100644 --- a/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json +++ b/.code-intelligence/fuzz_targets/AllController-ae4f0ca2/seeds/fa2120f6.json @@ -6,7 +6,7 @@ "requests": [ { "method": "POST", - "uri": "/v1/gaen/exposednextday", + "uri": "/v2/gaen/exposednextday", "headers": { }, "contentType": "APPLICATION_JSON", From 87d23c7d20de90b9dd2121be32ed4780f0a9f2f5 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 12:51:18 +0100 Subject: [PATCH 03/12] Switch to app.code-intelligence.com --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a72d3fa9..d30442ce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,14 +2,14 @@ name: CI on: push: - branches: [ master, demo_before_fix ] + branches: [ master, demo_before_fix, fixed_version ] pull_request: - branches: [ master, demo_before_fix ] + branches: [ master, demo_before_fix, fixed_version ] env: PROJECT_NAME: dp3t - FUZZING_SERVER_ADDRESS: grpc-api.demo.code-intelligence.com:443 - DASHBOARD_ADDRESS: https://app.demo.code-intelligence.com + FUZZING_SERVER_ADDRESS: grpc-api.code-intelligence.com:443 + DASHBOARD_ADDRESS: https://app.code-intelligence.com jobs: fuzz_AllController: From 716359e7c7ea17756da598e67e625d0dfb5f54f4 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 12:53:01 +0100 Subject: [PATCH 04/12] Remove unneeded github actions --- .github/workflows/pre-commit.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/pre-commit.yaml diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml deleted file mode 100644 index 2a72cce0..00000000 --- a/.github/workflows/pre-commit.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: pre-commit - -on: - pull_request: - push: - branches: [develop] - -jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: actions/setup-java@v1 - with: - java-version: '11' - - uses: pre-commit/action@v2.0.0 From 4c31c151665049c0e6a0e66cc0c4f40ae9ae382e Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 16:25:53 +0100 Subject: [PATCH 05/12] Update GitHub Actions ref to v3 We use v3 as a moving tag, i.e. we always tag the latest GitHub Action without breaking changes with it. --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d30442ce..980251f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,8 @@ on: env: PROJECT_NAME: dp3t - FUZZING_SERVER_ADDRESS: grpc-api.code-intelligence.com:443 - DASHBOARD_ADDRESS: https://app.code-intelligence.com + FUZZING_SERVER_ADDRESS: grpc-api.beta.code-intelligence.com:443 + DASHBOARD_ADDRESS: https://app.beta.code-intelligence.com jobs: fuzz_AllController: @@ -17,7 +17,7 @@ jobs: steps: - id: start-fuzzing name: Build and Instrument - uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} project: ${{ env.PROJECT_NAME }} @@ -26,7 +26,7 @@ jobs: fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} - id: monitor-fuzzing name: Fuzzing - uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} project: ${{ env.PROJECT_NAME }} @@ -39,7 +39,7 @@ jobs: dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - id: report-coverage name: Report Coverage - uses: CodeIntelligenceTesting/github-actions/report-coverage@master + uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 if: ${{ github.event_name == 'pull_request' && (success() || failure()) }} with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} From 5404a2033491a6726d2e607075e8ede71c7ab236 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 16:28:08 +0100 Subject: [PATCH 06/12] Switch back to app.code-intelligence.com --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 980251f6..3f8ac3a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,8 @@ on: env: PROJECT_NAME: dp3t - FUZZING_SERVER_ADDRESS: grpc-api.beta.code-intelligence.com:443 - DASHBOARD_ADDRESS: https://app.beta.code-intelligence.com + FUZZING_SERVER_ADDRESS: grpc-api.code-intelligence.com:443 + DASHBOARD_ADDRESS: https://app.code-intelligence.com jobs: fuzz_AllController: From 42e4e257ff7e8802637fae1442b69c64aae9fb0c Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 16:34:35 +0100 Subject: [PATCH 07/12] Re-generate github actions config file --- .github/workflows/main.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f8ac3a9..24a999c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CI +name: Code Intelligence Fuzzing on: push: @@ -7,9 +7,8 @@ on: branches: [ master, demo_before_fix, fixed_version ] env: - PROJECT_NAME: dp3t FUZZING_SERVER_ADDRESS: grpc-api.code-intelligence.com:443 - DASHBOARD_ADDRESS: https://app.code-intelligence.com + DASHBOARD_ADDRESS: https://app.code-intelligence.com jobs: fuzz_AllController: @@ -17,20 +16,18 @@ jobs: steps: - id: start-fuzzing name: Build and Instrument - uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3 + uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} - project: ${{ env.PROJECT_NAME }} - test_collection: "AllController" + test_collection: "projects/dp3t_git-e2be63c15818c8d2/campaigns/AllController-a7e91866" git_reference: ${{ github.sha }} - fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} + fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} - id: monitor-fuzzing name: Fuzzing - uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3 + uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} - project: ${{ env.PROJECT_NAME }} - test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run_display_name }} + test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }} github_token: ${{ secrets.GITHUB_TOKEN }} pull_request_number: ${{ github.event.pull_request.number }} owner: ${{ github.event.repository.owner.login }} @@ -39,12 +36,11 @@ jobs: dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - id: report-coverage name: Report Coverage - uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 + uses: CodeIntelligenceTesting/github-actions/report-coverage@master if: ${{ github.event_name == 'pull_request' && (success() || failure()) }} with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} - project: ${{ env.PROJECT_NAME }} - test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run_resource_name }} + test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }} github_token: ${{ secrets.GITHUB_TOKEN }} pull_request_number: ${{ github.event.pull_request.number }} owner: ${{ github.event.repository.owner.login }} @@ -52,3 +48,4 @@ jobs: git_reference: ${{ github.sha }} fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} dashboard_address: ${{ env.DASHBOARD_ADDRESS }} + \ No newline at end of file From a6eb613193f30ba576e6d5f17ca5e7077ccd181e Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 22 Mar 2021 16:38:04 +0100 Subject: [PATCH 08/12] Update GitHub Actions ref to v3 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24a999c5..7a0b1d6a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: steps: - id: start-fuzzing name: Build and Instrument - uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} test_collection: "projects/dp3t_git-e2be63c15818c8d2/campaigns/AllController-a7e91866" @@ -24,7 +24,7 @@ jobs: fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} - id: monitor-fuzzing name: Fuzzing - uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }} @@ -36,7 +36,7 @@ jobs: dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - id: report-coverage name: Report Coverage - uses: CodeIntelligenceTesting/github-actions/report-coverage@master + uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 if: ${{ github.event_name == 'pull_request' && (success() || failure()) }} with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} From e9691b59625de811dd3ac172c2f8fc32ff18e352 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 29 Mar 2021 13:11:47 +0200 Subject: [PATCH 09/12] Update github actions config --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a0b1d6a..c8b043d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,15 +16,15 @@ jobs: steps: - id: start-fuzzing name: Build and Instrument - uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3 + uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} - test_collection: "projects/dp3t_git-e2be63c15818c8d2/campaigns/AllController-a7e91866" + test_collection: "projects/dp3t_git-cc9aec38a841e381/campaigns/AllController-a7e91866" git_reference: ${{ github.sha }} fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} - id: monitor-fuzzing name: Fuzzing - uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3 + uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }} @@ -36,7 +36,7 @@ jobs: dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - id: report-coverage name: Report Coverage - uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 + uses: CodeIntelligenceTesting/github-actions/report-coverage@master if: ${{ github.event_name == 'pull_request' && (success() || failure()) }} with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} @@ -48,4 +48,4 @@ jobs: git_reference: ${{ github.sha }} fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - \ No newline at end of file + From ccf1b03d7aef317a306c6c082c27f0d4bc598359 Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 29 Mar 2021 13:32:33 +0200 Subject: [PATCH 10/12] Switch github actions tag to @v3 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8b043d9..6db06912 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: steps: - id: start-fuzzing name: Build and Instrument - uses: CodeIntelligenceTesting/github-actions/start-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/start-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} test_collection: "projects/dp3t_git-cc9aec38a841e381/campaigns/AllController-a7e91866" @@ -24,7 +24,7 @@ jobs: fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} - id: monitor-fuzzing name: Fuzzing - uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@master + uses: CodeIntelligenceTesting/github-actions/monitor-fuzzing@v3 with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} test_collection_run: ${{ steps.start-fuzzing.outputs.test_collection_run }} @@ -36,7 +36,7 @@ jobs: dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - id: report-coverage name: Report Coverage - uses: CodeIntelligenceTesting/github-actions/report-coverage@master + uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 if: ${{ github.event_name == 'pull_request' && (success() || failure()) }} with: ci_fuzz_api_token: ${{ secrets.CI_FUZZ_API_TOKEN }} From 19063413a62941cd6af552c556850f99f880d15a Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 29 Mar 2021 14:34:25 +0200 Subject: [PATCH 11/12] Increase monitor fuzzing timeout --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6db06912..2733ee18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,7 @@ jobs: repository: ${{ github.event.repository.name }} fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} dashboard_address: ${{ env.DASHBOARD_ADDRESS }} + timeout: ${{900}} - id: report-coverage name: Report Coverage uses: CodeIntelligenceTesting/github-actions/report-coverage@v3 From 4b42889c373f4fb25aa7f7eb7d3ae0e92dee78ee Mon Sep 17 00:00:00 2001 From: janschrewe Date: Mon, 29 Mar 2021 16:03:36 +0200 Subject: [PATCH 12/12] Increase monitor fuzzer timeout to 2h --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2733ee18..a5afba8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: repository: ${{ github.event.repository.name }} fuzzing_server_address: ${{ env.FUZZING_SERVER_ADDRESS }} dashboard_address: ${{ env.DASHBOARD_ADDRESS }} - timeout: ${{900}} + timeout: ${{7200}} - id: report-coverage name: Report Coverage uses: CodeIntelligenceTesting/github-actions/report-coverage@v3