Adds support for tunneling specific port ranges (#144)
* Adds support for tunneling specific port ranges
This set of changes implements the ability of specifying a port or port
range for an IP or subnet to only tunnel those ports for that subnet.
Also supports excluding a port or port range for a given IP or subnet.
When, for a given subnet, there are intercepting ranges being added and
excluded, the most specific, i.e., smaller range, takes precedence. In
case of a tie the exclusion wins.
For different subnets, the most specific, i.e., largest swidth, takes
precedence independent of any eventual port ranges.
Examples:
Tunnels all traffic to the 188.0.0.0/8 subnet except those to port 443.
```
sshuttle -r <server> 188.0.0.0/8 -x 188.0.0.0/8:443
```
Only tunnels traffic to port 80 of the 188.0.0.0/8 subnet.
```
sshuttle -r <server> 188.0.0.0/8:80
```
Tunnels traffic to the 188.0.0.0/8 subnet and the port range that goes
from 80 to 89.
```
sshuttle -r <server> 188.0.0.0/8:80-89 -x 188.0.0.0/8:80-90
```
* Allow subnets to be specified with domain names
Simplifies the implementation of address parsing by using
socket.getaddrinfo(), which can handle domain resolution, IPv4 and IPv6
addresses. This was proposed and mostly implemented by @DavidBuchanan314
in #146.
Signed-off-by: David Buchanan <DavidBuchanan314@users.noreply.github.com>
Signed-off-by: João Vieira <vieira@yubo.be>
* Also use getaddrinfo for parsing listen addr:port
* Fixes tests for tunneling a port range
* Updates documentation to include port/port range
Adds some examples with subnet:port and subnet:port-port.
Also clarifies the versions of Python supported on the server while
maintaining the recommendation for Python 2.7, 3.5 or later.
Mentions support for pfSense.
* In Py2 only named arguments may follow *expression
Fixes issue in Python 2.7 where *expression may only be followed by
named arguments.
* Use right regex to extract ip4/6, mask and ports
* Tests for parse_subnetport
2017-05-07 05:18:13 +02:00
|
|
|
import socket
|
|
|
|
import pytest
|
|
|
|
import sshuttle.options
|
|
|
|
from argparse import ArgumentTypeError as Fatal
|
|
|
|
|
|
|
|
_ip4_reprs = {
|
|
|
|
'0.0.0.0': '0.0.0.0',
|
|
|
|
'255.255.255.255': '255.255.255.255',
|
|
|
|
'10.0': '10.0.0.0',
|
|
|
|
'184.172.10.74': '184.172.10.74',
|
|
|
|
'3098282570': '184.172.10.74',
|
|
|
|
'0xb8.0xac.0x0a.0x4a': '184.172.10.74',
|
|
|
|
'0270.0254.0012.0112': '184.172.10.74',
|
|
|
|
'localhost': '127.0.0.1'
|
|
|
|
}
|
|
|
|
|
|
|
|
_ip4_swidths = (1, 8, 22, 27, 32)
|
|
|
|
|
|
|
|
_ip6_reprs = {
|
|
|
|
'::': '::',
|
|
|
|
'::1': '::1',
|
|
|
|
'fc00::': 'fc00::',
|
|
|
|
'2a01:7e00:e000:188::1': '2a01:7e00:e000:188::1'
|
|
|
|
}
|
|
|
|
|
|
|
|
_ip6_swidths = (48, 64, 96, 115, 128)
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip4():
|
|
|
|
for ip_repr, ip in _ip4_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport(ip_repr) \
|
|
|
|
== (socket.AF_INET, ip, 32, 0, 0)
|
|
|
|
with pytest.raises(Fatal) as excinfo:
|
|
|
|
sshuttle.options.parse_subnetport('10.256.0.0')
|
|
|
|
assert str(excinfo.value) == 'Unable to resolve address: 10.256.0.0'
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip4_with_mask():
|
|
|
|
for ip_repr, ip in _ip4_reprs.items():
|
|
|
|
for swidth in _ip4_swidths:
|
|
|
|
assert sshuttle.options.parse_subnetport(
|
|
|
|
'/'.join((ip_repr, str(swidth)))
|
|
|
|
) == (socket.AF_INET, ip, swidth, 0, 0)
|
|
|
|
assert sshuttle.options.parse_subnetport('0/0') \
|
|
|
|
== (socket.AF_INET, '0.0.0.0', 0, 0, 0)
|
|
|
|
with pytest.raises(Fatal) as excinfo:
|
|
|
|
sshuttle.options.parse_subnetport('10.0.0.0/33')
|
|
|
|
assert str(excinfo.value) == 'width 33 is not between 0 and 32'
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip4_with_port():
|
|
|
|
for ip_repr, ip in _ip4_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport(':'.join((ip_repr, '80'))) \
|
|
|
|
== (socket.AF_INET, ip, 32, 80, 80)
|
2017-11-11 02:30:58 +01:00
|
|
|
assert sshuttle.options.parse_subnetport(':'.join((ip_repr, '80-90')))\
|
Adds support for tunneling specific port ranges (#144)
* Adds support for tunneling specific port ranges
This set of changes implements the ability of specifying a port or port
range for an IP or subnet to only tunnel those ports for that subnet.
Also supports excluding a port or port range for a given IP or subnet.
When, for a given subnet, there are intercepting ranges being added and
excluded, the most specific, i.e., smaller range, takes precedence. In
case of a tie the exclusion wins.
For different subnets, the most specific, i.e., largest swidth, takes
precedence independent of any eventual port ranges.
Examples:
Tunnels all traffic to the 188.0.0.0/8 subnet except those to port 443.
```
sshuttle -r <server> 188.0.0.0/8 -x 188.0.0.0/8:443
```
Only tunnels traffic to port 80 of the 188.0.0.0/8 subnet.
```
sshuttle -r <server> 188.0.0.0/8:80
```
Tunnels traffic to the 188.0.0.0/8 subnet and the port range that goes
from 80 to 89.
```
sshuttle -r <server> 188.0.0.0/8:80-89 -x 188.0.0.0/8:80-90
```
* Allow subnets to be specified with domain names
Simplifies the implementation of address parsing by using
socket.getaddrinfo(), which can handle domain resolution, IPv4 and IPv6
addresses. This was proposed and mostly implemented by @DavidBuchanan314
in #146.
Signed-off-by: David Buchanan <DavidBuchanan314@users.noreply.github.com>
Signed-off-by: João Vieira <vieira@yubo.be>
* Also use getaddrinfo for parsing listen addr:port
* Fixes tests for tunneling a port range
* Updates documentation to include port/port range
Adds some examples with subnet:port and subnet:port-port.
Also clarifies the versions of Python supported on the server while
maintaining the recommendation for Python 2.7, 3.5 or later.
Mentions support for pfSense.
* In Py2 only named arguments may follow *expression
Fixes issue in Python 2.7 where *expression may only be followed by
named arguments.
* Use right regex to extract ip4/6, mask and ports
* Tests for parse_subnetport
2017-05-07 05:18:13 +02:00
|
|
|
== (socket.AF_INET, ip, 32, 80, 90)
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip4_with_mask_and_port():
|
|
|
|
for ip_repr, ip in _ip4_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport(ip_repr + '/32:80') \
|
|
|
|
== (socket.AF_INET, ip, 32, 80, 80)
|
|
|
|
assert sshuttle.options.parse_subnetport(ip_repr + '/16:80-90') \
|
|
|
|
== (socket.AF_INET, ip, 16, 80, 90)
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip6():
|
|
|
|
for ip_repr, ip in _ip6_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport(ip_repr) \
|
|
|
|
== (socket.AF_INET6, ip, 128, 0, 0)
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip6_with_mask():
|
|
|
|
for ip_repr, ip in _ip6_reprs.items():
|
|
|
|
for swidth in _ip4_swidths + _ip6_swidths:
|
|
|
|
assert sshuttle.options.parse_subnetport(
|
|
|
|
'/'.join((ip_repr, str(swidth)))
|
|
|
|
) == (socket.AF_INET6, ip, swidth, 0, 0)
|
|
|
|
assert sshuttle.options.parse_subnetport('::/0') \
|
|
|
|
== (socket.AF_INET6, '::', 0, 0, 0)
|
|
|
|
with pytest.raises(Fatal) as excinfo:
|
|
|
|
sshuttle.options.parse_subnetport('fc00::/129')
|
|
|
|
assert str(excinfo.value) == 'width 129 is not between 0 and 128'
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip6_with_port():
|
|
|
|
for ip_repr, ip in _ip6_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport('[' + ip_repr + ']:80') \
|
|
|
|
== (socket.AF_INET6, ip, 128, 80, 80)
|
|
|
|
assert sshuttle.options.parse_subnetport('[' + ip_repr + ']:80-90') \
|
|
|
|
== (socket.AF_INET6, ip, 128, 80, 90)
|
|
|
|
|
|
|
|
|
|
|
|
def test_parse_subnetport_ip6_with_mask_and_port():
|
|
|
|
for ip_repr, ip in _ip6_reprs.items():
|
|
|
|
assert sshuttle.options.parse_subnetport('[' + ip_repr + '/128]:80') \
|
|
|
|
== (socket.AF_INET6, ip, 128, 80, 80)
|
2017-11-11 02:30:58 +01:00
|
|
|
assert sshuttle.options.parse_subnetport('[' + ip_repr + '/16]:80-90')\
|
Adds support for tunneling specific port ranges (#144)
* Adds support for tunneling specific port ranges
This set of changes implements the ability of specifying a port or port
range for an IP or subnet to only tunnel those ports for that subnet.
Also supports excluding a port or port range for a given IP or subnet.
When, for a given subnet, there are intercepting ranges being added and
excluded, the most specific, i.e., smaller range, takes precedence. In
case of a tie the exclusion wins.
For different subnets, the most specific, i.e., largest swidth, takes
precedence independent of any eventual port ranges.
Examples:
Tunnels all traffic to the 188.0.0.0/8 subnet except those to port 443.
```
sshuttle -r <server> 188.0.0.0/8 -x 188.0.0.0/8:443
```
Only tunnels traffic to port 80 of the 188.0.0.0/8 subnet.
```
sshuttle -r <server> 188.0.0.0/8:80
```
Tunnels traffic to the 188.0.0.0/8 subnet and the port range that goes
from 80 to 89.
```
sshuttle -r <server> 188.0.0.0/8:80-89 -x 188.0.0.0/8:80-90
```
* Allow subnets to be specified with domain names
Simplifies the implementation of address parsing by using
socket.getaddrinfo(), which can handle domain resolution, IPv4 and IPv6
addresses. This was proposed and mostly implemented by @DavidBuchanan314
in #146.
Signed-off-by: David Buchanan <DavidBuchanan314@users.noreply.github.com>
Signed-off-by: João Vieira <vieira@yubo.be>
* Also use getaddrinfo for parsing listen addr:port
* Fixes tests for tunneling a port range
* Updates documentation to include port/port range
Adds some examples with subnet:port and subnet:port-port.
Also clarifies the versions of Python supported on the server while
maintaining the recommendation for Python 2.7, 3.5 or later.
Mentions support for pfSense.
* In Py2 only named arguments may follow *expression
Fixes issue in Python 2.7 where *expression may only be followed by
named arguments.
* Use right regex to extract ip4/6, mask and ports
* Tests for parse_subnetport
2017-05-07 05:18:13 +02:00
|
|
|
== (socket.AF_INET6, ip, 16, 80, 90)
|