extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2024-11-26 01:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
691 Commits 9 Branches 50 Tags 3.6 MiB
7573011a08
Commit Graph

691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
Brian May
cdd1e2c538
Merge pull request #487 from sshuttle/brianmay-patch-2 
Fix formatting in installation.rst
 2020-07-17 07:08:39 +10:00
Brian May
eb01c0b184
Fix formatting in installation.rst 2020-07-15 08:14:51 +10:00
Brian May
c5dcc918db Add changelog entry for 1.0.3 2020-07-12 19:09:32 +10:00
Brian May
329b9cd0a0
Merge pull request #483 from chrisburr/patch-1 
Fix formatting typos in usage docs
 2020-07-05 11:00:18 +10:00
Chris Burr
5537a90338
Fix formatting typos in usage docs 2020-07-04 12:02:44 +02:00
Brian May
636e0442e5
Merge pull request #476 from sshuttle/brianmay-patch-1 
Add missing import
 2020-06-30 07:36:57 +10:00
Brian May
dc526747b1
Add missing import 
Fixes #474.
 2020-06-27 18:54:02 +10:00
Brian May
73eb3b6479
Merge pull request #471 from wilsonehusin/deprecate-py2-setuptools 
Restrict setuptools from executing on Python2
 2020-06-18 15:27:29 +10:00
Wilson E. Husin
1b50d364c6
Ask setuptools to require Python 3.5 and above 
python_requires will be evaluated by setuptools to ensure the package is compatible
with currently active Python interpreter.

Reference: https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires

Closes #470

Signed-off-by: Wilson Husin <wilsonehusin@gmail.com>
 2020-06-17 22:17:03 -07:00
Brian May
8c91958ff3 Prepare to release 1.0.2 2020-06-18 07:45:08 +10:00
Tony Kasparick
d2f751f0d3 leave use of default port to ssh command 
to prevent overwriting ports configured in ~/.ssh/config
if no port is specified, don't set the port explicitly to 22
 2020-06-17 08:04:35 +10:00
dependabot-preview[bot]
9d79bb82c5 Bump pytest-cov from 2.9.0 to 2.10.0 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.9.0 to 2.10.0.
- [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.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-15 19:14:10 +10:00
Brian May
a53f026056
Merge pull request #461 from joshuarli/doc/update-py2-removal 
doc: py2 removal clean sweep
 2020-06-11 09:55:36 +10:00
Joshua Li
ae4c7e3a7b remove outdated comment 2020-06-10 16:47:23 -07:00