Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: awslabs/tough
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: tough-v0.12.3
Choose a base ref
...
head repository: awslabs/tough
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
29 contributors
Loading
Showing with 7,478 additions and 3,485 deletions.
  1. +1 −1 .github/cache_bust
  2. +18 −44 .github/dependabot.yml
  3. +35 −15 .github/workflows/rust.yml
  4. +0 −1 CONTRIBUTING.md
  5. +2,543 −785 Cargo.lock
  6. +1 −0 Cargo.toml
  7. +21 −6 Makefile
  8. +1 −8 README.md
  9. +44 −16 deny.toml
  10. +1 −1 doc/delegated-targets/README.md
  11. +0 −4 integ/failure-server/.gitattributes
  12. +20 −0 integ/failure-server/Cargo.toml
  13. +0 −6 integ/failure-server/Dockerfile.toxiproxycli
  14. +0 −4 integ/failure-server/Dockerfile.toxy
  15. +0 −90 integ/failure-server/run.sh
  16. +80 −0 integ/failure-server/src/lib.rs
  17. +96 −0 integ/failure-server/src/toxic/http_server.rs
  18. +35 −0 integ/failure-server/src/toxic/mod.rs
  19. +138 −0 integ/failure-server/src/toxic/tcp_proxy.rs
  20. +0 −15 integ/failure-server/teardown.sh
  21. +0 −32 integ/failure-server/toxiproxy/setup.sh
  22. +0 −1 integ/failure-server/toxy/.gitignore
  23. +0 −29 integ/failure-server/toxy/index.js
  24. +0 −13 integ/failure-server/toxy/package.json
  25. +27 −0 olpc-cjson/CHANGELOG.md
  26. +6 −3 olpc-cjson/Cargo.toml
  27. +33 −3 olpc-cjson/src/lib.rs
  28. +81 −1 tough-kms/CHANGELOG.md
  29. +16 −14 tough-kms/Cargo.toml
  30. +21 −29 tough-kms/src/client.rs
  31. +17 −23 tough-kms/src/error.rs
  32. +40 −49 tough-kms/src/lib.rs
  33. +28 −25 tough-kms/tests/all_test.rs
  34. +1 −1 tough-kms/tests/data/response_public_key.json
  35. +1 −1 tough-kms/tests/data/response_public_key_no_algo.json
  36. +1 −1 tough-kms/tests/data/response_public_key_unmatch_algo.json
  37. +28 −22 tough-kms/tests/test_utils.rs
  38. +81 −1 tough-ssm/CHANGELOG.md
  39. +7 −8 tough-ssm/Cargo.toml
  40. +20 −11 tough-ssm/src/client.rs
  41. +9 −6 tough-ssm/src/error.rs
  42. +12 −14 tough-ssm/src/lib.rs
  43. +115 −1 tough/CHANGELOG.md
  44. +37 −23 tough/Cargo.toml
  45. +1 −1 tough/README.md
  46. +83 −62 tough/src/cache.rs
  47. +82 −33 tough/src/datastore.rs
  48. +13 −7 tough/src/editor/keys.rs
  49. +67 −54 tough/src/editor/mod.rs
  50. +171 −81 tough/src/editor/signed.rs
  51. +31 −23 tough/src/editor/targets.rs
  52. +29 −22 tough/src/editor/test.rs
  53. +10 −11 tough/src/error.rs
  54. +15 −25 tough/src/fetch.rs
  55. +257 −141 tough/src/http.rs
  56. +110 −83 tough/src/io.rs
  57. +16 −6 tough/src/key_source.rs
  58. +228 −158 tough/src/lib.rs
  59. +21 −0 tough/src/schema/de.rs
  60. +1 −1 tough/src/schema/decoded.rs
  61. +32 −21 tough/src/schema/key.rs
  62. +38 −55 tough/src/schema/mod.rs
  63. +30 −19 tough/src/schema/spki.rs
  64. +1 −1 tough/src/schema/verify.rs
  65. +37 −25 tough/src/sign.rs
  66. +13 −16 tough/src/target_name.rs
  67. +71 −23 tough/src/transport.rs
  68. +74 −0 tough/src/urlpath.rs
  69. +164 −0 tough/tests/data/ecdsa-new-type-sig-keys/root.json
  70. +156 −0 tough/tests/data/pem-encoded-ecdsa-sig-keys/root.json
  71. +14 −9 tough/tests/expiration_enforcement.rs
  72. +48 −91 tough/tests/http.rs
  73. +24 −15 tough/tests/interop.rs
  74. +77 −86 tough/tests/repo_cache.rs
  75. +191 −111 tough/tests/repo_editor.rs
  76. +4 −4 tough/tests/rotated_root.rs
  77. +43 −25 tough/tests/target_path_safety.rs
  78. +14 −5 tough/tests/test_utils.rs
  79. +12 −12 tough/tests/transport.rs
  80. +106 −1 tuftool/CHANGELOG.md
  81. +31 −28 tuftool/Cargo.toml
  82. +7 −0 tuftool/Dockerfile
  83. +29 −4 tuftool/README.md
  84. +38 −27 tuftool/src/add_key_role.rs
  85. +65 −45 tuftool/src/add_role.rs
  86. +42 −41 tuftool/src/clone.rs
  87. +5 −3 tuftool/src/common.rs
  88. +57 −46 tuftool/src/create.rs
  89. +25 −17 tuftool/src/create_role.rs
  90. +20 −5 tuftool/src/datetime.rs
  91. +47 −32 tuftool/src/download.rs
  92. +19 −9 tuftool/src/download_root.rs
  93. +5 −24 tuftool/src/error.rs
  94. +158 −84 tuftool/src/main.rs
  95. +34 −26 tuftool/src/remove_key_role.rs
  96. +32 −24 tuftool/src/remove_role.rs
  97. +127 −101 tuftool/src/root.rs
  98. +166 −50 tuftool/src/source.rs
  99. +147 −0 tuftool/src/transfer_metadata.rs
  100. +81 −65 tuftool/src/update.rs
  101. +45 −37 tuftool/src/update_targets.rs
  102. +8 −8 tuftool/tests/clone_command.rs
  103. +15 −14 tuftool/tests/create_command.rs
  104. +49 −34 tuftool/tests/create_repository_integration.rs
  105. +141 −131 tuftool/tests/delegation_commands.rs
  106. +5 −5 tuftool/tests/download_command.rs
  107. +128 −47 tuftool/tests/root_command.rs
  108. +18 −12 tuftool/tests/test_utils.rs
  109. +35 −32 tuftool/tests/update_command.rs
2 changes: 1 addition & 1 deletion .github/cache_bust
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# this file provides a manual way to clear out github actions caches. any change
# to this file will cause all github action caches to miss. increment the number
# below by 1 if you need to clear the caches.
3
4
62 changes: 18 additions & 44 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,20 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
time: "13:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: tokio
versions:
- 1.0.3
- 1.2.0
- 1.3.0
- dependency-name: reqwest
versions:
- 0.11.1
- 0.11.2
- dependency-name: serde
versions:
- 1.0.124
- dependency-name: hex
versions:
- 0.4.3
- dependency-name: serde_json
versions:
- 1.0.62
- 1.0.64
- dependency-name: url
versions:
- 2.2.1
- dependency-name: pem
versions:
- 0.8.3
- dependency-name: unicode-normalization
versions:
- 0.1.17
- dependency-name: ring
versions:
- 0.16.20
- dependency-name: log
versions:
- 0.4.14
- dependency-name: assert_cmd
versions:
- 1.0.3
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "daily"
ignore:
# For AWS SDK for Rust, ignore all (but one) updates
# - dependency-name: "aws-config"
- dependency-name: "aws-endpoint"
- dependency-name: "aws-http"
- dependency-name: "aws-hyper"
- dependency-name: "aws-sig*"
- dependency-name: "aws-sdk*"
- dependency-name: "aws-smithy*"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
50 changes: 35 additions & 15 deletions .github/workflows/rust.yml
View file
Original file line number Diff line number Diff line change
@@ -2,24 +2,44 @@ name: Rust
on:
pull_request:
paths-ignore:
- '**.md'
- "**.md"
- ".github/dependabot.yml"
branches: [develop]

env:
# From-scratch builds with incremental compilation enabled adds unneeded performance and disk overhead.
CARGO_INCREMENTAL: "0"

jobs:
build:
strategy:
fail-fast: false
matrix:
make_target: ["check-licenses", "build", "integ"]
runs-on: ubuntu-latest
make_target: ["check-licenses", "build", "integ", "integ-fips"]
os: [ubuntu-latest, windows-latest, macos-latest]
exclude:
- os: windows-latest
make_target: check-licenses
- os: macos-latest
make_target: check-licenses
- os: macos-latest
make_target: integ-fips
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
.cargo
target
# you can edit the .github/cache_bust file if you need to clear the cache
key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-
- run: rustup update stable
- run: make ${{ matrix.make_target }}
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: |
.cargo
# you can edit the .github/cache_bust file if you need to clear the cache
key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}
- uses: ilammy/setup-nasm@v1 # requirement for windows FIPS builds
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v5
# print the current rustc. replace stable to pin to a specific toolchain version.
- run: rustup default stable
- run: rustup component add rustfmt
- run: rustup component add clippy
- run: make ${{ matrix.make_target }}
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ documentation, we greatly value feedback and contributions from our community.
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
information to effectively respond to your bug report or contribution.


## Security issue notifications
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.

Loading