1. 02 Oct, 2010 5 commits
  2. 01 Oct, 2010 5 commits
    • Avery Pennarun's avatar
    • Avery Pennarun's avatar
      BSD: sysctl net.inet.ip.forwarding=1 is not necessary. · f950a380
      Avery Pennarun authored
      If your machine is a firewall/router, it affects whether people behind the
      router can use your sshuttle connection - in the same way that it affects
      whether they can route *anything* through you.  And thus, it should be set
      by the admin, not by sshuttle.
      
      sshuttle works fine for the local user either way.
      
      (This also affects MacOS since it's a BSD variant.)
      f950a380
    • Avery Pennarun's avatar
      BSD ipfw: switch from 'established' to 'keep-state/check-state'. · 8b4466b8
      Avery Pennarun authored
      It turns out 'established' doesn't work the way I expected it to from
      iptables; it's not stateful.  It just checks the TCP flags to see if the
      connection *thinks* it's already established, and follows the rule if so.
      That caused the first packet of each new connection to set sent to our
      transproxy, but not the subsequent ones, so weird stuff happened.
      
      With this change, any (matching) connection created *after* starting sshuttle
      will get forwarded, but pre-existing ones - most importantly, sshuttle's own
      ssh connection - will not.
      
      And with this (plus the previous commit), sshuttle works on MacOS, including
      10.6!
      8b4466b8
    • Avery Pennarun's avatar
      ssnet: recover slightly more gracefully from an infinite forwarding loop. · 4bf4f70c
      Avery Pennarun authored
      If you 'telnet localhost 12300' weird things happen; someday we should
      probably auto-detect and avoid that altogether.  But meanwhile, catch EPIPE
      if it happens (it's irrelevant) and don't barf with a %d data type for a
      value that can apparently sometimes be None.
      4bf4f70c
    • Avery Pennarun's avatar
      Magic incantation to mostly fix MacOS 10.6. · 410b9d42
      Avery Pennarun authored
      It comes down to this:
         sysctl_set('net.inet.ip.scopedroute', 0)
      
      I say "mostly" because actually it doesn't fix it; sshuttle doesn't know
      what to do with the received connection, so there must be a minor bug
      remaining somewhere.  I'll fix that next.
      
      Thanks to dkf <dfortunato@gmail.com> on the sshuttle mailing list for
      suggesting the magic fix.  He points at this post in particular:
        http://discussions.apple.com/thread.jspa?messageID=11558355&#11558355
      that gave him the necessary clue.
      410b9d42
  3. 22 Sep, 2010 2 commits
    • Avery Pennarun's avatar
      latest options.py from bup, now with tty-width guessing. · 2ef1c6a4
      Avery Pennarun authored
      as of bup commit bup-0.19-2-gce2ace5.
      2ef1c6a4
    • Frederik Deweerdt's avatar
      hostwatch: add missing errno import · b35cfbd0
      Frederik Deweerdt authored
      If the ~/.sshuttle.hosts file does not exist, it triggers the following
      error:
      
             Traceback (most recent call last):
               File "./sshuttle", line 80, in <module>
                 sys.exit(hostwatch.hw_main(extra))
               File "/home/def/p/sshuttle/hostwatch.py", line 246, in hw_main
                 read_host_cache()
               File "/home/def/p/sshuttle/hostwatch.py", line 41, in read_host_cache
                 if e.errno == errno.ENOENT:
             NameError: global name 'errno' is not defined
      
      (This only happened if you run 'sshuttle --hostwatch' from the command line
      directly, without passing it through assembler.py.)
      b35cfbd0
  4. 05 Sep, 2010 1 commit
  5. 04 Sep, 2010 2 commits
  6. 25 Jul, 2010 1 commit
  7. 16 Jul, 2010 1 commit
  8. 17 May, 2010 1 commit
    • Avery Pennarun's avatar
      log(): don't abort if we fail to write to stderr. · 3a25f709
      Avery Pennarun authored
      Failing to write to the log sucks, but not as much as failing to clean up
      just because stderr disappeared.  So let's catch any IOError exception from
      log() and just ignore it.
      
      This should fix a problem reported by Camille Moncelier, which is that
      sshuttle firewall entries stick around if your tty dies strangely (eg. your
      X server aborts for some reason).
      3a25f709
  9. 13 May, 2010 1 commit
  10. 12 May, 2010 2 commits
  11. 11 May, 2010 1 commit
  12. 09 May, 2010 3 commits
  13. 08 May, 2010 5 commits
    • Avery Pennarun's avatar
      Added new --auto-hosts and --seed-hosts options to the client. · 33efa5ac
      Avery Pennarun authored
      Now if you use --auto-hosts (-H), the client will ask the server to spawn a
      hostwatcher to add names.  That, in turn, will send names back to the
      server, which sends them back to the client, which sends them to the
      firewall subprocess, which will write them to /etc/hosts.  Whew!
      
      Only the firewall process can write to /etc/hosts, of course, because only
      he's running as root.
      
      Since the name discovery process is kind of slow, we cache the names in
      ~/.sshuttle.hosts on the remote server.
      
      Right now, most of the names are discovered using nmblookup and smbclient,
      as well as by reading the existing entries in /etc/hosts.  What would really
      be nice would be to query active directory or mdns somehow... but I don't
      really know how those work, so this is what you get for now :)  It's pretty
      neat, at least.
      33efa5ac
    • Avery Pennarun's avatar
      Add 'sshuttle --hostwatch' subcommand. · a2ea5ab4
      Avery Pennarun authored
      This tries to discover local hostnames and prints them to stdout.  Will be
      used by the server for auto-hostname tracking.
      a2ea5ab4
    • Avery Pennarun's avatar
      BSD: "ipfw add %d accept ip from any to any established" · 680941cb
      Avery Pennarun authored
      With this rule, we don't interfere with already-established (or incoming)
      connections to routes that we're about to take over.  This is what
      happens by default in Linux/iptables.
      680941cb
    • Avery Pennarun's avatar
      Add -N (--auto-nets) option for auto-discovering subnets. · 70431950
      Avery Pennarun authored
      Now if you do
      
      	./sshuttle -Nr username@myservername
      
      It'll automatically route the "local" subnets (ie., stuff in the routing
      table) from myservername.  This is (hopefully a reasonable default setting
      for most people.
      70431950
    • Avery Pennarun's avatar
      ssnet: EHOSTUNREACH and ENETUNREACH are non-fatal errors. · 77935bd1
      Avery Pennarun authored
      Reported by Wayne Scott.
      77935bd1
  14. 05 May, 2010 5 commits
    • Avery Pennarun's avatar
      Don't require the remote server to have sshuttle installed. · 8fe3592b
      Avery Pennarun authored
      Instead, grab our source code, send it over the link, and have python eval
      it and then start the server.py main() function.
      
      Strangely, there's now *less* horrible stuff in ssh.py, because we no longer
      have to munge around with the PATH environment variable.  And this
      significantly reduces the setup required to get sshuttle going.
      
      Based on a suggestion from Wayne Scott.
      8fe3592b
    • Avery Pennarun's avatar
      Rename iptables->firewall. · ba19d9c7
      Avery Pennarun authored
      Since we "almost" support ipfw on MacOS (which I guess might mean FreeBSD
      too), the name should be a bit more generic.
      ba19d9c7
    • Avery Pennarun's avatar
      Client "almost" works on MacOS and maybe FreeBSD. · 096bbcc5
      Avery Pennarun authored
      Basic forwarding now works on MacOS, assuming you set up ipfw correctly
      (ha ha).  I wasted a few hours today trying to figure this out, and I'm *so
      very close*, but unfortunately it just didn't work.  Think you can figure it
      out?
      
      Related changes:
      - don't die if iptables is unavailable
      - BSD uses getsockname() instead of SO_ORIGINAL_DST
      - non-blocking connect() returns EISCONN once it's connected
      - you can't setsockopt IP_TTL more than once
      096bbcc5
    • Avery Pennarun's avatar
      7bd0efd5
    • Avery Pennarun's avatar
      ssh.py: allow hostnames of the form hostname:port · 8173925b
      Avery Pennarun authored
      Feature requested by Wayne Scott and Ed Maste.
      8173925b
  15. 04 May, 2010 3 commits
  16. 03 May, 2010 2 commits
    • Avery Pennarun's avatar
      README: update to use real markdown-style headings. · 33a73056
      Avery Pennarun authored
      Oops, got those mixed up with some random other markup format.
      33a73056
    • Avery Pennarun's avatar
      ssh.py: support finding sshuttle in "$HOME/.../sshuttle" · 4a462258
      Avery Pennarun authored
      If you ran sshuttle from /home/apenwarr/sshuttle/sshuttle, we would
      automatically add /home/apenwarr/sshuttle to the PATH before trying to
      execute sshuttle on the remote machine.  That way, if you install it in the
      same place on two computers, the client would still be able to start the
      server.
      
      Someone reported, though, that if they installed the client in
      /home/apenwarr/sshuttle/shuttle, and the server in /root/sshuttle/sshuttle,
      then used "-r root@servername", it wasn't able to find the program.
      
      Similar problems would happen if you're apenwarr at home and averyp at work.
      
      So what we now do is add *two* directories to the PATH:
      /home/apenwarr/sshuttle and $HOME/sshuttle, where $HOME is the value of
      $HOME on the *server*, not the client.  So it'll find it in either place.
      4a462258