Skip to content
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

Jump to bottom

On SOCKS5 proxy: set hostname, not always IP #1072

Merged
merged 3 commits into from
Jun 16, 2024
Merged

On SOCKS5 proxy: set hostname, not always IP #1072

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8a0ba8
On SOCKS5 proxy:
Jan 27, 2023
3dabbf2
Merge remote-tracking branch 'upstream/develop' into SOCKS5_allow_hos…
Rob-Hague Jun 16, 2024
47c169a
refactor
Rob-Hague May 3, 2024
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
36 changes: 21 additions & 15 deletions src/Renci.SshNet/Connection/Socks5Connector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Diagnostics;
using System.Net;
using System.Net.Sockets;
using System.Text;

using Renci.SshNet.Abstractions;
using Renci.SshNet.Common;
Expand Down Expand Up @@ -244,25 +246,29 @@ private static byte[] CreateSocks5ConnectionRequest(string hostname, ushort port

private static byte[] GetSocks5DestinationAddress(string hostname, out byte addressType)
{
var ip = Dns.GetHostAddresses(hostname)[0];
if (IPAddress.TryParse(hostname, out var ipAddress))
{
Debug.Assert(ipAddress.AddressFamily is AddressFamily.InterNetwork or AddressFamily.InterNetworkV6);

addressType = ipAddress.AddressFamily == AddressFamily.InterNetwork
? (byte)0x01 // IPv4
: (byte)0x04; // IPv6

return ipAddress.GetAddressBytes();
}

addressType = 0x03; // Domain name

byte[] address;
var byteCount = Encoding.UTF8.GetByteCount(hostname);

#pragma warning disable IDE0010 // Add missing cases
switch (ip.AddressFamily)
if (byteCount > byte.MaxValue)
{
case AddressFamily.InterNetwork:
addressType = 0x01; // IPv4
address = ip.GetAddressBytes();
break;
case AddressFamily.InterNetworkV6:
addressType = 0x04; // IPv6
address = ip.GetAddressBytes();
break;
default:
throw new ProxyException(string.Format("SOCKS5: IP address '{0}' is not supported.", ip));
throw new ProxyException(string.Format("SOCKS5: SOCKS 5 cannot support host names longer than 255 chars ('{0}').", hostname));
}
#pragma warning restore IDE0010 // Add missing cases

var address = new byte[1 + byteCount];
address[0] = (byte)byteCount;
_ = Encoding.UTF8.GetBytes(hostname, 0, hostname.Length, address, 1);

return address;
}
Expand Down