Commit Graph

458 Commits

Author SHA1 Message Date
Brian May
71d46d77bf Add sock paramater to Handler callbacks
As Handler objects can have multiple sockets, we need to know which one
was involved in the incoming event.
2015-11-24 12:19:31 +11:00
Brian May
c1083e983f Pass correct method back from firewall.
Don't pass auto back.
2015-11-24 12:08:12 +11:00
Brian May
9944b97629 Remove legacy MACOSX files.
Broken and not been maintained in some time. See #21.
2015-11-24 07:17:19 +11:00
Brian May
eaad54f68b Add FIXME comment. 2015-11-18 20:08:15 +11:00
Brian May
6ebf76a5d8 Avoid hardcoding packed address lengths. 2015-11-18 20:07:41 +11:00
Brian May
51eb7862c4 Fix tests under PyPy. 2015-11-18 20:07:03 +11:00
Brian May
75b6865a1d Tests for pf method. 2015-11-17 20:52:31 +11:00
Brian May
e3a1c56e54 Add more methods tests.
Fix bug in tproxy recv_udp() method.
2015-11-17 17:55:30 +11:00
Brian May
99050aacb3 Fix for Python3.5. 2015-11-17 13:14:28 +11:00
Brian May
021e6f57af Add more tests. 2015-11-17 13:08:12 +11:00
Brian May
9cc6d63684 Fix firewall tests. 2015-11-17 12:46:35 +11:00
Brian May
43566ebda6 Remove unused import. 2015-11-17 10:58:44 +11:00
Brian May
537899c1df Remove unused function. 2015-11-17 10:58:29 +11:00
Brian May
641a193d3d Use readline instead of next. 2015-11-17 09:39:53 +11:00
Brian May
71d17e449e Disable Python 2.6 tests
importlib is Python 2.7 only.
2015-11-17 09:33:46 +11:00
Brian May
9d443e4155 Don't use nested.
Is Python 2.x only. Not supported under Python 3.x.
2015-11-17 09:32:40 +11:00
Brian May
cf0aaa7134 Fix PYTHONPATH for tests. 2015-11-17 09:28:58 +11:00
Brian May
54de23aae3 Add firewall tests. 2015-11-17 09:19:20 +11:00
Brian May
ac723694bf Restructure code
Pull out firewall methods code into seperate files.

Fix problems starting with method=='auto'; we were making decisions
based on the method, before the method had been finalized by the
firewall.

Only very basic testing so far. What could go wrong?
2015-11-16 18:55:56 +11:00
Brian May
bcd3205db1 Fix passing latency_control to server. 2015-11-16 11:32:17 +11:00
Brian May
a651d748cd Remove unused code. 2015-11-16 09:23:24 +11:00
Brian May
fe48c7c026 Fix PEP8 issues. 2015-11-16 09:10:02 +11:00
Brian May
4bd6ec8f01 Remove broken su fallback.
Was broken by passing environment variable PYTHONPATH to process. Will
fix this if there is a use case for it.
2015-11-16 09:09:02 +11:00
Brian May
ba1cf58a6c Add Python 3.5 support. 2015-11-16 09:09:01 +11:00
Brian May
dd8e68b6dc More formatting fixes. 2015-11-15 17:17:16 +11:00
Brian May
1f2117917f Fix up formatting. 2015-11-15 17:10:04 +11:00
Brian May
e6f2395dac Fixup PEP8 issues. 2015-11-15 16:49:20 +11:00
Brian May
d4f10b232a Restructure code
* Make compatible with setuptools.
* Load modules via ssh into separate modules, not the one name space.
2015-11-15 16:45:26 +11:00
Brian May
41b8ad4c97 Merge pull request #25 from vieira/ns-hosts
Import resolvconf_nameservers, fix wrong types
2015-11-11 13:09:59 +11:00
vieira
a82224c141 Import resolvconf_nameservers, fix wrong types
Add resolvconf_nameservers to the list of functions imported from
helpers.
Fixed an instance where the method client.main was being called with
ns_hosts (string obtained from optional argument --ns-hosts) instead of
nslist (list of tuples that was already being passed to other methods).
Should fix issue #24.
2015-11-08 01:27:10 +00:00
Brian May
0fb714893a Merge pull request #23 from vieira/ns-hosts
dns: Added --ns-hosts to tunnel only some requests
2015-10-29 13:13:59 +11:00
João Vieira
28be71ef9a Removed commented out code 2015-10-27 17:53:35 +00:00
Joao Vieira
d2ee34d71c dns: Added --ns-hosts to tunnel only some requests
By default, the --dns flag configures the firewall to only intercept
queries made to the nameservers defined in resolvconf. This flag enables
the user to explicitly specify the nameservers which queries will be
redirected. This can be useful when the local nameserver forwards
queries to some domains to a nameserver on the remote site of the
tunnel.
2015-10-27 17:28:52 +00:00
Brian May
3cf5002b62 Merge pull request #19 from naclander/patch-1
Remove no-latency-control assertion
2015-09-16 13:08:23 +10:00
Nathan Aclander
f71704f54d Remove no-latency-control assertion
Remove an assertion that would fail when --no-latency-control is set.
2015-09-15 19:30:34 -07:00
Brian May
ad83059da8 Merge pull request #17 from elasticdog/master
Update ui-macos sources.list with new icon names
2015-09-08 12:00:50 +10:00
Aaron Bull Schaefer
d211fc28ee Update ui-macos sources.list with new icon names
I looks like building the app UI for OS X has been broken since
9eced8d049
due to the sources.list.do file still referencing the old .png images.

Without this fix the build will stop at:

    do            chicken-tiny.png
    do: Users/elasticdog/sshuttle/src/ui-macos/chicken-tiny.png: no .do file
    do:         Sshuttle VPN.app: got exit code 1
    do:       Sshuttle VPN.app.zip: got exit code 1
    do:     dist: got exit code 1
    do:   ui-macos/all: got exit code 1
    do: all: got exit code 1
2015-09-07 18:22:30 -07:00
Brian May
f4dac68dc0 Merge pull request #16 from prutschman/localhost_fix
Don't redirect excluded subsets of included subnets
2015-09-04 17:30:26 +10:00
Phil Rutschman
3a73520310 Don't redirect excluded subsets of included subnets 2015-09-03 21:25:23 -07:00
Brian May
e127aab776 Merge pull request #14 from reactormonk/patch-1
Switched the ./sshuttle to src/sshuttle
2015-07-26 11:15:56 +10:00
reactormonk
5f90ee1f04 Switched the ./sshuttle to src/sshuttle 2015-07-25 17:38:42 +02:00
Brian May
d70b5f2b89 Merge pull request #13 from shaiay/master
Fixed issue #12
2015-07-23 08:08:09 +10:00
Shai Ayal
3f2de26f67 Fixed issue #12
family should be an integer. fixed parsing routes
2015-07-22 22:52:25 +03:00
Brian May
53d5260f8f Merge pull request #11 from douglas/master
Fix the excludes rule for OS X Yosemite and OS X El Captain
2015-06-19 17:34:14 +10:00
Douglas Soares de Andrade
f870ceba00 Fix the excludes rule for OS X Yosemite and OS X El Captain
Without this fix, the rdr rule is executed sending the packages that
should be excluded to the ssh tunnel.

What I did was make sure that the packages that are going to the
excluded subnets are processed first and only after that, the remaining
packages will be sent to the ssh tunnel.

Thanks Warr1024 on #openssh channel in freenode for telling me about
the quick keyword and the rest of guys in the channel who tried to help.
2015-06-18 18:09:18 -03:00
Brian May
a38963301e Merge pull request #10 from jbd/patch-1
Check for fileno attribute in _tty_width function
2015-05-13 11:01:05 +10:00
jbd
bbd54e150d Check for fileno attribute in _tty_width function
When using Options parser within a unittest.TextTestRunner with buffering enabled (buffer=True), it fails with: 
AttributeError: StringIO instance has no attribute 'fileno'

This change will prevent this kind of error.
2015-05-12 16:43:38 +02:00
Brian May
00f20657e3 Merge pull request #9 from scommab/patch-1
Make firewall.py use the right params for islocal
2015-05-03 14:42:23 +10:00
Saul
84b30be904 Make firewall.py use the right params for islocal 2015-05-01 23:36:08 -07:00
Brian May
5825dddb02 Merge pull request #8 from nanoant/patch/osx-improvements
Patch/osx improvements
2015-04-21 09:49:18 +10:00