Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions mitmproxy-contentviews/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions mitmproxy-highlight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions mitmproxy-linux/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion mitmproxy-macos/certificate-truster/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
54 changes: 13 additions & 41 deletions mitmproxy-macos/redirector/ipc/mitmproxy_ipc.pb.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down Expand Up @@ -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<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
while let fieldNumber = try decoder.nextFieldNumber() {
Expand Down
2 changes: 1 addition & 1 deletion mitmproxy-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion mitmproxy-windows/redirector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion wireguard-test-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading