From 852fe92e87822b69e56085b6562fc1f5a28ee900 Mon Sep 17 00:00:00 2001 From: Tastaturtaste Date: Sun, 14 Jan 2024 21:12:38 +0100 Subject: [PATCH 1/5] Remove cargo-deny exception for intel-mkl-src. To be merged as soon as https://github.com/EmbarkStudios/krates/pull/61 arrives in cargo-deny-action. --- deny.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deny.toml b/deny.toml index 355c41c1f..8fd2fd2da 100644 --- a/deny.toml +++ b/deny.toml @@ -26,12 +26,6 @@ targets = [ # the actual valid features supported by the target architecture. #{ triple = "wasm32-unknown-unknown", features = ["atomics"] }, ] -exclude = [ - # Excluded because it is only used as a dev-dependency for testing - # TODO: Remove the exclude as soon as the fix for https://github.com/EmbarkStudios/krates/issues/60 is available in the cargo-deny-action - "intel-mkl-src", # TODO: Delete as -] - # This section is considered when running `cargo deny check advisories` # More documentation for the advisories section can be found here: # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html From 3f4d3448cee61742d26462de55b4eff3c24a2861 Mon Sep 17 00:00:00 2001 From: Tastaturtaste Date: Sun, 13 Oct 2024 11:21:13 +0200 Subject: [PATCH 2/5] Update cargo-deny-action to version 2. Uses cargo-deny 0.16 --- .github/workflows/ci.yml | 3 ++- deny.toml | 48 ++-------------------------------------- 2 files changed, 4 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee6b9f22f..6dabe7aea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: argmin CI on: + workflow_dispatch: pull_request: push: branches: @@ -207,6 +208,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@v1 + - uses: EmbarkStudios/cargo-deny-action@v2 with: command: check ${{ matrix.checks }} diff --git a/deny.toml b/deny.toml index 8fd2fd2da..47371c980 100644 --- a/deny.toml +++ b/deny.toml @@ -8,7 +8,7 @@ # The values provided in this template are the default values that will be used # when any section or field is not specified in your own configuration - +[graph] # If 1 or more target triples (and optionally, target_features) are specified, # only the specified targets will be checked when running `cargo deny check`. # This means, if a particular package is only ever used as a target specific @@ -34,42 +34,17 @@ targets = [ db-path = "~/.cargo/advisory-db" # The url(s) of the advisory databases to use db-urls = ["https://github.com/rustsec/advisory-db"] -# The lint level for security vulnerabilities -vulnerability = "deny" -# The lint level for unmaintained crates -unmaintained = "warn" # The lint level for crates that have been yanked from their source registry yanked = "warn" -# The lint level for crates with security notices. Note that as of -# 2019-12-17 there are no security notice advisories in -# https://github.com/rustsec/advisory-db -notice = "warn" # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ ] -# Threshold for security vulnerabilities, any vulnerability with a CVSS score -# lower than the range specified will be ignored. Note that ignored advisories -# will still output a note when they are encountered. -# * None - CVSS Score 0.0 -# * Low - CVSS Score 0.1 - 3.9 -# * Medium - CVSS Score 4.0 - 6.9 -# * High - CVSS Score 7.0 - 8.9 -# * Critical - CVSS Score 9.0 - 10.0 -#severity-threshold = - -# If this is true, then cargo deny will use the git executable to fetch advisory database. -# If this is false, then it uses a built-in git library. -# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support. -# See Git Authentication for more information about setting up git authentication. -#git-fetch-with-cli = true # This section is considered when running `cargo deny check licenses` # More documentation for the licenses section can be found here: # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html [licenses] -# The lint level for crates which do not have a detectable license -unlicensed = "deny" # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.11 short identifier (+ optional exception)]. @@ -89,26 +64,7 @@ allow = [ "OFL-1.1", "LicenseRef-UFL-1.0", ] -# List of explicitly disallowed licenses -# See https://spdx.org/licenses/ for list of possible licenses -# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. -deny = [ - #"Nokia", -] -# Lint level for licenses considered copyleft -copyleft = "warn" -# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses -# * both - The license will be approved if it is both OSI-approved *AND* FSF -# * either - The license will be approved if it is either OSI-approved *OR* FSF -# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF -# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved -# * neither - This predicate is ignored and the default lint level is used -allow-osi-fsf-free = "neither" -# Lint level used when no other predicates are matched -# 1. License isn't in the allow or deny lists -# 2. License isn't copyleft -# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" -default = "deny" + # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the # canonical license text of a valid SPDX license file. From 776957ebeebee2c671de311d951a905361312401 Mon Sep 17 00:00:00 2001 From: Tastaturtaste Date: Thu, 21 Nov 2024 14:47:03 +0100 Subject: [PATCH 3/5] Make use of new '--exclude-unpublished' flag of cargo-deny@0.16.2 and avoid license checks for dependencies that are not used in the published crates --- deny.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deny.toml b/deny.toml index 47371c980..aee787a82 100644 --- a/deny.toml +++ b/deny.toml @@ -17,6 +17,11 @@ # this list would mean the nix crate, as well as any of its exclusive # dependencies not shared by any other crates, would be ignored, as the target # list here is effectively saying which targets you are building for. + +# We only care about the licenses of dependencies we have to respect with our own license +# So crates that are not published or that only appear in dev dependencies can be ignored +exclude-unpublished = true +exclude-dev = true targets = [ # The triple can be any string, but only the target triples built in to # rustc (as of 1.40) can be checked against actual config expressions From 42fa4280edf0dc9028998f428fc11baf1d85d3e6 Mon Sep 17 00:00:00 2001 From: Tastaturtaste Date: Thu, 21 Nov 2024 16:54:43 +0100 Subject: [PATCH 4/5] Add Unicode-3.0 license to allowed license list --- deny.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/deny.toml b/deny.toml index aee787a82..d089b8595 100644 --- a/deny.toml +++ b/deny.toml @@ -56,6 +56,7 @@ ignore = [ allow = [ "MIT", "Apache-2.0", + "Unicode-3.0", "Apache-2.0 WITH LLVM-exception", "BSD-2-Clause", "BSD-3-Clause", From 748787d0537c049c29591a0224d932f59bb208e2 Mon Sep 17 00:00:00 2001 From: Tastaturtaste Date: Thu, 21 Nov 2024 17:17:40 +0100 Subject: [PATCH 5/5] Ignore RUSTSEC advisories for unmaintained crates. Previously covered through the cargo-deny config key dvisories.unmaintained = warn, which was deprecated in https://github.com/EmbarkStudios/cargo-deny/pull/611. --- deny.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deny.toml b/deny.toml index d089b8595..4ef9fff31 100644 --- a/deny.toml +++ b/deny.toml @@ -44,6 +44,9 @@ yanked = "warn" # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ + "RUSTSEC-2024-0370", + "RUSTSEC-2024-0384", + "RUSTSEC-2024-0388", ] # This section is considered when running `cargo deny check licenses`