Skip to content

Fix MtProtoKit: SOCKS5 proxy IPv6 connect sent garbage address #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvsrcdst wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix MtProtoKit: SOCKS5 proxy IPv6 connect sent garbage address #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 27 additions & 5 deletions submodules/MtProtoKit/Sources/MTTcpConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,15 +1438,37 @@ - (void)connectionInterfaceDidReadPartialDataOfLength:(NSUInteger)partialLength

- (void)requestSocksConnection {
struct socks5_req req;

req.Version = 5;
req.Cmd = 1;
req.Reserved = 0;
req.AddrType = 1;


// MARK: Swiftgram
// Upstream hardcoded AddrType=1 and ignored inet_aton's return value, so IPv6 DC
// addresses got sent as ATYP=1 with garbage (uninitialized) bytes. Detect IPv4/IPv6
// properly, same as -start does for _socksIp/_mtpIp. Domain name (ATYP=3) fallback
// per SOCKS5 spec (RFC 1928 part 4), for non-IP-literal addresses,
// bounds-checked against the 256-byte Domain buffer.
struct in_addr ip4;
inet_aton(_scheme.address.ip.UTF8String, &ip4);
req.DestAddr.IPv4 = ip4;
struct in6_addr ip6;
NSString *destAddress = _scheme.address.ip;
if (inet_aton(destAddress.UTF8String, &ip4) != 0) {
req.AddrType = 1;
req.DestAddr.IPv4 = ip4;
} else if (inet_pton(AF_INET6, destAddress.UTF8String, &ip6) != 0) {
req.AddrType = 4;
req.DestAddr.IPv6 = ip6;
} else if (destAddress.length <= 255 && [destAddress getCString:req.DestAddr.Domain maxLength:sizeof(req.DestAddr.Domain) encoding:NSASCIIStringEncoding]) {
req.AddrType = 3;
req.DestAddr.DomainLen = (unsigned char)destAddress.length;
} else {
if (MTLogEnabled()) {
MTLog(@"***** %s: could not parse destination address %@", __PRETTY_FUNCTION__, destAddress);
}
[self closeAndNotifyWithError:true];
return;
}

req.DestPort = _scheme.address.port;

NSMutableData *reqData = [[NSMutableData alloc] init];
Expand Down