From e71cb92bb6f6c9ac00a864593b86be02d99a0d80 Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:24:47 -0800 Subject: [PATCH 1/7] Update .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f4cff580f..6fd1293a29 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,7 @@ lcov.info /src/ApiService/ApiService/Properties/PublishProfiles/* /src/ApiService/ApiService/Properties/ServiceDependencies/* -.vs \ No newline at end of file +.vs + +# Local fork tools, not to be merged back into main repo +/.github/workflows/sync-fork.yml From 0f1a6c92416919ab90b06cad6f1cbddd5a81a83b Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:26:44 -0800 Subject: [PATCH 2/7] re-add sync-fork.yml deleted after merge from origin/main --- .github/workflows/sync-fork.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/sync-fork.yml diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml new file mode 100644 index 0000000000..7266989f0f --- /dev/null +++ b/.github/workflows/sync-fork.yml @@ -0,0 +1,19 @@ +name: Sync Fork + +on: + schedule: + - cron: '*/60 * * * *' # run hourly + workflow_dispatch: # or run on button click + +jobs: + sync: + + runs-on: ubuntu-latest + + steps: + - uses: tgymnich/fork-sync@v1.6.3 + with: + token: ${{ secrets.SYNC_FORK_TOKEN }} + owner: microsoft + base: main + head: main From 84a5d698a0845e578ed18fea4d20637a8aafc44f Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 11 Jan 2023 15:48:32 -0800 Subject: [PATCH 3/7] Update README.md TEST --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 010148dd3a..8284a41da3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # OneFuzz - +TEST [![Onefuzz build status](https://github.com/microsoft/onefuzz/workflows/Build/badge.svg?branch=main)](https://github.com/microsoft/onefuzz/actions/workflows/ci.yml?query=branch%3Amain) ## A self-hosted Fuzzing-As-A-Service platform From 3b841b29d8d50da242844f9ae83a5341753b8860 Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 11 Jan 2023 15:49:04 -0800 Subject: [PATCH 4/7] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8284a41da3..e3ab7544d4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # OneFuzz -TEST [![Onefuzz build status](https://github.com/microsoft/onefuzz/workflows/Build/badge.svg?branch=main)](https://github.com/microsoft/onefuzz/actions/workflows/ci.yml?query=branch%3Amain) ## A self-hosted Fuzzing-As-A-Service platform From 3feaf91e339c875b9ad523737f5c635d212dc3ee Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 22 Feb 2023 11:40:58 -0800 Subject: [PATCH 5/7] Update sync-fork.yml bump ver to 1.8 --- .github/workflows/sync-fork.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml index 7266989f0f..24693c794e 100644 --- a/.github/workflows/sync-fork.yml +++ b/.github/workflows/sync-fork.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: tgymnich/fork-sync@v1.6.3 + - uses: tgymnich/fork-sync@v1.8 with: token: ${{ secrets.SYNC_FORK_TOKEN }} owner: microsoft From 2754cc3bddf83b294bc2be643c5d6e20305951fe Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:59:35 -0700 Subject: [PATCH 6/7] restore line break --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e3ab7544d4..010148dd3a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # OneFuzz + [![Onefuzz build status](https://github.com/microsoft/onefuzz/workflows/Build/badge.svg?branch=main)](https://github.com/microsoft/onefuzz/actions/workflows/ci.yml?query=branch%3Amain) ## A self-hosted Fuzzing-As-A-Service platform From 9189bb5e6a169418566c7a03f63047df4c97788f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 17:13:27 +0000 Subject: [PATCH 7/7] Bump base64 from 0.13.0 to 0.21.0 in /src/agent Bumps [base64](https://github.com/marshallpierce/rust-base64) from 0.13.0 to 0.21.0. - [Release notes](https://github.com/marshallpierce/rust-base64/releases) - [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.13.0...v0.21.0) --- updated-dependencies: - dependency-name: base64 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/agent/Cargo.lock | 12 ++++++------ src/agent/onefuzz/Cargo.toml | 2 +- src/agent/storage-queue/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index d6b082bf2c..86ff547871 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" @@ -1291,7 +1291,7 @@ checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", "async-channel", - "base64 0.13.0", + "base64 0.13.1", "futures-lite", "http", "infer", @@ -1976,7 +1976,7 @@ dependencies = [ "anyhow", "async-trait", "backoff", - "base64 0.13.0", + "base64 0.21.0", "bytes", "clap", "cpp_demangle", @@ -2689,7 +2689,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -3111,7 +3111,7 @@ dependencies = [ "anyhow", "async-trait", "backoff", - "base64 0.13.0", + "base64 0.21.0", "bincode", "bytes", "derivative", diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/Cargo.toml index cecc6e37ef..ba26803c54 100644 --- a/src/agent/onefuzz/Cargo.toml +++ b/src/agent/onefuzz/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" [dependencies] anyhow = "1.0" async-trait = "0.1" -base64 = "0.13" +base64 = "0.21" bytes = "1.4" dunce = "1.0" dynamic-library = { path = "../dynamic-library" } diff --git a/src/agent/storage-queue/Cargo.toml b/src/agent/storage-queue/Cargo.toml index 00a41fa892..3de60598ca 100644 --- a/src/agent/storage-queue/Cargo.toml +++ b/src/agent/storage-queue/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT" anyhow = "1.0" async-trait = "0.1" backoff = { version = "0.4", features = ["tokio"] } -base64 = "0.13" +base64 = "0.21" bytes = { version = "1.4", features = ["serde"] } derivative = "2.2" flume = "0.10"