diff --git a/Cargo.lock b/Cargo.lock index cb3b277e..ab10798f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,7 +145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "093d520274bfff7278d776f7ea12981a0a0a6f96db90964658e0f38fc6e9a6a6" dependencies = [ "better_any", - "bit-set 0.8.0", + "bit-set", "byteorder", "lazy_static", "murmur3", @@ -682,30 +682,15 @@ dependencies = [ "num-traits", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec 0.6.3", -] - [[package]] name = "bit-set" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ - "bit-vec 0.8.0", + "bit-vec", ] -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bit-vec" version = "0.8.0" @@ -889,7 +874,7 @@ dependencies = [ "base64", "chrono", "lazy_static", - "nom 7.1.3", + "nom", "pastey", "regex", "serde", @@ -2522,24 +2507,13 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fancy-regex" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" -dependencies = [ - "bit-set 0.5.3", - "regex-automata", - "regex-syntax 0.8.11", -] - [[package]] name = "fancy-regex" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277" dependencies = [ - "bit-set 0.8.0", + "bit-set", "regex-automata", "regex-syntax 0.8.11", ] @@ -3527,15 +3501,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "iso8601" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1082f0c48f143442a1ac6122f67e360ceee130b967af4d50996e5154a45df46" -dependencies = [ - "nom 8.0.0", -] - [[package]] name = "itertools" version = "0.13.0" @@ -3560,6 +3525,55 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -3587,36 +3601,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "574b0cd5e90ee2ba03a66d0611fc9a09c9a0c28b2ecc2dc8a181dd31a53ca5d7" -[[package]] -name = "jsonschema" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0f4bea31643be4c6a678e9aa4ae44f0db9e5609d5ca9dc9083d06eb3e9a27a" -dependencies = [ - "ahash", - "anyhow", - "base64", - "bytecount", - "clap", - "fancy-regex 0.13.0", - "fraction", - "getrandom 0.2.17", - "iso8601", - "itoa", - "memchr", - "num-cmp", - "once_cell", - "parking_lot", - "percent-encoding", - "regex", - "reqwest", - "serde", - "serde_json", - "time", - "url", - "uuid", -] - [[package]] name = "jsonschema" version = "0.46.6" @@ -3627,7 +3611,7 @@ dependencies = [ "bytecount", "data-encoding", "email_address", - "fancy-regex 0.18.0", + "fancy-regex", "fraction", "getrandom 0.3.4", "idna", @@ -3638,6 +3622,8 @@ dependencies = [ "referencing", "regex", "regex-syntax 0.8.11", + "reqwest 0.13.4", + "rustls", "serde", "serde_json", "unicode-general-category", @@ -3968,15 +3954,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" -dependencies = [ - "memchr", -] - [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -4272,7 +4249,7 @@ dependencies = [ "oxiri", "oxrdf", "ryu-js", - "thiserror 2.0.18", + "thiserror 1.0.69", ] [[package]] @@ -4283,8 +4260,8 @@ checksum = "0afd5c28e4a399c57ee2bc3accd40c7b671fdc7b6537499f14e95b265af7d7e0" dependencies = [ "oxilangtag", "oxiri", - "rand 0.9.4", - "thiserror 2.0.18", + "rand 0.8.6", + "thiserror 1.0.69", ] [[package]] @@ -4521,7 +4498,7 @@ checksum = "9114f9c1683dd09c5f4fa024c89fdad783eaae21d3d52dd23ddaaffa29ffb168" dependencies = [ "either", "fnv", - "nom 7.1.3", + "nom", "once_cell", "postcard", "quick-xml 0.38.4", @@ -4733,12 +4710,12 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ - "bit-set 0.8.0", - "bit-vec 0.8.0", + "bit-set", + "bit-vec", "bitflags", "num-traits", "rand 0.9.4", - "rand_chacha", + "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax 0.8.11", "rusty-fork", @@ -4863,6 +4840,8 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ + "libc", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] @@ -4872,7 +4851,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ - "rand_chacha", + "rand_chacha 0.9.0", "rand_core 0.9.5", ] @@ -4887,6 +4866,16 @@ dependencies = [ "rand_core 0.10.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_chacha" version = "0.9.0" @@ -5099,7 +5088,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" name = "registry-config-report" version = "0.8.3" dependencies = [ - "jsonschema 0.46.6", + "jsonschema", "serde", "serde_json", ] @@ -5142,7 +5131,7 @@ dependencies = [ "getrandom 0.4.3", "hyper", "hyper-util", - "jsonschema 0.18.3", + "jsonschema", "registry-config-report", "registry-notary-core", "registry-notary-server", @@ -5150,7 +5139,7 @@ dependencies = [ "registry-platform-crypto", "registry-platform-httputil", "registry-platform-ops", - "reqwest", + "reqwest 0.12.28", "serde_json", "serde_norway", "sha2 0.11.0", @@ -5180,7 +5169,7 @@ dependencies = [ "registry-platform-httputil", "registry-platform-oid4vci", "registry-platform-sdjwt", - "reqwest", + "reqwest 0.12.28", "secrecy", "serde", "serde_json", @@ -5230,7 +5219,7 @@ dependencies = [ "cryptoki", "getrandom 0.4.3", "hex", - "jsonschema 0.18.3", + "jsonschema", "jsonwebtoken", "registry-notary-client", "registry-notary-core", @@ -5250,7 +5239,7 @@ dependencies = [ "registry-platform-replay", "registry-platform-sdjwt", "registry-platform-testing", - "reqwest", + "reqwest 0.12.28", "serde", "serde_json", "serde_norway", @@ -5299,7 +5288,7 @@ dependencies = [ "registry-platform-authcommon", "registry-platform-config", "registry-platform-ops", - "reqwest", + "reqwest 0.12.28", "serde", "serde_json", "serde_norway", @@ -5436,7 +5425,7 @@ dependencies = [ "bytes", "http", "proptest", - "reqwest", + "reqwest 0.12.28", "thiserror 2.0.18", "tokio", "url", @@ -5466,7 +5455,7 @@ dependencies = [ "jsonwebtoken", "registry-platform-crypto", "registry-platform-httputil", - "reqwest", + "reqwest 0.12.28", "serde", "serde_json", "thiserror 2.0.18", @@ -5478,7 +5467,7 @@ name = "registry-platform-ops" version = "0.8.3" dependencies = [ "fs2", - "jsonschema 0.46.6", + "jsonschema", "registry-platform-crypto", "serde", "serde_json", @@ -5562,7 +5551,7 @@ dependencies = [ "registry-platform-oid4vci", "registry-platform-oidc", "registry-platform-replay", - "reqwest", + "reqwest 0.12.28", "serde_json", "tempfile", "thiserror 2.0.18", @@ -5601,7 +5590,7 @@ dependencies = [ "hyper", "hyper-util", "insta", - "jsonschema 0.18.3", + "jsonschema", "jsonwebtoken", "native-tls", "ogcapi-types", @@ -5621,7 +5610,7 @@ dependencies = [ "registry-platform-pdp", "registry-platform-sdjwt", "registry-platform-testing", - "reqwest", + "reqwest 0.12.28", "serde", "serde-saphyr", "serde_json", @@ -5675,9 +5664,7 @@ checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64", "bytes", - "futures-channel", "futures-core", - "futures-util", "http", "http-body", "http-body-util", @@ -5710,6 +5697,45 @@ dependencies = [ "webpki-roots 1.0.8", ] +[[package]] +name = "reqwest" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_json", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tower", + "tower-http 0.6.11", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "reserve-port" version = "2.4.0" @@ -5899,6 +5925,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pki-types" version = "1.14.1" @@ -5909,6 +5947,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.103.13" @@ -6317,6 +6382,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simdutf8" version = "0.1.5" @@ -7426,6 +7501,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.11" diff --git a/Cargo.toml b/Cargo.toml index c06b7a12..f8d772ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -105,7 +105,7 @@ humantime-serde = { version = "1" } hyper = { version = "1", features = ["http1", "http2", "server"] } hyper-util = { version = "0.1", features = ["server-auto", "tokio"] } insta = { version = "1", features = ["json"] } -jsonschema = { version = "0.18" } +jsonschema = { version = "0.46" } jsonwebtoken = { version = "10", default-features = false, features = ["aws_lc_rs"] } native-tls = { version = "0.2" } ogcapi-types = { version = "0.3.0", features = ["features"] } diff --git a/crates/registry-relay/Cargo.toml b/crates/registry-relay/Cargo.toml index 818e1560..172a04c3 100644 --- a/crates/registry-relay/Cargo.toml +++ b/crates/registry-relay/Cargo.toml @@ -76,7 +76,7 @@ serde_json = { version = "1" } # Optional Crosswalk CEL mapping support. Disabled by default so the core VC # path does not pull in the mapping dependency graph. crosswalk-core = { workspace = true, optional = true } -jsonschema = { version = "0.18", optional = true } +jsonschema = { version = "0.46", optional = true } # Pure Rust YAML parser used instead of the previous unmaintained YAML stack. serde-saphyr = { version = "0.0.26" } humantime-serde = { version = "1" } @@ -147,7 +147,7 @@ insta = { version = "1", features = ["json"] } zip = { version = "8", default-features = false, features = ["deflate"] } # Validates credentialSubject payloads against the JSON Schemas we # publish at /schemas/... -jsonschema = { version = "0.18" } +jsonschema = { version = "0.46" } # Ed25519 key generation for tests so they can mint fresh keypairs and # convert them to/from JWK without shelling out to openssl. ed25519-dalek = { version = "2", features = ["pkcs8", "rand_core"] }