diff --git a/Cargo.lock b/Cargo.lock index 5e4c4a0c..4e897373 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" dependencies = [ "backtrace", ] @@ -2026,9 +2026,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libloading" @@ -3038,9 +3038,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", @@ -3201,9 +3201,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" +checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c" dependencies = [ "bitflags 2.9.0", "core-foundation", @@ -3460,9 +3460,9 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" dependencies = [ "fastrand", "getrandom 0.3.2", @@ -3630,9 +3630,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -3825,9 +3825,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.23.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf40bf599e0416c16c125c3cec10ee5ddc7d1bb8b0c60fa5c4de249ad34dc1b1" +checksum = "68204f2abc0627a90bdf06e605f5c470aa26fdcb2081ea553a04bdad756693f5" dependencies = [ "cc", "tree-sitter-language", diff --git a/mitmproxy-contentviews/Cargo.toml b/mitmproxy-contentviews/Cargo.toml index 11ce7de8..d8e63648 100644 --- a/mitmproxy-contentviews/Cargo.toml +++ b/mitmproxy-contentviews/Cargo.toml @@ -12,7 +12,7 @@ publish.workspace = true workspace = true [dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } log = "0.4.27" data-encoding = "2.8.0" pretty-hex = "0.4.1" @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.9" rmp-serde = "1.1" protobuf = "3.7.2" -regex = "1.10.3" +regex = "1.11.2" flate2 = "1.1" protobuf-parse = "3.7" diff --git a/mitmproxy-highlight/Cargo.toml b/mitmproxy-highlight/Cargo.toml index 68c99471..e5831f8d 100644 --- a/mitmproxy-highlight/Cargo.toml +++ b/mitmproxy-highlight/Cargo.toml @@ -12,11 +12,11 @@ publish.workspace = true workspace = true [dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } tree-sitter = "0.25.8" tree-sitter-css = "0.23.2" tree-sitter-highlight = "0.25.8" -tree-sitter-javascript = "0.23.1" +tree-sitter-javascript = "0.25.0" tree-sitter-xml = "0.7.0" tree-sitter-yaml = "0.7.1" diff --git a/mitmproxy-linux/Cargo.toml b/mitmproxy-linux/Cargo.toml index febfeab7..f75dba78 100644 --- a/mitmproxy-linux/Cargo.toml +++ b/mitmproxy-linux/Cargo.toml @@ -22,16 +22,16 @@ tun = { workspace = true, features = ["async"] } aya = { workspace = true } aya-log = { workspace = true } tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util", "signal"] } -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } log = "0.4.27" env_logger = "0.11.5" prost = "0.14.1" internet-packet = { version = "0.2.0", features = ["checksums"] } -libc = "0.2.174" +libc = "0.2.175" const-sha1 = "0.3.0" [target.'cfg(target_os = "linux")'.build-dependencies] -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } aya-build = "0.1.2" mitmproxy-linux-ebpf = { path = "../mitmproxy-linux-ebpf" } diff --git a/mitmproxy-macos/certificate-truster/Cargo.toml b/mitmproxy-macos/certificate-truster/Cargo.toml index 6325a7dc..5700e9f2 100644 --- a/mitmproxy-macos/certificate-truster/Cargo.toml +++ b/mitmproxy-macos/certificate-truster/Cargo.toml @@ -9,4 +9,4 @@ rust-version.workspace = true publish.workspace = true [target.'cfg(target_os = "macos")'.dependencies] -security-framework = "3.2.0" +security-framework = "3.3.0" diff --git a/mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift b/mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift index 283ea574..c0dfd123 100644 --- a/mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift +++ b/mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift @@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP } /// Packet with associated tunnel info (Windows pipe to mitmproxy) -struct MitmproxyIpc_PacketWithMeta: @unchecked Sendable { +struct MitmproxyIpc_PacketWithMeta: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -113,7 +113,7 @@ struct MitmproxyIpc_FromProxy: Sendable { /// Packet (macOS UDP Stream) /// ⚠️ Bump network extension version on changes, https://github.com/mitmproxy/mitmproxy_rs/pull/227. -struct MitmproxyIpc_Packet: @unchecked Sendable { +struct MitmproxyIpc_Packet: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -239,7 +239,7 @@ struct MitmproxyIpc_UdpFlow: Sendable { fileprivate var _tunnelInfo: MitmproxyIpc_TunnelInfo? = nil } -struct MitmproxyIpc_UdpPacket: @unchecked Sendable { +struct MitmproxyIpc_UdpPacket: Sendable { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. @@ -282,10 +282,7 @@ fileprivate let _protobuf_package = "mitmproxy_ipc" extension MitmproxyIpc_PacketWithMeta: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".PacketWithMeta" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "data"), - 2: .standard(proto: "tunnel_info"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}data\0\u{3}tunnel_info\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -324,10 +321,7 @@ extension MitmproxyIpc_PacketWithMeta: SwiftProtobuf.Message, SwiftProtobuf._Mes extension MitmproxyIpc_TunnelInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".TunnelInfo" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "pid"), - 2: .standard(proto: "process_name"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}pid\0\u{3}process_name\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -366,10 +360,7 @@ extension MitmproxyIpc_TunnelInfo: SwiftProtobuf.Message, SwiftProtobuf._Message extension MitmproxyIpc_FromProxy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".FromProxy" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "packet"), - 2: .standard(proto: "intercept_conf"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}packet\0\u{3}intercept_conf\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -436,9 +427,7 @@ extension MitmproxyIpc_FromProxy: SwiftProtobuf.Message, SwiftProtobuf._MessageI extension MitmproxyIpc_Packet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".Packet" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "data"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}data\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -468,9 +457,7 @@ extension MitmproxyIpc_Packet: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl extension MitmproxyIpc_InterceptConf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".InterceptConf" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "actions"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}actions\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -500,10 +487,7 @@ extension MitmproxyIpc_InterceptConf: SwiftProtobuf.Message, SwiftProtobuf._Mess extension MitmproxyIpc_NewFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".NewFlow" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "tcp"), - 2: .same(proto: "udp"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}tcp\0\u{1}udp\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -570,10 +554,7 @@ extension MitmproxyIpc_NewFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImp extension MitmproxyIpc_TcpFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".TcpFlow" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .standard(proto: "remote_address"), - 2: .standard(proto: "tunnel_info"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}remote_address\0\u{3}tunnel_info\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -612,10 +593,7 @@ extension MitmproxyIpc_TcpFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImp extension MitmproxyIpc_UdpFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".UdpFlow" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .standard(proto: "local_address"), - 3: .standard(proto: "tunnel_info"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}local_address\0\u{4}\u{2}tunnel_info\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -654,10 +632,7 @@ extension MitmproxyIpc_UdpFlow: SwiftProtobuf.Message, SwiftProtobuf._MessageImp extension MitmproxyIpc_UdpPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".UdpPacket" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "data"), - 2: .standard(proto: "remote_address"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}data\0\u{3}remote_address\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { @@ -696,10 +671,7 @@ extension MitmproxyIpc_UdpPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageI extension MitmproxyIpc_Address: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".Address" - static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "host"), - 2: .same(proto: "port"), - ] + static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}host\0\u{1}port\0") mutating func decodeMessage(decoder: inout D) throws { while let fieldNumber = try decoder.nextFieldNumber() { diff --git a/mitmproxy-rs/Cargo.toml b/mitmproxy-rs/Cargo.toml index 5f1fe903..6382a6bd 100644 --- a/mitmproxy-rs/Cargo.toml +++ b/mitmproxy-rs/Cargo.toml @@ -19,7 +19,7 @@ crate-type = ["lib", "cdylib"] mitmproxy = { path = "../" } mitmproxy-highlight = { path = "../mitmproxy-highlight" } mitmproxy-contentviews = { path = "../mitmproxy-contentviews" } -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } data-encoding = "2.8.0" log = "0.4.27" pyo3 = { version = "0.25", features = ["abi3", "abi3-py312", "anyhow"] } diff --git a/mitmproxy-windows/redirector/Cargo.toml b/mitmproxy-windows/redirector/Cargo.toml index c84940d2..349d6a7d 100644 --- a/mitmproxy-windows/redirector/Cargo.toml +++ b/mitmproxy-windows/redirector/Cargo.toml @@ -16,7 +16,7 @@ workspace = true [target.'cfg(windows)'.dependencies] mitmproxy = { path = "../../" } tokio = { version = "1.47", features = ["macros", "net", "rt-multi-thread", "sync", "io-util"] } -anyhow = { version = "1.0.97", features = ["backtrace"] } +anyhow = { version = "1.0.99", features = ["backtrace"] } windivert = "0.6.0" lru_time_cache = "0.11.11" log = "0.4.27" diff --git a/wireguard-test-client/Cargo.toml b/wireguard-test-client/Cargo.toml index 896f31dc..04344595 100644 --- a/wireguard-test-client/Cargo.toml +++ b/wireguard-test-client/Cargo.toml @@ -13,7 +13,7 @@ publish.workspace = true workspace = true [dependencies] -anyhow = "1.0.97" +anyhow = "1.0.99" data-encoding = "2.8.0" boringtun = "0.6" hex = "0.4"