sheepsafe 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,18 @@
+=== 0.2.5
+
+- Wait a bit before starting proxy when switching networks
+- Allow specification of port for ssh (thanks Kevin Ball)
+- Add wifi blacklist (thanks Tim Felgentreff)
+- Add ability to trust encrypted wifi networks (thanks Tim Felgentreff)
+
+=== 0.2.4
+
+- Ensure the ~/Library/LaunchAgents directory exists
+- Docs and `sheepsafe proxy kick`
+- sheepsafe list|add commands (thanks Ted Nielsen)
+- Use connection response from http://example.com as indication that
+  we're past a paywall wifi network (idea thanks to Adam Keys)
+
 === 0.2.3
 
 - Recycle the proxy server on every launch when on the Untrusted

data/lib/sheepsafe/config.rb

@@ -3,9 +3,9 @@ require 'yaml'
 module Sheepsafe
   class Config
     FILE = File.expand_path('~/.sheepsafe.yml')
-    DEFAULT_CONFIG = {"untrusted_location" => "Untrusted", "socks_port" => "9999"}
-    ATTRS = %w(trusted_location untrusted_location last_network ssh_host socks_port)
-    ARRAY_ATTRS = %w(trusted_names)
+    DEFAULT_CONFIG = {"untrusted_location" => "Untrusted", "socks_port" => "9999", "trust_encrypted?" => "false"}
+    ATTRS = %w(trusted_location untrusted_location last_network ssh_host ssh_port socks_port trust_encrypted?)
+    ARRAY_ATTRS = %w(trusted_names untrusted_names)
 
     def self.load_config
       YAML.load_file(FILE)

data/lib/sheepsafe/controller.rb

@@ -47,7 +47,7 @@ module Sheepsafe
           end
           @config.last_network = @network
           @config.write
-        elsif !@network.trusted?
+        elsif !@network.trustworthy?
           # recycle the proxy server on network changes
           bring_socks_proxy 'restart'
         end
@@ -66,11 +66,11 @@ module Sheepsafe
     end
 
     def switch_to_trusted?
-      @network.trusted?
+      @network.trustworthy?
     end
 
     def switch_to_untrusted?
-      !@network.trusted?
+      !@network.trustworthy?
     end
 
     def bring_socks_proxy(direction)
@@ -87,9 +87,10 @@ module Sheepsafe
           Process.kill("TERM", pid)
           exit 0
         end
+        sleep 2                 # wait a bit before starting proxy
         loop do
           pid = fork do
-            exec("ssh -ND #{@config.socks_port} #{@config.ssh_host}")
+            exec("ssh -p #{@config.ssh_port } -ND #{@config.socks_port} #{@config.ssh_host}")
           end
           Process.waitpid(pid)
           sleep 1

data/lib/sheepsafe/installer.rb

@@ -38,8 +38,12 @@ MSG
         q.default = config.ssh_host
       end
 
+      config.ssh_port = ask "SSH Port >\n" do |q|
+        q.default = config.ssh_port || 22
+      end
+
       say "Testing connectivitity to #{config.ssh_host}..."
-      system "ssh #{config.ssh_host} true"
+      system "ssh -p #{config.ssh_port} #{config.ssh_host} true"
       unless $?.success?
         abort "Sorry! that ssh host was no good."
       end

data/lib/sheepsafe/network.rb

@@ -8,10 +8,22 @@ module Sheepsafe
       @config = config || Sheepsafe::Config.new({})
     end
 
+    def trustworthy?
+      !untrusted? && (encrypted? && @config.trust_encrypted? || trusted?)
+    end
+
     def trusted?
       @config.trusted_names.include?(ssid) || @config.trusted_names.include?(bssid)
     end
 
+    def untrusted?
+      @config.untrusted_names.include?(ssid) || @config.untrusted_names.include?(bssid)
+    end
+
+    def encrypted?
+      !(@data["802.11 auth"] == "open" or @data["link auth"] == "open")
+    end
+
     def up?
       @data['AirPort'] != false
     end

data/lib/sheepsafe.rb

@@ -1,5 +1,5 @@
 module Sheepsafe
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end
 
 require 'sheepsafe/config'

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.2.4'
-  s.date              = '2010-11-09'
+  s.version           = '0.2.5'
+  s.date              = '2010-11-19'
 
   s.rubyforge_project = %q{caldersphere}
 

data/spec/sheepsafe_spec.rb

@@ -33,14 +33,14 @@ describe Sheepsafe::Controller do
 
   context "#switch_to_trusted?" do
     it "is when the current network is trusted" do
-      network.stub :trusted? => true
+      network.stub :trustworthy? => true
       controller.switch_to_trusted?.should be_true
     end
   end
 
   context "#switch_to_untrusted?" do
     it "is when the current network is trusted" do
-      network.stub :trusted? => false
+      network.stub :trustworthy? => false
       controller.switch_to_untrusted?.should be_true
     end
   end
@@ -51,13 +51,13 @@ describe Sheepsafe::Controller do
     end
 
     it "does not touch config" do
-      network.stub :trusted? => true
+      network.stub :trustworthy? => true
       config.should_not_receive(:write)
       controller.run
     end
 
     it "recycles the proxy server process when on the untrusted network" do
-      network.stub :trusted? => false
+      network.stub :trustworthy? => false
       controller.should_receive(:bring_socks_proxy).with('restart')
       controller.run
     end
@@ -121,6 +121,34 @@ describe Sheepsafe::Network do
     it { should be_trusted }
   end
 
+  context "with untrusted SSID" do
+    let(:config) { Sheepsafe::Config.new({"untrusted_names" => [current_network.ssid]}) }
+    subject { Sheepsafe::Network.new(config) }
+
+    it { should_not be_trusted }
+  end
+
+  context "with untrusted BSSID" do
+    let(:config) { Sheepsafe::Config.new({"untrusted_names" => [current_network.bssid]}) }
+    subject { Sheepsafe::Network.new(config) }
+
+    it { should_not be_trusted }
+  end
+
+  context "with trusted encryption" do
+    let(:config) { Sheepsafe::Config.new({"trust_encrypted?" => true}) }
+    subject { Sheepsafe::Network.new(config) }
+
+    it { should be_trusted if subject.encrypted? }
+  end
+
+  context "with untrusted encryption" do
+    let(:config) { Sheepsafe::Config.new({"trust_encrypted?" => false}) }
+    subject { Sheepsafe::Network.new(config) }
+
+    it { should_not be_trusted }
+  end
+
   context "with no trusted names" do
     subject { Sheepsafe::Network.new }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-19 00:00:00 -06:00
 default_executable: sheepsafe
 dependencies: 
 - !ruby/object:Gem::Dependency