extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-08-17 20:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
833 Commits 4 Branches 54 Tags
a3cbf0885f8d5fdb2e611ec3383be206fc23464b
Commit Graph

833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian May
a3cbf0885f Merge pull request #646 from skuhl/nat-ipv6 
Add IPv6 support to nat (iptables) method.
 2021-06-01 07:40:08 +10:00
Scott Kuhl
3f201095ea Merge branch 'master' into nat-ipv6 2021-05-30 21:09:32 -04:00
Brian May
58c264ff1c Merge pull request #648 from skuhl/sudoers-add-sanitize 
Fix #637: sudoers-add should always write to /etc/sudoers.d/...
 2021-05-31 07:53:19 +10:00
Brian May
1820264dd5 Merge pull request #647 from skuhl/man-page-updates 
Update documentation
 2021-05-31 07:48:56 +10:00
Brian May
be847f5d81 Merge pull request #645 from skuhl/hostwatch-remove-dead-code 
Remove dead code in hostwatch.py
 2021-05-31 07:44:21 +10:00
Brian May
d2836a082f Merge pull request #644 from skuhl/fix-tmark 
Fix --tmark option
 2021-05-31 07:42:30 +10:00
Scott Kuhl
8c5ffc9e72 Fix #637: File written by sudoers-add should always begin with /etc/sudoers.d/ 
The problem and patch was originally submitted aayla-secura. I made a
minor improvement to the error message.
 2021-05-30 17:03:03 -04:00
Scott Kuhl
843a729d64 flake8: fix long line 2021-05-29 21:58:56 -04:00
Scott Kuhl
851b26cb13 Update documentation 
The output in the examples provided in the man page hadn't been
updated as sshuttle changed its output over time.

The example of testing sshuttle without a remote host was removed. It
was the first example previously and it is something that is unlikely
users will wish to do.

Also:
 - Update some --help messages.
 - Manpage: Fix a typo.
 - Manpage: Mention that host specified with -r can be an ssh alias.
 - Eliminate variable only used once.
 2021-05-29 21:54:47 -04:00
Scott Kuhl
c026a92cad Add IPv6 support to nat (iptables) method. 
Adding IPv6 support to the nat method is straightforward after the
previous work to add IPv6 support for nft.
 2021-05-29 20:55:48 -04:00
Scott Kuhl
1dbec7252d Remove dead code in hostwatch.py 
11 years ago in commit 384d0e7c1d,
hostwatch was updated to use netstat to find hosts, and
_check_smb()/_check_nmb() were edited to immediately return. This
patch removes all of the unused code in these two functions.
 2021-05-29 20:48:33 -04:00
Scott Kuhl
a7df12cd68 Fix --tmark option 
Even when --tmark was used, the iptables code always used '1' for the
mark. This patch corrects the problem.

Previously, it wasn't clear if the tmark should be supplied in
hexadecimal or as an integer. This makes it use hexadecimal, checks
that the input is hexadecimal, and updates the associated
documentation.

This patch also makes --ttl information get passed to the firewall in
a way that matches how other information gets passed. The ttl and
tmark information are passed next to each other in many places and
this patch also makes the order consistent.
 2021-05-27 21:48:43 -04:00
Brian May
bc54ffe398 Merge pull request #643 from skuhl/fix-to-ns-with-ns-hosts 
Fix: Allow --to-ns and --ns-host without --dns.
 2021-05-22 13:06:48 +10:00
Scott Kuhl
31f059883c Fix: Allow --to-ns and --ns-host without --dns. 
If the user specifies --to-ns (tells the remote server which DNS
server to use for lookups coming from sshuttle), then either --ns-host
or --dns need to also be used (route DNS requests through sshuttle).

A previous commit incorrectly made it so --to-ns and --ns-host
couldn't be successfully used together.

Attempts to fix #641.
 2021-05-21 17:47:38 -04:00
Brian May
f376674941 Merge pull request #634 from skuhl/systemd-dns-flush 
Flush systemd DNS cache on startup and exit.
 2021-05-18 15:40:56 +10:00
Brian May
41ca86dbf2 Merge pull request #640 from sshuttle/dependabot/pip/pytest-cov-2.12.0 
Bump pytest-cov from 2.11.1 to 2.12.0
 2021-05-18 08:17:26 +10:00
dependabot[bot]
7760d63870 Bump pytest-cov from 2.11.1 to 2.12.0 
Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 2.11.1 to 2.12.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.11.1...v2.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-17 07:36:53 +00:00
Brian May
8b69c706c2 Merge pull request #639 from sshuttle/dependabot/github_actions/actions/setup-python-2.2.2 
Bump actions/setup-python from 2 to 2.2.2
 2021-05-12 20:36:42 +10:00
Brian May
d289fb2e73 Merge pull request #638 from sshuttle/dependabot/github_actions/actions/checkout-2.3.4 
Bump actions/checkout from 2 to 2.3.4
 2021-05-12 20:36:28 +10:00
dependabot[bot]
20c38afaba Bump actions/setup-python from 2 to 2.2.2 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 2.2.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 06:13:47 +00:00
dependabot[bot]
7aeb7929c5 Bump actions/checkout from 2 to 2.3.4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 06:13:43 +00:00
Brian May
30767135fb Merge pull request #636 from sshuttle/dependabot/pip/flake8-3.9.2 
Bump flake8 from 3.9.1 to 3.9.2
 2021-05-10 20:53:51 +10:00
dependabot[bot]
df383edaf6 Bump flake8 from 3.9.1 to 3.9.2 
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.1 to 3.9.2.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.1...3.9.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 10:00:12 +00:00
Brian May
88154f4f9c Merge pull request #635 from skuhl/sudoers-warning 
Warn about adding sshuttle to sudoers.
 2021-05-09 20:25:26 +10:00
Scott Kuhl
915497f73f Warn about adding sshuttle to sudoers. 
Issue #631 suggests that we should warn about users who add sshuttle
to sudoers because it isn't obvious that when a user can run sshuttle
as root, they can run any command as root using sshuttle's -e or
--ssh-cmd parameters.

This patch adds a comment that warns about this problem to the sudoers
file. It also prints the warning to the console if the user uses an
option that writes the data directly to the file. This patch also
causes the output of the sudoers-add command to be printed to the
console so that the user can see the name of the file that was
created.

There is room for improvement: Warnings could be added to the
documentation and/or these parameters could be removed entirely.
 2021-05-07 14:13:56 -04:00
Brian May
652113818e Merge pull request #633 from sshuttle/dependabot/pip/pytest-6.2.4 
Bump pytest from 6.2.3 to 6.2.4
 2021-05-06 08:08:28 +10:00
Scott Kuhl
cdfb4b7d71 Flush systemd DNS cache on startup and exit. 
It is possible for DNS requests to go through systemd's DNS resolution
system (which includes a cache) before sshuttle has an opportunity to
intercept the requests. The DNS entries in the cache may become
outdated when sshuttle starts or exits. This patch fixes the problem
by flushing the cache when sshuttle firewall starts and exits.
 2021-05-05 12:24:58 -04:00
dependabot[bot]
45b788c908 Bump pytest from 6.2.3 to 6.2.4 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.3 to 6.2.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.3...6.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 07:58:09 +00:00
Brian May
f6176d3581 Merge pull request #630 from thesamesam/patch-1 
README.rst: fix Gentoo entry syntax
 2021-04-27 07:47:46 +10:00
Sam James
bc08198cae README.rst: fix Gentoo entry syntax 2021-04-26 16:22:42 +01:00
Brian May
613412b3cd Merge pull request #627 from sshuttle/dependabot/pip/flake8-3.9.1 
Bump flake8 from 3.9.0 to 3.9.1
 2021-04-18 10:26:40 +10:00
dependabot[bot]
4f7706db59 Bump flake8 from 3.9.0 to 3.9.1 
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.0 to 3.9.1.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.0...3.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-16 08:00:29 +00:00
Brian May
7307636d35 Merge pull request #624 from sshuttle/dependabot/add-v2-config-file 
Create Dependabot config file
 2021-04-08 11:47:33 +10:00
dependabot-preview[bot]
1f5161e48c Create Dependabot config file 2021-04-08 01:40:51 +00:00
Brian May
d505b08104 Merge pull request #623 from sshuttle/dependabot/pip/pytest-6.2.3 
Bump pytest from 6.2.2 to 6.2.3
 2021-04-06 08:37:03 +10:00
dependabot-preview[bot]
3e3608f572 Bump pytest from 6.2.2 to 6.2.3 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.2 to 6.2.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.2...6.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-04-05 06:17:47 +00:00
Brian May
51a1078371 Merge pull request #622 from necrose99/patch-1 
Update README.rst
 2021-03-26 07:52:21 +11:00
Brian May
f55983e485 Merge pull request #620 from sshuttle/dependabot/pip/pyflakes-2.3.1 
Bump pyflakes from 2.3.0 to 2.3.1
 2021-03-26 07:51:48 +11:00
Michael L
e54747bfb0 Update README.rst 
https://packages.gentoo.org/packages/net-proxy/sshuttle
 2021-03-25 14:12:32 -05:00
dependabot-preview[bot]
d8acf15c1e Bump pyflakes from 2.3.0 to 2.3.1 
Bumps [pyflakes](https://github.com/PyCQA/pyflakes) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/PyCQA/pyflakes/releases)
- [Changelog](https://github.com/PyCQA/pyflakes/blob/master/NEWS.rst)
- [Commits](https://github.com/PyCQA/pyflakes/compare/2.3.0...2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-25 06:12:41 +00:00
Brian May
bafc0a7038 Merge pull request #618 from patrislav1/bugfix-dnsproxy 
Fix DnsProxy
 2021-03-21 09:21:26 +11:00
Patrick Huesmann
4c11dd7183 options: make sure ttl is of integer type 2021-03-20 12:26:17 +01:00
Brian May
4257c8d34e Merge pull request #617 from patrislav1/bugfix-iptables-wait 
Fix firewall setup/teardown failure on xtable lock
 2021-03-20 11:27:20 +11:00
Brian May
dc657a93f4 Merge pull request #616 from sshuttle/dependabot/pip/setuptools-scm-6.0.1 
Bump setuptools-scm from 5.0.2 to 6.0.1
 2021-03-19 09:01:02 +11:00
Patrick Huesmann
5e177d81bc Fix firewall setup/teardown failure on xtable lock 2021-03-18 09:41:21 +01:00
dependabot-preview[bot]
7015d7a823 Bump setuptools-scm from 5.0.2 to 6.0.1 
Bumps [setuptools-scm](https://github.com/pypa/setuptools_scm) from 5.0.2 to 6.0.1.
- [Release notes](https://github.com/pypa/setuptools_scm/releases)
- [Changelog](https://github.com/pypa/setuptools_scm/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pypa/setuptools_scm/compare/v5.0.2...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-03-18 06:10:30 +00:00
Brian May
014a268b99 Merge pull request #614 from sshuttle/upgrade_lint 
Bump pyflakes from 2.2.0 to 2.3.0, flake8 from 3.8.4 to 3.9.0
 2021-03-16 08:30:15 +11:00
Brian May
97076a9390 Adjust branches, remove temporary branches 2021-03-16 08:29:14 +11:00
Brian May
dd661e9728 Bump pyflakes from 2.2.0 to 2.3.0, flake8 from 3.8.4 to 3.9.0 
Bumps [pyflakes](https://github.com/PyCQA/pyflakes) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/PyCQA/pyflakes/releases)
- [Changelog](https://github.com/PyCQA/pyflakes/blob/master/NEWS.rst)
- [Commits](https://github.com/PyCQA/pyflakes/compare/2.2.0...2.3.0)

Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.4 to 3.9.0.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.4...3.9.0)
 2021-03-16 08:21:03 +11:00
Scott Kuhl
d6d11b24c8 Make exit code indicate a problem when pidfile is not writable. 
Here, we try to open the pidfile for writing prior to forking so that
the exit code can properly indicate to the user that there was a
problem. No error messages are printed to the console in this case
because when --daemon implies --syslog. So, the syslog will contain
the message indicating that the pidfile wasn't writeable.

Fixes bug #598.
 2021-03-10 07:54:55 +11:00