extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-07-10 11:37:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,105 Commits 4 Branches 53 Tags
b0799f87527016eab92864562c30c330274f368c
Commit Graph

1105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Kuhl
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
Brian May
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
Ed Velez
ae5dbd3b4d Add psutil as dependency in setup.py 2020-10-07 15:00:45 -05:00
Brian May
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
Brian May
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
Brian May
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
dependabot-preview[bot]
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
Brian May
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
dependabot-preview[bot]
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
Brian May
dcce0fa3df Merge pull request #520 from skuhl/master 
Fix #494 sshuttle caught in infinite select() loop.
 2020-09-09 08:37:27 +10:00
Brian May
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
Scott Kuhl
7573011a08 remove unneeded blank line 2020-09-07 15:58:59 -04:00
Scott Kuhl
72ae202df3 Remove extra whitespace, wrap long lines 2020-09-07 15:56:59 -04:00
Scott Kuhl
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
dependabot-preview[bot]
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
Brian May
19f653df36 Merge pull request #513 from drjbarker/python2-compat 
Fix python2 server compatibility
 2020-08-30 09:48:29 +10:00
Joseph Barker
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
Brian May
d9e5ccc19c Merge pull request #512 from xoro/master 
Fixed typo.
 2020-08-28 16:04:49 +10:00
Joseph Barker
f23510a4fc Fix Codacy check redefined-argument-from-local 2020-08-28 10:37:20 +09:00
Joseph Barker
459e573019 Fix flake8 line too long 2020-08-28 10:29:12 +09:00
Joseph Barker
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 (fixing #503) also fixes python2 compatibility.
 2020-08-28 10:04:12 +09:00
Timo Pallach
630f8c2357 Fixed typo. 2020-08-27 20:59:37 +02:00
Brian May
e8f3b53c7d Merge pull request #511 from Rylan12/license-update 
Change license text to LGPL-2.1
 2020-08-27 08:03:26 +10:00
Rylan Polster
8ee230bca7 Change license text to LGPL-2.1 2020-08-26 12:25:36 -04:00
Brian May
abb48f1996 Update changes file v1.0.4 2020-08-24 08:00:36 +10:00
Brian May
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
dependabot-preview[bot]
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
Brian May
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
Brian May
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
dependabot-preview[bot]
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
Dan Streetman
98d052d19e allow Mux() flush/fill to work with python < 3.5 
Fixes: #503
 2020-08-15 15:12:51 -04:00
Brian May
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
Brian May
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
Brian May
33d09ffcaf Merge pull request #501 from lnaundorf/patch-1 
Add missing package in OpenWRT documentation
 2020-08-12 07:56:10 +10:00
Brian May
45f8cce2f8 Merge pull request #502 from joshuarli/ref/require-remote 
fix: require -r/--remote
 2020-08-12 07:36:37 +10:00
Joshua Li
d4001c11f9 fix: workaround 2020-08-10 15:44:08 -07:00
Joshua Li
450ad79b18 Revert "fix: require -r/--remote" 
This reverts commit 5debf1f11a.
 2020-08-10 15:31:20 -07:00
Joshua Li
5debf1f11a fix: require -r/--remote 2020-08-10 15:12:24 -07:00
Leif Naundorf
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
Akimasa Shimobayashi
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
Brian May
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
dependabot-preview[bot]
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
Brian May
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
dependabot-preview[bot]
19b677892e Bump pytest from 5.4.3 to 6.0.0 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.3 to 6.0.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/5.4.3...6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-29 08:13:07 +00:00
Brian May
319c122861 Merge pull request #495 from AsciiWolf/patch-1 
README: add Ubuntu
 2020-07-25 08:55:57 +10:00
AsciiWolf
f4bd290919 README: add Ubuntu 2020-07-24 17:38:16 +02:00
Brian May
f353701f24 Merge pull request #490 from erikselin/42-is-not-the-answer 
Douglas Adams and Deep Thought was wrong, 42 is not the answer
 2020-07-17 11:09:04 +10:00
Erik Selin
3037a91e51 Increase IP4 ttl to 63 hops instead of 42 2020-07-16 20:51:27 -04:00