Skip to content

Commit

Permalink
remove older versions of idna (#7369)
Browse files Browse the repository at this point in the history
This resolves GHSA-h97m-ww89-6jmq. We
don't use the idna crate directly, but it's pulled in by various
dependency chains. Based on these dependency chains I don't think
there's any impact of this particular security issue for the product.

The top-level updates here are:
- hickory-* v0.24.1 -> v0.24.2
- publicsuffix v2.2.3 -> v2.3.0
- cookie_store v0.21.0 -> v0.21.1
- dhcproto v0.12.0 -> 120da6f
  (dhcproto is only used in end-to-end-tests)
  • Loading branch information
iliana authored Jan 21, 2025
1 parent 9093ac6 commit cdf48c8
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 120 deletions.
151 changes: 42 additions & 109 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ headers = "0.4.0"
heck = "0.5"
hex = "0.4.3"
hex-literal = "0.4.1"
hickory-client = "0.24.1"
hickory-proto = "0.24.1"
hickory-resolver = "0.24.1"
hickory-server = "0.24.1"
hickory-client = "0.24.2"
hickory-proto = "0.24.2"
hickory-resolver = "0.24.2"
hickory-server = "0.24.2"
highway = "1.2.0"
hkdf = "0.12.4"
http = "1.1.0"
Expand Down
5 changes: 4 additions & 1 deletion end-to-end-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,8 @@ socket2.workspace = true
colored.workspace = true
anstyle.workspace = true
clap.workspace = true
dhcproto = "0.12"
macaddr.workspace = true

# On Git commit for trust-dns -> hickory switch.
# Switch back to released versions of dhcproto on next release.
dhcproto = { git = "https://github.com/bluecatengineering/dhcproto.git", rev = "120da6fcd8a7be84d417d372634ead84ce07e6da" }
10 changes: 4 additions & 6 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ getrandom = { version = "0.2.15", default-features = false, features = ["js", "r
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
hashbrown = { version = "0.15.1" }
hex = { version = "0.4.3", features = ["serde"] }
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
hickory-proto = { version = "0.24.2", features = ["text-parsing"] }
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.5.2", features = ["full"] }
idna = { version = "1.0.3" }
indexmap = { version = "2.7.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
Expand Down Expand Up @@ -127,8 +128,6 @@ toml = { version = "0.7.8" }
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.22", features = ["serde"] }
tracing = { version = "0.1.40", features = ["log"] }
unicode-bidi = { version = "0.3.17" }
unicode-normalization = { version = "0.1.24" }
usdt = { version = "0.5.0" }
usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
uuid = { version = "1.12.0", features = ["serde", "v4"] }
Expand Down Expand Up @@ -185,9 +184,10 @@ getrandom = { version = "0.2.15", default-features = false, features = ["js", "r
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
hashbrown = { version = "0.15.1" }
hex = { version = "0.4.3", features = ["serde"] }
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
hickory-proto = { version = "0.24.2", features = ["text-parsing"] }
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
hyper = { version = "1.5.2", features = ["full"] }
idna = { version = "1.0.3" }
indexmap = { version = "2.7.0", features = ["serde"] }
inout = { version = "0.1.3", default-features = false, features = ["std"] }
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
Expand Down Expand Up @@ -250,8 +250,6 @@ toml = { version = "0.7.8" }
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.22", features = ["serde"] }
tracing = { version = "0.1.40", features = ["log"] }
unicode-bidi = { version = "0.3.17" }
unicode-normalization = { version = "0.1.24" }
unicode-xid = { version = "0.2.6" }
usdt = { version = "0.5.0" }
usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
Expand Down

0 comments on commit cdf48c8

Please sign in to comment.