From 28aa0b5552fecd95da992e59ec38554d216a4f74 Mon Sep 17 00:00:00 2001 From: Boog900 Date: Thu, 29 Feb 2024 20:29:11 +0000 Subject: [PATCH] CI: fix deny (#83) --- consensus/rules/Cargo.toml | 2 + deny.toml | 164 +++++++++++++++---------------------- net/fixed-bytes/Cargo.toml | 2 + pruning/Cargo.toml | 2 + test-utils/Cargo.toml | 2 + 5 files changed, 72 insertions(+), 100 deletions(-) diff --git a/consensus/rules/Cargo.toml b/consensus/rules/Cargo.toml index d7dc42bb..ae110be6 100644 --- a/consensus/rules/Cargo.toml +++ b/consensus/rules/Cargo.toml @@ -2,6 +2,8 @@ name = "monero-consensus" version = "0.1.0" edition = "2021" +license = "MIT" +authors = ["Boog900"] [features] default = [] diff --git a/deny.toml b/deny.toml index 28cbe99d..ab4ce530 100644 --- a/deny.toml +++ b/deny.toml @@ -11,6 +11,9 @@ # Root options +# The graph table configures how the dependency graph is constructed and thus +# which crates the checks are performed against +[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 @@ -20,16 +23,16 @@ # dependencies not shared by any other crates, would be ignored, as the target # list here is effectively saying which targets you are building for. targets = [ - { triple = "x86_64-apple-darwin" }, - { triple = "x86_64-pc-windows-gnu" }, - { triple = "x86_64-pc-windows-msvc" }, - { triple = "x86_64-unknown-linux-gnu" }, - { triple = "x86_64-unknown-linux-musl" }, - { triple = "aarch64-apple-darwin" }, + { triple = "x86_64-apple-darwin" }, + { triple = "x86_64-pc-windows-gnu" }, + { triple = "x86_64-pc-windows-msvc" }, + { triple = "x86_64-unknown-linux-gnu" }, + { triple = "x86_64-unknown-linux-musl" }, + { triple = "aarch64-apple-darwin" }, # 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 - #{ triple = "x86_64-unknown-linux-musl" }, + #"x86_64-unknown-linux-musl", # You can also specify which target_features you promise are enabled for a # particular target. target_features are currently not validated against # the actual valid features supported by the target architecture. @@ -53,6 +56,9 @@ no-default-features = false # If set, these feature will be enabled when collecting metadata. If `--features` # is specified on the cmd line they will take precedence over this option. #features = [] + +# The output table provides options for how/if diagnostics are outputted +[output] # When outputting inclusion graphs in diagnostics that include features, this # option can be used to specify the depth at which feature edges will be added. # This option is included since the graphs can be quite large and the addition @@ -64,35 +70,18 @@ feature-depth = 1 # More documentation for the advisories section can be found here: # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html [advisories] -# The path where the advisory database is cloned/fetched into -db-path = "~/.cargo/advisory-db" +# The path where the advisory databases are cloned/fetched into +#db-path = "$CARGO_HOME/advisory-dbs" # 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 = "deny" -# 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" +#db-urls = ["https://github.com/rustsec/advisory-db"] # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ #"RUSTSEC-0000-0000", + #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" }, + #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish + #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" }, ] -# 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. @@ -103,61 +92,37 @@ ignore = [ # 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)]. allow = [ - # Nothing required - free to use without permission. - "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ + # Nothing required - free to use without permission. + "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/ - # Must include copyright notice. - "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd) - "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised) - "ISC", # https://tldrlegal.com/license/isc-license - "MIT", # https://tldrlegal.com/license/mit-license + # Must include copyright notice. + "BSD-2-Clause", # https://tldrlegal.com/license/bsd-2-clause-license-(freebsd) + "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised) + "ISC", # https://tldrlegal.com/license/isc-license + "MIT", # https://tldrlegal.com/license/mit-license - # Must include copyright notice/attribution/changes/etc - "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html - "Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0) - "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained + # Must include copyright notice/attribution/changes/etc + "Apache-2.0 WITH LLVM-exception", # https://spdx.org/licenses/LLVM-exception.html + "Apache-2.0", # https://tldrlegal.com/license/apache-license-2.0-(apache-2.0) + "MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ + "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained - # OpenSSL 3.0+ uses Apache-2.0 - # OpenSSL 1.x.x uses https://www.openssl.org/source/license-openssl-ssleay.txt - "OpenSSL", # https://www.openssl.org/source/license.html + # OpenSSL 3.0+ uses Apache-2.0 + # OpenSSL 1.x.x uses https://www.openssl.org/source/license-openssl-ssleay.txt + "OpenSSL", # https://www.openssl.org/source/license.html - # Copyleft. - # "AGPL-3.0", # https://www.tldrlegal.com/license/gnu-affero-general-public-license-v3-agpl-3-0 + # Copyleft. + # "AGPL-3.0", # https://www.tldrlegal.com/license/gnu-affero-general-public-license-v3-agpl-3-0 - # Font licenses. - "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html - # "LicenseRef-UFL-1.0", # https://tldrlegal.com/license/ubuntu-font-license,-1.0 - # "OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html + # Font licenses. + "Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html + # "LicenseRef-UFL-1.0", # https://tldrlegal.com/license/ubuntu-font-license,-1.0 + # "OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html ] -# 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 = "deny" -# 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 - The license will be approved if it is OSI approved -# * fsf - The license will be approved if it is FSF Free -# * osi-only - The license will be approved if it is OSI-approved *AND NOT* FSF -# * fsf-only - The license will be approved if it 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. @@ -166,33 +131,31 @@ confidence-threshold = 0.8 # Allow 1 or more licenses on a per-crate basis, so that particular licenses # aren't accepted for every possible crate as with the normal allow list exceptions = [ - # Cuprate (AGPL-3.0) - # { allow = ["AGPL-3.0"], name = "cuprated", version = "*" } + # Cuprate (AGPL-3.0) + # { allow = ["AGPL-3.0"], name = "cuprated", version = "*" } - # Each entry is the crate and version constraint, and its specific allow - # list - #{ allow = ["Zlib"], name = "adler32", version = "*" }, + # Each entry is the crate and version constraint, and its specific allow + # list + #{ allow = ["Zlib"], crate = "adler32" }, ] # Some crates don't have (easily) machine readable licensing information, # adding a clarification entry for it allows you to manually specify the # licensing information -#[[licenses.clarify]] -# The name of the crate the clarification applies to -#name = "ring" -# The optional version constraint for the crate -#version = "*" +[[licenses.clarify]] +# The package spec the clarification applies to +crate = "ring" # The SPDX expression for the license requirements of the crate -#expression = "MIT AND ISC AND OpenSSL" +expression = "MIT AND ISC AND OpenSSL" # One or more files in the crate's source used as the "source of truth" for # the license expression. If the contents match, the clarification will be used # when running the license check, otherwise the clarification will be ignored # and the crate will be checked normally, which may produce warnings or errors # depending on the rest of your configuration -#license-files = [ - # Each entry is a crate relative path, and the (opaque) hash of its contents - #{ path = "LICENSE", hash = 0xbd0eed23 } -#] +license-files = [ +# Each entry is a crate relative path, and the (opaque) hash of its contents + { path = "LICENSE", hash = 0xbd0eed23 } +] [licenses.private] # If true, ignores workspace crates that aren't published, or are only @@ -231,24 +194,23 @@ workspace-default-features = "allow" external-default-features = "allow" # List of crates that are allowed. Use with care! allow = [ - #{ name = "ansi_term", version = "=0.11.0" }, + #"ansi_term@0.11.0", + #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is allowed" }, ] # List of crates to deny deny = [ - # Each entry the name of a crate and a version range. If version is - # not specified, all versions will be matched. - #{ name = "ansi_term", version = "=0.11.0" }, - # + #"ansi_term@0.11.0", + #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is banned" }, # Wrapper crates can optionally be specified to allow the crate when it # is a direct dependency of the otherwise banned crate - #{ name = "ansi_term", version = "=0.11.0", wrappers = [] }, + #{ crate = "ansi_term@0.11.0", wrappers = ["this-crate-directly-depends-on-ansi_term"] }, ] # List of features to allow/deny # Each entry the name of a crate and a version range. If version is # not specified, all versions will be matched. #[[bans.features]] -#name = "reqwest" +#crate = "reqwest" # Features to not allow #deny = ["json"] # Features to allow @@ -269,14 +231,16 @@ deny = [ # Certain crates/versions that will be skipped when doing duplicate detection. skip = [ - #{ name = "ansi_term", version = "=0.11.0" }, + #"ansi_term@0.11.0", + #{ crate = "ansi_term@0.11.0", reason = "you can specify a reason why it can't be updated/removed" }, ] # Similarly to `skip` allows you to skip certain crates during duplicate # detection. Unlike skip, it also includes the entire tree of transitive # dependencies starting at the specified crate, up to a certain depth, which is # by default infinite. skip-tree = [ - #{ name = "ansi_term", version = "=0.11.0", depth = 20 }, + #"ansi_term@0.11.0", # will be skipped along with _all_ of its direct and transitive dependencies + #{ crate = "ansi_term@0.11.0", depth = 20 }, ] # This section is considered when running `cargo deny check sources`. @@ -297,7 +261,7 @@ allow-git = [] [sources.allow-org] # 1 or more github.com organizations to allow git sources for -github = [""] +github = ["Cuprate"] # 1 or more gitlab.com organizations to allow git sources for gitlab = [""] # 1 or more bitbucket.org organizations to allow git sources for diff --git a/net/fixed-bytes/Cargo.toml b/net/fixed-bytes/Cargo.toml index 3bda00b6..c144c78f 100644 --- a/net/fixed-bytes/Cargo.toml +++ b/net/fixed-bytes/Cargo.toml @@ -2,6 +2,8 @@ name = "fixed-bytes" version = "0.1.0" edition = "2021" +license = "MIT" +authors = ["Boog900"] [features] default = ["std"] diff --git a/pruning/Cargo.toml b/pruning/Cargo.toml index fbd559e9..bd609975 100644 --- a/pruning/Cargo.toml +++ b/pruning/Cargo.toml @@ -2,6 +2,8 @@ name = "monero-pruning" version = "0.1.0" edition = "2021" +license = "MIT" +authors = ["Boog900"] [features] default = [] diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 7e0110bf..6d653a12 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -2,6 +2,8 @@ name = "cuprate-test-utils" version = "0.1.0" edition = "2021" +license = "MIT" +authors = ["Boog900"] [dependencies] monero-wire = {path = "../net/monero-wire"}