Skip to content

Commit cdf48c8

Browse files
authored
remove older versions of idna (#7369)
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)
1 parent 9093ac6 commit cdf48c8

File tree

4 files changed

+54
-120
lines changed

4 files changed

+54
-120
lines changed

Cargo.lock

+42-109
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,10 @@ headers = "0.4.0"
413413
heck = "0.5"
414414
hex = "0.4.3"
415415
hex-literal = "0.4.1"
416-
hickory-client = "0.24.1"
417-
hickory-proto = "0.24.1"
418-
hickory-resolver = "0.24.1"
419-
hickory-server = "0.24.1"
416+
hickory-client = "0.24.2"
417+
hickory-proto = "0.24.2"
418+
hickory-resolver = "0.24.2"
419+
hickory-server = "0.24.2"
420420
highway = "1.2.0"
421421
hkdf = "0.12.4"
422422
http = "1.1.0"

end-to-end-tests/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@ socket2.workspace = true
4444
colored.workspace = true
4545
anstyle.workspace = true
4646
clap.workspace = true
47-
dhcproto = "0.12"
4847
macaddr.workspace = true
48+
49+
# On Git commit for trust-dns -> hickory switch.
50+
# Switch back to released versions of dhcproto on next release.
51+
dhcproto = { git = "https://github.com/bluecatengineering/dhcproto.git", rev = "120da6fcd8a7be84d417d372634ead84ce07e6da" }

workspace-hack/Cargo.toml

+4-6
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ getrandom = { version = "0.2.15", default-features = false, features = ["js", "r
6464
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
6565
hashbrown = { version = "0.15.1" }
6666
hex = { version = "0.4.3", features = ["serde"] }
67-
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
67+
hickory-proto = { version = "0.24.2", features = ["text-parsing"] }
6868
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
6969
hyper = { version = "1.5.2", features = ["full"] }
70+
idna = { version = "1.0.3" }
7071
indexmap = { version = "2.7.0", features = ["serde"] }
7172
inout = { version = "0.1.3", default-features = false, features = ["std"] }
7273
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
@@ -127,8 +128,6 @@ toml = { version = "0.7.8" }
127128
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
128129
toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.22", features = ["serde"] }
129130
tracing = { version = "0.1.40", features = ["log"] }
130-
unicode-bidi = { version = "0.3.17" }
131-
unicode-normalization = { version = "0.1.24" }
132131
usdt = { version = "0.5.0" }
133132
usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
134133
uuid = { version = "1.12.0", features = ["serde", "v4"] }
@@ -185,9 +184,10 @@ getrandom = { version = "0.2.15", default-features = false, features = ["js", "r
185184
group = { version = "0.13.0", default-features = false, features = ["alloc"] }
186185
hashbrown = { version = "0.15.1" }
187186
hex = { version = "0.4.3", features = ["serde"] }
188-
hickory-proto = { version = "0.24.1", features = ["text-parsing"] }
187+
hickory-proto = { version = "0.24.2", features = ["text-parsing"] }
189188
hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
190189
hyper = { version = "1.5.2", features = ["full"] }
190+
idna = { version = "1.0.3" }
191191
indexmap = { version = "2.7.0", features = ["serde"] }
192192
inout = { version = "0.1.3", default-features = false, features = ["std"] }
193193
itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
@@ -250,8 +250,6 @@ toml = { version = "0.7.8" }
250250
toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
251251
toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.22", features = ["serde"] }
252252
tracing = { version = "0.1.40", features = ["log"] }
253-
unicode-bidi = { version = "0.3.17" }
254-
unicode-normalization = { version = "0.1.24" }
255253
unicode-xid = { version = "0.2.6" }
256254
usdt = { version = "0.5.0" }
257255
usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }

0 commit comments

Comments
 (0)