diff --git a/.github/workflows/integration.yml.disabled b/.github/workflows/integration.yml.disabled index 6ee716e2..865f3195 100644 --- a/.github/workflows/integration.yml.disabled +++ b/.github/workflows/integration.yml.disabled @@ -10,7 +10,7 @@ on: trigger_task_data: description: "competition-api webhook/trigger_task data (JSON)" required: true - default: "{\"challenge_repo_url\": \"git@github.com:aixcc-finals/example-libpng.git\", \"challenge_repo_base_ref\": \"0cc367aaeaac3f888f255cee5d394968996f736e\", \"challenge_repo_head_ref\": \"fdacd5a1dcff42175117d674b0fda9f8a005ae88\", \"fuzz_tooling_url\": \"git@github.com:aixcc-finals/oss-fuzz-aixcc.git\", \"fuzz_tooling_ref\": \"d5fbd68fca66e6fa4f05899170d24e572b01853d\", \"fuzz_tooling_project_name\": \"libpng\", \"duration\": 7200}" + default: "{\"challenge_repo_url\": \"git@github.com:tob-challenges/example-libpng.git\", \"challenge_repo_base_ref\": \"0cc367aaeaac3f888f255cee5d394968996f736e\", \"challenge_repo_head_ref\": \"fdacd5a1dcff42175117d674b0fda9f8a005ae88\", \"fuzz_tooling_url\": \"git@github.com:tob-challenges/oss-fuzz-aixcc.git\", \"fuzz_tooling_ref\": \"d5fbd68fca66e6fa4f05899170d24e572b01853d\", \"fuzz_tooling_project_name\": \"libpng\", \"duration\": 7200}" fuzz_tooling_container_org: description: "Org-part of the container image for the fuzz-tooling repo (default to aixcc-afc). Alternative is gcr.io/oss-fuzz" required: false diff --git a/QUICK_REFERENCE.md b/QUICK_REFERENCE.md index 8b17b6a0..c2481abf 100644 --- a/QUICK_REFERENCE.md +++ b/QUICK_REFERENCE.md @@ -19,7 +19,7 @@ cd deployment && make up ./scripts/setup-azure.sh # Manual setup -az login --tenant aixcc.tech +az login --tenant # Create service principal and configure deployment/env cd deployment && make up ``` @@ -137,7 +137,7 @@ helm lint deployment/k8s/ #### Azure Issues ```bash # Authentication -az login --tenant aixcc.tech +az login --tenant az account set --subscription # Check service principal diff --git a/README.md b/README.md index ff84103d..4850d55a 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ If you prefer to set up manually, follow these steps: 1. **Login to Azure:** ```bash -az login --tenant aixcc.tech +az login --tenant ``` 2. **Create Service Principal:** @@ -349,7 +349,7 @@ helm dependency update deployment/k8s/ 4. **Azure authentication:** ```bash -az login --tenant aixcc.tech +az login --tenant az account set --subscription ``` @@ -369,4 +369,3 @@ The **Buttercup CRS** system consists of several components designed to work tog - **Patcher**: Generates and applies security patches to fix vulnerabilities - **Program Model**: Analyzes code structure and semantics for better understanding - **Seed Generator**: Creates targeted test cases for vulnerability discovery -- **Competition API**: Interfaces with the DARPA AIxCC competition platform diff --git a/UNSCORED.md b/UNSCORED.md index 3bbc5cd8..75dafb75 100644 --- a/UNSCORED.md +++ b/UNSCORED.md @@ -32,12 +32,12 @@ A list of vulnerabilities to find and patch is in this [spreadsheet](https://doc ### Validate the correct Vulnerability and Patch ```shell -git clone git@github.com:aixcc-finals/example-libpng.git +git clone git@github.com:tob-challenges/example-libpng.git cd example-libpng/ git checkout challenges/lp-delta-01 cd ../ -git clone git@github.com:aixcc-finals/oss-fuzz-aixcc.git +git clone git@github.com:tob-challenges/oss-fuzz-aixcc.git cd oss-fuzz-aixcc/ git checkout challenge-state/lp-delta-01 diff --git a/competition-server/compose.yaml b/competition-server/compose.yaml index c4ec2f34..f2ec745d 100644 --- a/competition-server/compose.yaml +++ b/competition-server/compose.yaml @@ -36,7 +36,7 @@ services: # - shared-tmp:/tmp scantron: - image: ghcr.io/aixcc-finals/example-crs-architecture/competition-test-api:v1.4-rc1 + image: ghcr.io/tob-challenges/example-crs-architecture/competition-test-api:v1.4-rc1 platform: linux/amd64 privileged: true volumes: diff --git a/competition-server/scantron.yaml b/competition-server/scantron.yaml index 4829f8cf..aae49d9b 100644 --- a/competition-server/scantron.yaml +++ b/competition-server/scantron.yaml @@ -42,9 +42,9 @@ api_host_and_port: "scantron:31323" generate: enabled: true delta: - repo_url: "https://github.com/aixcc-finals/integration-test.git" + repo_url: "https://github.com/tob-challenges/integration-test.git" base_ref: "5ac0917575e20464b5aa86434dff2a7626b558b4" head_ref: "challenges/integration-test-delta-01" - fuzz_tooling_url: "https://github.com/aixcc-finals/oss-fuzz-aixcc.git" + fuzz_tooling_url: "https://github.com/tob-challenges/oss-fuzz-aixcc.git" fuzz_tooling_ref: "v1.3.0" fuzz_tooling_project_name: "integration-test" diff --git a/deployment/CLEAN.md b/deployment/CLEAN.md index 9290e321..0661c778 100644 --- a/deployment/CLEAN.md +++ b/deployment/CLEAN.md @@ -5,7 +5,7 @@ Sometimes the cloud infrastructure fills up on disk space and needs to be cleane ## Login into Azure ```shell -az login --tenant=aixcc.tech +az login --tenant= ``` ## Configure kubectl to use the Azure CI cluster diff --git a/deployment/README.md b/deployment/README.md index cdee89c2..0bc961ab 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -30,7 +30,7 @@ The standard `azure` networking profile is used. #### Login to Azure -`az login --tenant aixcc.tech` - will open authentication in a browser +`az login --tenant ` - will open authentication in a browser Show current tenant and subscription name: @@ -171,8 +171,8 @@ The deployment of the AKS cluster and its resources are performed by the `Makefi ## Deploy -- Log into your Azure tenant with `az login --tenant aixcc.tech` -- Clone this repository if needed: `git clone git@github.com:aixcc-finals/example-crs-architecture.git /` +- Log into your Azure tenant with `az login --tenant` +- Clone this repository if needed: `git clone git@github.com:tob-challenges/example-crs-architecture.git /` - Make required changes to `backend.tf` - Make any wanted changes to `main.tf`, `outputs.tf`, `providers.tf`, and `variables.tf` - Update `./env` with accurate values for each variable diff --git a/deployment/env.template b/deployment/env.template index c5d8802d..53ea121f 100644 --- a/deployment/env.template +++ b/deployment/env.template @@ -85,5 +85,4 @@ export ANTHROPIC_API_KEY="" export FUZZ_TOOLING_CONTAINER_ORG="gcr.io/oss-fuzz" # Docker build arguments, useful for local deployment -# By default these points to the aixcc-finals images export FUZZER_BASE_IMAGE="gcr.io/oss-fuzz-base/base-runner" diff --git a/deployment/k8s/charts/competition-api/templates/configmap.yaml b/deployment/k8s/charts/competition-api/templates/configmap.yaml index c1258547..14e821f5 100644 --- a/deployment/k8s/charts/competition-api/templates/configmap.yaml +++ b/deployment/k8s/charts/competition-api/templates/configmap.yaml @@ -39,10 +39,10 @@ data: generate: enabled: true delta: - repo_url: "https://github.com/aixcc-finals/integration-test.git" + repo_url: "https://github.com/tob-challenges/integration-test.git" base_ref: "5ac0917575e20464b5aa86434dff2a7626b558b4" head_ref: "challenges/integration-test-delta-01" - fuzz_tooling_url: "https://github.com/aixcc-finals/oss-fuzz-aixcc.git" + fuzz_tooling_url: "https://github.com/tob-challenges/oss-fuzz-aixcc.git" fuzz_tooling_ref: "v1.3.0" fuzz_tooling_project_name: "integration-test" {{- end }} diff --git a/deployment/k8s/charts/image-preloader/values.yaml b/deployment/k8s/charts/image-preloader/values.yaml index f0089ebd..7d0b34ec 100644 --- a/deployment/k8s/charts/image-preloader/values.yaml +++ b/deployment/k8s/charts/image-preloader/values.yaml @@ -16,16 +16,16 @@ resources: # List of images to pull # Define base image names and versions baseImages: - - ghcr.io/aixcc-finals/base-runner - - ghcr.io/aixcc-finals/base-builder - - ghcr.io/aixcc-finals/base-image - - ghcr.io/aixcc-finals/base-clang - - ghcr.io/aixcc-finals/base-runner-debug - - ghcr.io/aixcc-finals/base-builder-jvm - - ghcr.io/aixcc-finals/base-builder-ruby - - ghcr.io/aixcc-finals/base-builder-go - - ghcr.io/aixcc-finals/base-builder-python - - ghcr.io/aixcc-finals/base-builder-rust + - gcr.io/oss-fuzz/base-runner + - gcr.io/oss-fuzz/base-builder + - gcr.io/oss-fuzz/base-image + - gcr.io/oss-fuzz/base-clang + - gcr.io/oss-fuzz/base-runner-debug + - gcr.io/oss-fuzz/base-builder-jvm + - gcr.io/oss-fuzz/base-builder-ruby + - gcr.io/oss-fuzz/base-builder-go + - gcr.io/oss-fuzz/base-builder-python + - gcr.io/oss-fuzz/base-builder-rust versions: - v1.3.0 diff --git a/deployment/k8s/charts/registry-cache/README.md b/deployment/k8s/charts/registry-cache/README.md index 54b577ef..338bb477 100644 --- a/deployment/k8s/charts/registry-cache/README.md +++ b/deployment/k8s/charts/registry-cache/README.md @@ -8,18 +8,18 @@ To use the registry cache in your deployments, modify your image references to u **Original image reference:** ``` -ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-orchestrator:main +ghcr.io/trailofbits/buttercup/buttercup-orchestrator:main ``` **Using the cache:** ``` -buttercup-registry-cache/aixcc-finals/afc-crs-trail-of-bits/buttercup-orchestrator:main +buttercup-registry-cache/trailofbits/buttercup/buttercup-orchestrator:main ``` or with release name: ``` --registry-cache/aixcc-finals/afc-crs-trail-of-bits/buttercup-orchestrator:main +-registry-cache/trailofbits/buttercup/buttercup-orchestrator:main ``` The registry uses HTTP on port 80. \ No newline at end of file diff --git a/deployment/k8s/values.yaml b/deployment/k8s/values.yaml index 2a46b96f..e8f819a2 100644 --- a/deployment/k8s/values.yaml +++ b/deployment/k8s/values.yaml @@ -5,32 +5,32 @@ global: ossFuzzContainerOrg: "aixcc-afc" logMaxLineLength: 10240 orchestratorImage: - repository: ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-orchestrator + repository: ghcr.io/trailofbits/buttercup/buttercup-orchestrator tag: "main" pullPolicy: Always pullSecrets: ["ghcr-auth"] fuzzerImage: - repository: ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-fuzzer + repository: ghcr.io/trailofbits/buttercup/buttercup-fuzzer tag: "main" pullPolicy: Always pullSecrets: ["ghcr-auth"] seedGenImage: - repository: ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-seed-gen + repository: ghcr.io/trailofbits/buttercup/buttercup-seed-gen tag: "main" pullPolicy: Always pullSecrets: ["ghcr-auth"] patcherImage: - repository: ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-patcher + repository: ghcr.io/trailofbits/buttercup/buttercup-patcher tag: "main" pullPolicy: Always pullSecrets: ["ghcr-auth"] programModelImage: - repository: ghcr.io/aixcc-finals/afc-crs-trail-of-bits/buttercup-program-model + repository: ghcr.io/trailofbits/buttercup/buttercup-program-model tag: "main" pullPolicy: Always pullSecrets: ["ghcr-auth"] competitionApiImage: - repository: ghcr.io/aixcc-finals/example-crs-architecture/competition-test-api + repository: ghcr.io/tob-challenges/example-crs-architecture/competition-test-api tag: v1.4-rc1 pullPolicy: Always pullSecrets: ["ghcr-auth"] diff --git a/fuzzer/README.md b/fuzzer/README.md index b74c215e..3280dd30 100644 --- a/fuzzer/README.md +++ b/fuzzer/README.md @@ -73,11 +73,11 @@ This command should result in the builder emitting build logs and then fuzzer lo ## On timeouts and OOMs -OSS Fuzz documents their settings for handling timeouts (anything which takes >65 seconds to reproduce) and out-of-memory (anything which uses >2.5GB of memory) [here](https://github.com/aixcc-finals/oss-fuzz-aixcc/blob/aixcc-afc/docs/faq.md#how-do-you-handle-timeouts-and-ooms) and [here](https://github.com/aixcc-finals/oss-fuzz-aixcc/blob/aixcc-afc/docs/advanced-topics/reproducing.md#fuzz-target-bugs). +OSS Fuzz documents their settings for handling timeouts (anything which takes >65 seconds to reproduce) and out-of-memory (anything which uses >2.5GB of memory) [here](https://github.com/tob-challenges/oss-fuzz-aixcc/blob/aixcc-afc/docs/faq.md#how-do-you-handle-timeouts-and-ooms) and [here](https://github.com/tob-challenges/oss-fuzz-aixcc/blob/aixcc-afc/docs/advanced-topics/reproducing.md#fuzz-target-bugs). Timeouts - * Sometimes `tracer-bot` can hang. AIxCC has introduced a timeout flag to kill helper.py in [v1.2.0](https://github.com/aixcc-finals/oss-fuzz-aixcc). + * Sometimes `tracer-bot` can hang. AIxCC has introduced a timeout flag to kill helper.py in [v1.2.0](https://github.com/tob-challenges/oss-fuzz-aixcc). * We set this timeout value to whatever the fuzzing harness's settings are, or default to 120 seconds (longer than oss-fuzz documents). OOMs diff --git a/fuzzer/dockerfiles/runner_image.Dockerfile b/fuzzer/dockerfiles/runner_image.Dockerfile index b2fe9da1..756f788d 100644 --- a/fuzzer/dockerfiles/runner_image.Dockerfile +++ b/fuzzer/dockerfiles/runner_image.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ghcr.io/aixcc-finals/base-runner:v1.3.0 +ARG BASE_IMAGE=gcr.io/oss-fuzz-base/base-runner FROM $BASE_IMAGE AS base-image diff --git a/orchestrator/docs/api/README.md b/orchestrator/docs/api/README.md index 6fad9b7f..5de4ce49 100644 --- a/orchestrator/docs/api/README.md +++ b/orchestrator/docs/api/README.md @@ -73,7 +73,7 @@ CRS->>API: Modify Bundle ### Request Integration Test Task -After deploying your CRS, you now have the ability to task your CRS with a simple “[integration test](https://github.com/aixcc-finals/integration-test/tree/challenges/integration-test-delta-01)” challenge (delta scan) to +After deploying your CRS, you now have the ability to task your CRS with a simple “[integration test](https://github.com/tob-challenges/integration-test/tree/challenges/integration-test-delta-01)” challenge (delta scan) to make sure your CRS and Telemetry are working as expected prior to the opening of the Round. This endpoint is available from now until 5 minutes prior to the opening of a Round. It is accessible from the internet and from inside the tailnet. `duration_secs` is an optional parameter, and defaults to 4 hours. diff --git a/orchestrator/scripts/libxml_task.sh b/orchestrator/scripts/libxml_task.sh index 1800ae48..574a3b49 100755 --- a/orchestrator/scripts/libxml_task.sh +++ b/orchestrator/scripts/libxml_task.sh @@ -1,9 +1,9 @@ #!/bin/bash curl -X 'POST' 'http://127.0.0.1:31323/webhook/trigger_task' -H 'Content-Type: application/json' -d '{ - "challenge_repo_url": "git@github.com:aixcc-finals/afc-libxml2.git", + "challenge_repo_url": "git@github.com:tob-challenges/afc-libxml2.git", "challenge_repo_base_ref": "792cc4a1462d4a969d9d38bd80a52d2e4f7bd137", "challenge_repo_head_ref": "9d1cb67c31933ee5ae3ee458940f7dbeb2fde8b8", - "fuzz_tooling_url": "git@github.com:aixcc-finals/oss-fuzz-aixcc.git", + "fuzz_tooling_url": "git@github.com:tob-challenges/oss-fuzz-aixcc.git", "fuzz_tooling_ref": "challenge-state/lx-ex1-delta-01", "fuzz_tooling_project_name": "libxml2", "harnesses_included": true, diff --git a/orchestrator/scripts/send_sarif.sh b/orchestrator/scripts/send_sarif.sh index a051bb5b..8bfe833c 100755 --- a/orchestrator/scripts/send_sarif.sh +++ b/orchestrator/scripts/send_sarif.sh @@ -65,7 +65,7 @@ JSON_DATA=$(cat < ChallengeTask: "-C", str(oss_fuzz_dir), "clone", - "git@github.com:aixcc-finals/oss-fuzz-aixcc.git", + "git@github.com:tob-challenges/oss-fuzz-aixcc.git", ], check=True, ) @@ -213,7 +213,7 @@ def example_libpng_oss_fuzz_task(tmp_path: Path) -> ChallengeTask: ) # Download selinux source code - url = "git@github.com:aixcc-finals/example-libpng.git" + url = "git@github.com:tob-challenges/example-libpng.git" subprocess.run(["git", "-C", str(source_dir), "clone", url], check=True) subprocess.run( [ diff --git a/patcher/tests/test_utils.py b/patcher/tests/test_utils.py index 1a4b2491..8a41edb2 100644 --- a/patcher/tests/test_utils.py +++ b/patcher/tests/test_utils.py @@ -70,7 +70,7 @@ def tika_challenge_task_path(tmp_path: Path) -> Path: source_dir.mkdir(parents=True) subprocess.run( - ["git", "-C", str(oss_fuzz_dir), "clone", "https://github.com/aixcc-finals/oss-fuzz-aixcc.git"], check=True + ["git", "-C", str(oss_fuzz_dir), "clone", "https://github.com/tob-challenges/oss-fuzz-aixcc.git"], check=True ) subprocess.run( [ @@ -83,7 +83,7 @@ def tika_challenge_task_path(tmp_path: Path) -> Path: check=True, ) - tika_url = "https://github.com/aixcc-finals/afc-tika" + tika_url = "https://github.com/tob-challenges/afc-tika" subprocess.run(["git", "-C", str(source_dir), "clone", tika_url], check=True) subprocess.run( ["git", "-C", str(source_dir / "afc-tika"), "checkout", "challenges/tk-full-01"], diff --git a/program-model/tests/conftest.py b/program-model/tests/conftest.py index f1cdb7b9..afdb13e7 100644 --- a/program-model/tests/conftest.py +++ b/program-model/tests/conftest.py @@ -86,7 +86,7 @@ def oss_fuzz_task( "clone", "-b", str(oss_fuzz_branch), - "https://github.com/aixcc-finals/oss-fuzz-aixcc.git", + "https://github.com/tob-challenges/oss-fuzz-aixcc.git", ], check=True, capture_output=True, @@ -214,7 +214,7 @@ def commons_compress_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "apache-commons-compress", "challenge-state/cc-full-01", "afc-commons-compress", - "https://github.com/aixcc-finals/afc-commons-compress.git", + "https://github.com/tob-challenges/afc-commons-compress.git", "challenges/cc-full-01", ) @@ -231,7 +231,7 @@ def dropbear_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "dropbear", "challenge-state/db-full-01", "afc-dropbear", - "https://github.com/aixcc-finals/afc-dropbear.git", + "https://github.com/tob-challenges/afc-dropbear.git", "challenges/db-full-01", ) @@ -248,7 +248,7 @@ def freerdp_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "freerdp", "challenge-state/fp-full-01", "afc-freerdp", - "https://github.com/aixcc-finals/afc-freerdp.git", + "https://github.com/tob-challenges/afc-freerdp.git", "challenges/fp-full-01", ) @@ -333,7 +333,7 @@ def libpng_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "libpng", "challenge-state/lp-delta-01", "example-libpng", - "https://github.com/aixcc-finals/example-libpng.git", + "https://github.com/tob-challenges/example-libpng.git", "challenges/lp-delta-01", ) @@ -350,7 +350,7 @@ def libxml2_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "libxml2", "challenge-state/lx-full-01", "afc-libxml2", - "https://github.com/aixcc-finals/afc-libxml2.git", + "https://github.com/tob-challenges/afc-libxml2.git", "challenges/lx-full-01", ) @@ -401,7 +401,7 @@ def sqlite_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "sqlite3", "challenge-state/sq-full-01", "afc-sqlite3", - "https://github.com/aixcc-finals/afc-sqlite3.git", + "https://github.com/tob-challenges/afc-sqlite3.git", "challenges/sq-full-01", ) @@ -418,7 +418,7 @@ def zookeeper_oss_fuzz_task(tmp_path_factory: pytest.TempPathFactory): "zookeeper", "challenge-state/zk-full-01", "afc-zookeeper", - "https://github.com/aixcc-finals/afc-zookeeper.git", + "https://github.com/tob-challenges/afc-zookeeper.git", "challenges/zk-full-01", ) diff --git a/seed-gen/test/test_find_harness.py b/seed-gen/test/test_find_harness.py index 05c8f7fd..75ce4f73 100644 --- a/seed-gen/test/test_find_harness.py +++ b/seed-gen/test/test_find_harness.py @@ -578,7 +578,7 @@ def curl_oss_fuzz_ct() -> Iterator[ChallengeTask]: "-C", str(oss_fuzz_dir), "clone", - "git@github.com:aixcc-finals/oss-fuzz-aixcc.git", + "git@github.com:tob-challenges/oss-fuzz-aixcc.git", ], check=True, ) @@ -593,7 +593,7 @@ def curl_oss_fuzz_ct() -> Iterator[ChallengeTask]: subprocess.run(cmd, check=True) # Download curl source code - curl_url = "git@github.com:aixcc-finals/afc-curl.git" + curl_url = "git@github.com:tob-challenges/afc-curl.git" focus = "afc-curl" # Checkout specific curl commit for reproducibility subprocess.run(["git", "-C", str(source_dir), "clone", curl_url], check=True)