Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add --dns-hosts command-line option. #22

Open
wants to merge 23 commits into
base: master
Choose a base branch
from

Commits on Jan 2, 2012

  1. ipfw: don't use 'log' parameter.

    I guess we were causing the kernel to syslog on every single packet on
    MacOS.  Oops.
    apenwarr committed Jan 2, 2012
    Configuration menu
    Copy the full SHA
    2268e76 View commit details
    Browse the repository at this point in the history
  2. ui-macos/main.py: fix wait() to avoid deadlock.

    If the subprocess was trying to write to its stdout/stderr, its process
    would never actually finish because it was blocked waiting for us to read
    it, but we were blocked on waitpid().  Instead, use waitpid(WNOHANG) and
    continually read from the subprocess (which should be a blocking operation)
    until it exits.
    apenwarr committed Jan 2, 2012
    Configuration menu
    Copy the full SHA
    89e914e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2012

  1. firewall: catch SIGHUP and SIGPIPE.

    Not sure if this will fix anything, but it might stop the problem reported
    on some MacOS versions where the firewall doesn't get cleaned up correctly.
    apenwarr committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    e2c6820 View commit details
    Browse the repository at this point in the history
  2. Use the new arguments from redo v0.10.

    (apenwarr: also updates to the matching, latest minimal/do)
    Jimmy Tang authored and apenwarr committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    6698992 View commit details
    Browse the repository at this point in the history
  3. Import the non-pandoc manpage generator from redo.

    This makes it easier (possible?) to generate sshuttle.8 from sshuttle.md on
    MacOS.  We also import the git-enhanced version numbering magic so the
    generated manpage can have a real version number.
    apenwarr committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    cbc32ff View commit details
    Browse the repository at this point in the history
  4. Add a --version (-V) option.

    Now that we imported the feature from redo, might as well use it.
    apenwarr committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    41d1f73 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2012

  1. firewall.py: workaround MacOS 10.7 Lion bug.

    On top of the bug that already existed in 10.6, Lion also makes the sysctl
    needed to fix the problem into a read-only variable, so we have to actually
    change it at kernel boot time and force people to reboot.  Nice job, Apple.
    apenwarr committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    4c1a505 View commit details
    Browse the repository at this point in the history
  2. firewall.py: clean up repeated calls to ssubprocess.call().

    And make sshuttle exit with a well-defined exit code (111) if it needs to
    reboot.
    apenwarr committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    bd20841 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d9f761a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e737f4b View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2012

  1. Fix runpython.do for systems with unxpected configurations.

    If the expected arch directory doesn't exist, give up and don't specify arch at
    all. Currently it expands to '*' which fails.
    
    [slightly modified by apenwarr]
    drheld authored and apenwarr committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    12f6a52 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    274ee85 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2012

  1. Configuration menu
    Copy the full SHA
    42bc6d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2012

  1. server.py: slightly rearrange previous commit.

    Add some documentation about the int() vs long() and the reason behind
    _shl().  Instead of "from __future__ import generators", just don't use
    generators.
    apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    5743f29 View commit details
    Browse the repository at this point in the history
  2. firewall.py: catch SIGINT and SIGTERM too.

    There were still a few conditions under some OSes that would cause
    firewall.py to terminate without cleaning up the firewall settings.  'pkill
    sshuttle' was one of them.  Ignore a couple more signals to further ensure a
    correct cleanup.
    
    (This only affects sshuttle --firewall, which is a subprocess of the main
    sshuttle process.  The firewall is supposed to exit automatically whenever
    the client exits, and so far that part seems to work reliably.)
    apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    cce6a9d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bff1610 View commit details
    Browse the repository at this point in the history
  4. Added --exclude-from feature.

    (Slightly modified by apenwarr)
    tianyicui authored and apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    29d2e06 View commit details
    Browse the repository at this point in the history
  5. auto-hosts: don't add hosts that aren't being routed by sshuttle.

    I've been meaning to add this patch for a long time, but it's especially
    important once we add FQDN support to --auto-hosts.  Basically, auto-hosts
    will still discover all the hostnames it can, but we'll only add them to
    /etc/hosts if their IP address is in one of the routed subnet ranges.  That
    prevents polluting the /etc/hosts file with cruft.
    apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    432e98c View commit details
    Browse the repository at this point in the history
  6. hostwatch: handle fully qualified domain names

    (slightly modified by apenwarr)
    georgeguimaraes authored and apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    6450c37 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'fqdn'

    * fqdn:
      hostwatch: handle fully qualified domain names
      auto-hosts: don't add hosts that aren't being routed by sshuttle.
    apenwarr committed Jul 6, 2012
    Configuration menu
    Copy the full SHA
    860c2a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2012

  1. 2 Configuration menu
    Copy the full SHA
    9ce2fa0 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2013

  1. dns: Move resolvconf_nameservers() call from firewall.py to client.py

    This adds a dns_hosts command-line option, which is passed internally to
    the firewall, containing a comma-separated list of nameservers to target
    when creating firewall rules.
    Narthorn committed Nov 1, 2013
    Configuration menu
    Copy the full SHA
    3899e2e View commit details
    Browse the repository at this point in the history
  2. dns: Add --dns-hosts command-line option.

    The --dns switch adds firewall rules to intercept queries only for
    nameservers found in resolv.conf ; This command-line option allows
    the user to explicitly specify the nameservers to create firewall
    redirection rules for.
    
    This is useful when using a local DNS forwarder to redirect DNS queries
    to different nameservers.
    
    Example:
    
      We can use sshuttle to access a private subnet 172.30.0.0/16, which hosts
      a local DNS server resolving private domain names in that subnet.
    
      Currently, the only way to be able to resolve those domain names is to use
      the --dns switch. However, all DNS queries will then go through the remote
      nameserver, which might not be desirable especially if said nameserver
      does not know how to resolve every query.
    
      One solution is to run a local DNS forwarder, which knows that the private
      domain names can be resolved through a private IP, say 172.30.128.40.
    
      Now, we can run :
    
        sshuttle -r ssh.remoteserver.com -i 172.30.0.0/16 --dns-hosts 172.30.128.40
    
      DNS queries for private domain names will get forwarded to 172.30.128.40,
      intercepted by the firewall rule and sent through the tunnel to the nameserver
      used by the remote endpoint (which might or might not be 172.30.128.40 !).
    
    Notes :
    
        * There is nothing preventing --dns-hosts from being used together with
    	  --dns, in which case the nameservers found in resolv.conf will also be
    	  added to the firewall rules as usual. This defeats the purpose of the
    	  example, however.
    	  There might be some weird use-case where this is useful ?
    
        * Since there is no control over which nameserver the query gets sent to
    	  after it has crossed the tunnel, the IPs specified in --dns-hosts are
    	  irrelevant (as long as they are the same as found in the DNS forwarder
    	  configuration). This might be a little counter-intuitive.
    Narthorn committed Nov 1, 2013
    Configuration menu
    Copy the full SHA
    0cc65cc View commit details
    Browse the repository at this point in the history