sheepsafe 0.3.2 → 0.3.3

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    sheepsafe (0.3.2)
+      daemons (~> 1.1)
+      highline (~> 1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    daemons (1.1.8)
+    diff-lcs (1.1.3)
+    highline (1.6.11)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (~> 2.0)
+  sheepsafe!

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.3
+
+- Detect "AirPort" or "Wi-Fi" network service name in installer
+- Allow disabling sheepsafe with command-line "sheepsafe <enable|disable>"
+
 === 0.3.2
 
 - Migrate all sheepsafe files to ~/.sheepsafe/ directory (Justin Ridgewell)

data/Rakefile

@@ -21,7 +21,7 @@ def date
 end
 
 def rubyforge_project
-  "jruby-extras"
+  "caldersphere"
 end
 
 def gemspec_file

data/bin/sheepsafe

@@ -8,15 +8,11 @@ rescue LoadError
   require 'sheepsafe'
 end
 
-if ARGV.length == 1
+if ARGV.length > 0 && Sheepsafe::Installer.instance_methods(false).map(&:to_s).include?(ARGV[0])
   installer = Sheepsafe::Installer.new
-  if installer.respond_to?(ARGV.first)
-    installer.send(ARGV.first)
-  else
-    abort "unknown command #{ARGV.first}. Try 'install', 'update', or 'uninstall'."
-  end
+  installer.send(ARGV.first)
 else
   # Allow network changes to sink in for a couple more seconds
-  sleep 2
+  sleep 2 if ARGV.length == 0
   Sheepsafe::Controller.new.run
 end

data/lib/sheepsafe.rb

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

data/lib/sheepsafe/config.rb

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

data/lib/sheepsafe/controller.rb

@@ -32,16 +32,33 @@ module Sheepsafe
       $stdout  = TeeStdout.new(self)
     end
 
-    def run
+    def run(args = ARGV)
       log("Sheepsafe starting")
 
-      if ARGV.first == 'proxy'  # 'sheepsafe proxy up/down/kick'
-        bring_socks_proxy ARGV[1]
+      case args.first
+      when 'proxy'  # 'sheepsafe proxy up/down/kick'
+        bring_socks_proxy args[1]
         return
+      when 'disable'
+        @config.disabled = true
+        @config.write
+        bring_socks_proxy 'down'
+        system "scselect #{@config.trusted_location}"
+        return
+      when 'enable'
+        @config.disabled = nil
+        @config.write
+      when nil
+        true # continue
+      else
+        abort "unknown command #{args.first}. Try 'install', 'update', or 'uninstall'."
       end
 
       # Always recycle the proxy server on network changes
       bring_socks_proxy 'down'
+
+      return if @config.disabled
+
       if network_up?
         if network_changed?
           if switch_to_trusted?

data/lib/sheepsafe/installer.rb

@@ -92,7 +92,8 @@ MSG
 
       if agree "Next, I'll set up the SOCKS proxy in the \"Untrusted\" location for you. OK\? (yes/no)\n"
         system "networksetup -switchtolocation Untrusted"
-        system "networksetup -setsocksfirewallproxy AirPort localhost #{config.socks_port}"
+        wifi_service = `networksetup -listallnetworkservices`.lines.detect {|l| l[/(AirPort|Wi-Fi)/, 1] }
+        system "networksetup -setsocksfirewallproxy wifi_service localhost #{config.socks_port}"
       end
     end
 

data/sheepsafe.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name              = 'sheepsafe'
-  s.version           = '0.3.2'
-  s.date              = '2011-06-05'
+  s.version           = '0.3.3'
+  s.date              = '2012-04-01'
 
   s.rubyforge_project = %q{caldersphere}
 
@@ -35,6 +35,8 @@ current configuration, run \`sheepsafe update\'.
 
   # = MANIFEST =
   s.files = %w[
+    Gemfile
+    Gemfile.lock
     History.txt
     LICENSE
     README.md

data/spec/sheepsafe_spec.rb

@@ -4,7 +4,7 @@ require 'sheepsafe'
 describe Sheepsafe::Controller do
   let(:config) do
     double("config", :trusted_location => "trusted_location", :untrusted_location => "untrusted_location",
-         :last_network= => nil, :write => nil)
+         :last_network= => nil, :write => nil, :disabled => nil)
   end
 
   let (:network) do
@@ -53,14 +53,14 @@ describe Sheepsafe::Controller do
     it "does not touch config" do
       network.stub :trustworthy? => true
       config.should_not_receive(:write)
-      controller.run
+      controller.run([])
     end
 
     it "recycles the proxy server process when on the untrusted network" do
       network.stub :trustworthy? => false
       controller.should_receive(:bring_socks_proxy).with('down')
       controller.should_receive(:bring_socks_proxy).with('up')
-      controller.run
+      controller.run([])
     end
   end
 
@@ -68,7 +68,16 @@ describe Sheepsafe::Controller do
     it "does nothing" do
       network.should_receive(:up?).and_return false
       config.should_not_receive(:write)
-      controller.run
+      controller.run([])
+    end
+  end
+
+  context "disabled in config" do
+    it "does nothing" do
+      config.stub :disabled => true
+      controller.should_receive(:bring_socks_proxy).with('down')
+      config.should_not_receive(:write)
+      controller.run([])
     end
   end
 
@@ -81,7 +90,7 @@ describe Sheepsafe::Controller do
     it "writes the last network to the configuration" do
       config.should_receive(:last_network=).ordered
       config.should_receive(:write).ordered
-      controller.run
+      controller.run([])
     end
 
     context "to trusted" do
@@ -89,7 +98,7 @@ describe Sheepsafe::Controller do
         controller.should_receive(:switch_to_trusted?).and_return true
         controller.should_receive(:system).with("scselect trusted_location")
         controller.should_receive(:bring_socks_proxy).with('down')
-        controller.run
+        controller.run([])
       end
     end
 
@@ -100,10 +109,28 @@ describe Sheepsafe::Controller do
         controller.should_receive(:system).with("scselect untrusted_location")
         controller.should_receive(:bring_socks_proxy).with('down')
         controller.should_receive(:bring_socks_proxy).with('up')
-        controller.run
+        controller.run([])
       end
     end
   end
+
+  context "sheepsafe proxy down" do
+    it "brings the proxy down and then exits" do
+      controller.should_receive(:bring_socks_proxy).with('down')
+      config.should_not_receive(:write)
+      controller.run(["proxy", "down"])
+    end
+  end
+
+  context "sheepsafe disable" do
+    it "writes disabled:true to the config" do
+      config.should_receive(:disabled=).with(true)
+      config.should_receive(:write)
+      controller.should_receive(:bring_socks_proxy).with('down')
+      controller.should_receive(:system).with("scselect trusted_location")
+      controller.run(["disable"])
+    end
+  end
 end
 
 describe Sheepsafe::Config, "#ssh_args" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheepsafe
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2012-04-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -72,6 +72,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files: 
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.md
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.7.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Makes sure you're safe from FireSheep!