cfe14f2498
fix flake8 issues in updated tests
2020-10-17 15:40:28 -04:00
cb53d8a150
Make tests for parse_subnetport() expect lists & update expected error messages in tests
2020-10-17 15:36:16 -04:00
64d5c77a71
fix flake8 issues, clarify comment
2020-10-17 14:43:09 -04:00
036c49e412
When subnets and excludes are specified with hostnames, use all IPs.
...
The list of subnets to route over VPN and the list of subnets to
exclude are parsed in option.py parse_subnetport(). Hostnames or IP
addresses are supported. If a hostname was provided, only the first IP
address was considered. This could result in some traffic not
traversing the VPN that the user might expect should traverse it from
the arguments passed to sshuttle.
This patch makes the function handle all of the IPs if a hostname is
provided. If a user provides a hostname with a CIDR mask, problems can
occur and we warn the user about the issue.
If the user includes a hostname with both an IPv4 and an IPv6 address,
and the underlying method doesn't support IPv6, then this patch will
cause sshuttle to fail. I plan to provide a future patch where failure
won't occur if the only place IPv6 addresses appear is in the exclude
list. In that case it should be safe to ignore the IPv6 address.
This patch also changes parse_ipport() which is used by the --to-ns
option. If the user provides a hostname here, we just use the first IP
from the hostname and warn the user that only one is being used.
2020-10-16 18:29:16 -04:00
c1cc3911df
Merge pull request #537 from skuhl/add-version
...
Include sshuttle version in verbose output.
2020-10-10 11:18:13 +11:00
84e43d3113
Include sshuttle version in verbose output.
...
Some bug reports include verbose sshuttle output but lack the version
that is being used. Including the sshuttle version in the output may
make it easier to handle future bug reports.
2020-10-08 22:39:42 -04:00
afad317f2c
Merge pull request #536 from ed-velez/add_psutil_to_setup
...
Add psutil as dependency in setup.py
2020-10-08 08:09:21 +11:00
ae5dbd3b4d
Add psutil as dependency in setup.py
2020-10-07 15:00:45 -05:00
2995a624f1
Merge pull request #534 from sshuttle/dependabot/pip/flake8-3.8.4
...
Bump flake8 from 3.8.3 to 3.8.4
2020-10-06 07:56:56 +11:00
909402a353
Merge pull request #533 from sshuttle/dependabot/pip/pytest-6.1.1
...
Bump pytest from 6.1.0 to 6.1.1
2020-10-06 07:56:36 +11:00
16148ac70f
Bump flake8 from 3.8.3 to 3.8.4
...
Bumps [flake8](https://gitlab.com/pycqa/flake8 ) from 3.8.3 to 3.8.4.
- [Release notes](https://gitlab.com/pycqa/flake8/tags )
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.3...3.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-05 06:37:36 +00:00
e50bbc2c92
Bump pytest from 6.1.0 to 6.1.1
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/6.1.0...6.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-05 06:37:12 +00:00
9eaed73098
Merge pull request #529 from sshuttle/dependabot/pip/pytest-6.1.0
...
Bump pytest from 6.0.2 to 6.1.0
2020-09-29 07:40:40 +10:00
4b07dab9dc
Bump pytest from 6.0.2 to 6.1.0
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/6.0.2...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-28 06:43:22 +00:00
299854d2b5
Merge pull request #522 from sshuttle/dependabot/pip/pytest-6.0.2
...
Bump pytest from 6.0.1 to 6.0.2
2020-09-15 07:33:28 +10:00
8b71c150c6
Bump pytest from 6.0.1 to 6.0.2
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/6.0.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-14 06:39:11 +00:00
dcce0fa3df
Merge pull request #520 from skuhl/master
...
Fix #494 sshuttle caught in infinite select() loop.
2020-09-09 08:37:27 +10:00
3ee74ddfa6
Merge pull request #519 from sshuttle/dependabot/pip/attrs-20.2.0
...
Bump attrs from 20.1.0 to 20.2.0
2020-09-08 07:33:26 +10:00
7573011a08
remove unneeded blank line
2020-09-07 15:58:59 -04:00
72ae202df3
Remove extra whitespace, wrap long lines
2020-09-07 15:56:59 -04:00
5d6b14673f
Fix #494 sshuttle caught in infinite select() loop.
...
Improve detection of when the ssh process exits in both daemon and
foreground modes. Previously, sshuttle could infinite loop with 100%
cpu usage if the ssh process died. On machines that use suspend, the
ssh connection might not resume after wakeup. Now, this situation is
detected and sshuttle exits. The fix involves changing the return
value we check for when we call poll() and using a psutil function to
detect when the process exits if we are running sshuttle as a daemon.
2020-09-07 15:46:33 -04:00
aa97742405
Bump attrs from 20.1.0 to 20.2.0
...
Bumps [attrs](https://github.com/python-attrs/attrs ) from 20.1.0 to 20.2.0.
- [Release notes](https://github.com/python-attrs/attrs/releases )
- [Changelog](https://github.com/python-attrs/attrs/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/python-attrs/attrs/compare/20.1.0...20.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-09-07 06:46:51 +00:00
19f653df36
Merge pull request #513 from drjbarker/python2-compat
...
Fix python2 server compatibility
2020-08-30 09:48:29 +10:00
ec5fb68350
Fix python2 client compatibility
...
Python2 ignores the byte string qualification (b’foo’) but falls over for the combination rb for this regexp. Switching the qualification to br appears to fix this and works in both python2 and python3.
2020-08-29 21:32:18 +09:00
d9e5ccc19c
Merge pull request #512 from xoro/master
...
Fixed typo.
2020-08-28 16:04:49 +10:00
f23510a4fc
Fix Codacy check redefined-argument-from-local
2020-08-28 10:37:20 +09:00
459e573019
Fix flake8 line too long
2020-08-28 10:29:12 +09:00
c12d2ba5c6
Fix python2 server compatibility
...
Fixes #469 . We replace python3 exclusive code with a check for python3 and a compatibility fix. Note that the switch from os.set_nonblocking to fcntl.fcntl in 98d052d#503 ) also fixes python2 compatibility.
2020-08-28 10:04:12 +09:00
630f8c2357
Fixed typo.
2020-08-27 20:59:37 +02:00
e8f3b53c7d
Merge pull request #511 from Rylan12/license-update
...
Change license text to LGPL-2.1
2020-08-27 08:03:26 +10:00
8ee230bca7
Change license text to LGPL-2.1
2020-08-26 12:25:36 -04:00
abb48f1996
Update changes file
2020-08-24 08:00:36 +10:00
1c27a6cad0
Merge pull request #510 from sshuttle/dependabot/pip/attrs-20.1.0
...
Bump attrs from 19.3.0 to 20.1.0
2020-08-21 16:42:05 +10:00
8a2d5802c1
Bump attrs from 19.3.0 to 20.1.0
...
Bumps [attrs](https://github.com/python-attrs/attrs ) from 19.3.0 to 20.1.0.
- [Release notes](https://github.com/python-attrs/attrs/releases )
- [Changelog](https://github.com/python-attrs/attrs/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/python-attrs/attrs/compare/19.3.0...20.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-21 06:37:11 +00:00
e7d4931b3d
Merge pull request #507 from ddstreet/old_py
...
allow Mux() flush/fill to work with python < 3.5
2020-08-18 07:46:59 +10:00
1e364b2c0b
Merge pull request #509 from sshuttle/dependabot/pip/pytest-cov-2.10.1
...
Bump pytest-cov from 2.10.0 to 2.10.1
2020-08-17 19:00:50 +10:00
8816dbfd23
Bump pytest-cov from 2.10.0 to 2.10.1
...
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov ) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases )
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v2.10.0...v2.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-17 08:18:23 +00:00
98d052d19e
allow Mux() flush/fill to work with python < 3.5
...
Fixes : #503
2020-08-15 15:12:51 -04:00
be4b081a0d
Merge pull request #506 from sshuttle/test_parse_hostport
...
Fix parse_hostport to always return string for host
2020-08-13 07:59:12 +10:00
9c5f1f5bbf
Fix parse_hostport to always return string for host
...
This fixes #488 and provides an alternative solution for #489 .
2020-08-13 07:53:38 +10:00
33d09ffcaf
Merge pull request #501 from lnaundorf/patch-1
...
Add missing package in OpenWRT documentation
2020-08-12 07:56:10 +10:00
45f8cce2f8
Merge pull request #502 from joshuarli/ref/require-remote
...
fix: require -r/--remote
2020-08-12 07:36:37 +10:00
d4001c11f9
fix: workaround
2020-08-10 15:44:08 -07:00
450ad79b18
Revert "fix: require -r/--remote"
...
This reverts commit 5debf1f11a
2020-08-10 15:31:20 -07:00
5debf1f11a
fix: require -r/--remote
2020-08-10 15:12:24 -07:00
79181043bc
Add missing package in OpenWRT documentation
...
The package 'iptables-mod-extra' also needs to be installed
2020-08-10 16:35:05 +02:00
c0a81353ab
Fix doc about --listen option ( #500 )
...
* Can't use this option twice, separate by comma actually.
* Broke the line because it was too long.
2020-08-05 20:28:36 +10:00
5bdf36152a
Merge pull request #498 from sshuttle/dependabot/pip/pytest-6.0.1
...
Bump pytest from 6.0.0 to 6.0.1
2020-08-01 18:07:00 +10:00
a9ee66d905
Bump pytest from 6.0.0 to 6.0.1
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/6.0.0...6.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-31 08:26:00 +00:00
094d3d9b97
Merge pull request #497 from sshuttle/dependabot/pip/pytest-6.0.0
...
Bump pytest from 5.4.3 to 6.0.0
2020-07-31 07:57:58 +10:00
