rubius 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rubius.rb

@@ -1,5 +1,6 @@
 require 'rubius/string'
 
+require 'rubius/exceptions'
 require 'rubius/rails'
 require 'rubius/dictionary'
 require 'rubius/packet'

data/lib/rubius/authenticator.rb

@@ -19,15 +19,17 @@ module Rubius
       
       @sock = nil
       
-      @nas_ip = UDPSocket.open {|s| s.connect(@host, 1); s.addr.last }
-      
-      @identifier = Process.pid && 0xff
+      @identifier = Process.pid & 0xff
     end
     
-    def init_from_config(config_file)
-      env = defined?(Rails) ? ::Rails.env : 'development'
+    def init_from_config(config_file, env=nil)
+      if env.nil?
+        env = defined?(::Rails) ? ::Rails.env : 'development'
+      end
       
       config = YAML.load_file(config_file)
+      raise Rubius::MissingEnvironmentConfiguration unless config.has_key?(env)
+      
       @host = config[env]["host"]
       @port = config[env]["port"] if config[env]["port"]
       @secret = config[env]["secret"]
@@ -38,8 +40,11 @@ module Rubius
       end
       
       @nas_ip = config[env]["nas_ip"] if config[env]["nas_ip"]
+      @nas_ip ||= UDPSocket.open {|s| s.connect(@host, 1); s.addr.last }
       
       setup_connection
+    rescue Errno::ENOENT
+      raise Rubius::MissingConfiguration
     end
     
     def authenticate(username, password)

data/lib/rubius/dictionary.rb

@@ -14,6 +14,8 @@ module Rubius
       dict_lines = IO.readlines(dictionary_file)
       
       vendor_id = DEFAULT_VENDOR
+      skip_until_next_vendor = false
+      
       dict_lines.each do |line|
         next if line =~ /^\#/
         next if (tokens = line.split(/\s+/)).empty?
@@ -21,15 +23,41 @@ module Rubius
         entry_type = tokens[0].upcase
         case entry_type
         when VENDOR
-          vendor_id = tokens[2].to_i
+          skip_until_next_vendor = false
+          
+          # If the vendor_id string is nil or empty, we should skip this entire block
+          # until we find another VENDOR definition, also ignore all VALUEs and ATTRIBUTEs
+          # until the next VENDOR because otherwise, they will be included in the wrong VENDOR
+          vendor_id_str = tokens[2]
+          if vendor_id_str.nil? || vendor_id_str.empty?
+            skip_until_next_vendor = true
+            next
+          end
+          
+          # VENDOR id should be higher than 0, skip everything if it isn't
+          vendor_id = vendor_id_str.to_i
+          if vendor_id <= 0
+            skip_until_next_vendor = true
+            next
+          end
+          
           vendor_name = tokens[1].strip
           @dictionary[vendor_id] ||= {:name => vendor_name}
         when ATTRIBUTE
+          next if skip_until_next_vendor
+          next if tokens[1].nil? || tokens[2].to_i <= 0 || tokens[3].nil?
           @dictionary[vendor_id][tokens[2].to_i] = {:name => tokens[1].strip, :type => tokens[3].strip}
         when VALUE
+          next if skip_until_next_vendor
           @dictionary[vendor_id][tokens[1]] = {tokens[2].strip => tokens[3].to_i}
         end
       end
+    rescue Errno::ENOENT
+      raise Rubius::InvalidDictionaryError
+    end
+    
+    def vendors
+      @dictionary.collect{|k,v| v[:name]}.reject{|n| n.empty?}
     end
     
     def vendor_name(vendor_id = DEFAULT_VENDOR)
@@ -45,7 +73,9 @@ module Rubius
     end
     
     def attribute_id(attr_name, vendor_id = DEFAULT_VENDOR)
-      @dictionary[vendor_id].reject{|k,v| !v.is_a?(Hash) || v[:name]!=attr_name}.flatten.first
+      vendor_object = @dictionary[vendor_id].reject{|k,v| !v.is_a?(Hash) || v[:name]!=attr_name}
+      vendor_object = vendor_object.to_a if RUBY_VERSION < "1.9.2"
+      vendor_object.flatten.first
     end
     
     private

data/lib/rubius/exceptions.rb

@@ -0,0 +1,6 @@
+module Rubius
+  class Error < RuntimeError; end
+  class InvalidDictionaryError < Error; end
+  class MissingConfiguration < Error; end
+  class MissingEnvironmentConfiguration < Error; end
+end

data/lib/rubius/rails.rb

@@ -3,16 +3,16 @@ module Rubius
     def self.init(root = nil, env = nil)
       base_dir = root
       if root.nil?
-        root = defined?(Rails) ?  ::Rails.root : FileUtils.pwd
+        root = defined?(::Rails) ?  ::Rails.root : FileUtils.pwd
         base_dir = File.expand_path(File.join(root, 'config'))
       end
       
       if env.nil?
-        env = defined?(Rails) ? ::Rails.env : 'development'
+        env = defined?(::Rails) ? ::Rails.env : 'development'
       end
       
       config_file = File.join(base_dir, 'rubius.yml')
-      Rubius::Authenticator.instance.init_from_config(config_file)
+      Rubius::Authenticator.instance.init_from_config(config_file, env)
     end
   end
 end

data/rubius.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubius}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ralph Rooding"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-04-28}
   s.description = %q{Rubius provides a simple interface to RADIUS authentication}
   s.email = %q{ralph@izerion.com}
   s.extra_rdoc_files = [
@@ -30,12 +30,15 @@ Gem::Specification.new do |s|
     "lib/rubius.rb",
     "lib/rubius/authenticator.rb",
     "lib/rubius/dictionary.rb",
+    "lib/rubius/exceptions.rb",
     "lib/rubius/packet.rb",
     "lib/rubius/rails.rb",
     "lib/rubius/string.rb",
     "rubius.gemspec",
     "test/helper.rb",
+    "test/test_authenticator.rb",
     "test/test_dictionary.rb",
+    "test/test_rails.rb",
     "test/test_string.rb"
   ]
   s.homepage = %q{http://github.com/rahvin/rubius}
@@ -45,7 +48,9 @@ Gem::Specification.new do |s|
   s.summary = %q{A simple ruby RADIUS authentication gem}
   s.test_files = [
     "test/helper.rb",
+    "test/test_authenticator.rb",
     "test/test_dictionary.rb",
+    "test/test_rails.rb",
     "test/test_string.rb"
   ]
 
@@ -75,6 +80,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])
       s.add_development_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])
+      s.add_development_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
     else
       s.add_dependency(%q<rubius>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -98,6 +109,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<simplecov>, [">= 0.4.0"])
       s.add_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.12"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<simplecov>, [">= 0.4.0"])
+      s.add_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
     end
   else
     s.add_dependency(%q<rubius>, [">= 0"])
@@ -122,6 +139,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<simplecov>, [">= 0.4.0"])
     s.add_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.12"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<simplecov>, [">= 0.4.0"])
+    s.add_dependency(%q<autotest-standalone>, ["~> 4.5.5"])
   end
 end
 

data/test/helper.rb

@@ -54,3 +54,45 @@ RADIUS_DICTIONARY = [
   "",
   "ATTRIBUTE	Juniper-Local-User-Name			1	string"
 ]
+
+DICT_BROKEN_VENDOR = [
+  "# broken vendor line follows (missing id):",
+  "VENDOR Microsoft",
+  "",
+  "ATTRIBUTE Not-Included 8344 string",
+  "",
+  "# non-broken vendor:",
+  "VENDOR Apple 25",
+  "ATTRIBUTE Is-Cool 1337 integer",
+  "",
+  "VENDOR NoId id"
+]
+
+DICT_BROKEN_ATTR = [
+  "# broken attribute line:",
+  "VENDOR IBM 123",
+  "",
+  "ATTRIBUTE IBM-Attr-Included 5137 string",
+  "ATTRIBUTE IBM-Attr-NotIncluded 5138",
+  "ATTRIBUTE IBM-Attr-NotIncluded2 asdf integer",
+  "ATTRIBUTE IBM-Attr-Included2 5139 string",
+  ""
+]
+
+CONFIG_FILE = {
+  'development' => {
+    'host' => '127.0.0.1',
+    'port' => 1812,
+    'timeout' => 10,
+    'secret' => 'development-secret',
+    'dictionary' => 'radius-dictionary'
+  },
+  'production' => {
+    'host' => '10.1.0.254',
+    'port' => 1812,
+    'timeout' => 10,
+    'secret' => 'production-secret',
+    'dictionary' => 'radius-dictionary',
+    'nas_ip' => '10.1.0.1'
+  }
+}

data/test/test_authenticator.rb

@@ -0,0 +1,84 @@
+require 'helper'
+
+class TestAuthenticator < Test::Unit::TestCase
+  context "A Rubius::Authenticator instance" do
+    setup do
+      Process.stubs(:pid).returns(93354)
+      
+      UDPSocket.any_instance
+      UDPSocket.any_instance.stubs(:addr).returns(["AF_INET", 65194, "10.1.0.45", "10.1.0.45"])
+      
+      @authenticator = Rubius::Authenticator.instance
+    end
+    
+    should "generate an identifier" do
+      assert_equal 170, @authenticator.instance_eval { @identifier }
+    end
+    
+    should "increment the identifier" do
+      identifier = @authenticator.instance_eval { @identifier }
+      identifier += 1
+      
+      assert @authenticator.instance_eval { increment_identifier! }
+      
+      assert_equal identifier, @authenticator.instance_eval { @identifier }
+    end
+    
+    should "overflow the identifier beyond 255" do
+      @authenticator.instance_eval { @identifier = 254 }
+      assert_equal 254, @authenticator.instance_eval { @identifier }
+      
+      assert @authenticator.instance_eval { increment_identifier! }
+      assert_equal 255, @authenticator.instance_eval { @identifier }
+      
+      assert @authenticator.instance_eval { increment_identifier! }
+      assert_equal 0, @authenticator.instance_eval { @identifier }
+      
+      assert @authenticator.instance_eval { increment_identifier! }
+      assert_equal 1, @authenticator.instance_eval { @identifier }
+    end
+    
+    context "supplied with a configuration file" do      
+      should "read and parse the configuration file" do
+        YAML.stubs(:load_file).returns(CONFIG_FILE)
+        
+        @authenticator.init_from_config("rubius.yml", 'development')
+        assert_equal 'development-secret', @authenticator.instance_eval { @secret }
+      end
+      
+      should "use Rails.env if env is not passed and running in a Rails application" do
+        YAML.stubs(:load_file).returns(CONFIG_FILE)
+        ::Rails.stubs(:env).returns('production')
+        
+        @authenticator.init_from_config("rubius.yml")
+        assert_equal 'production-secret', @authenticator.instance_eval { @secret }
+      end
+      
+      should "handle a non-existent config file" do
+        YAML.stubs(:load_file).raises(Errno::ENOENT)
+        ::Rails.stubs(:env).returns('production')
+        
+        assert_raises Rubius::MissingConfiguration do
+          @authenticator.init_from_config("/does/not/exist/rubius.yml")
+        end
+      end
+      
+      should "handle an empty config section" do
+        YAML.stubs(:load_file).returns(CONFIG_FILE)
+        ::Rails.stubs(:env).returns('staging')
+        
+        assert_raises Rubius::MissingEnvironmentConfiguration do
+          @authenticator.init_from_config("rubius.yml")
+        end
+      end
+      
+      should "setup a connection to the specified server" do
+        YAML.stubs(:load_file).returns(CONFIG_FILE)
+        ::Rails.stubs(:env).returns('production')
+        UDPSocket.any_instance.stubs(:connect).with('10.1.0.254', 1812).returns(true)
+        
+        assert @authenticator.init_from_config("rubius.yml")
+      end
+    end
+  end
+end

data/test/test_dictionary.rb

@@ -1,22 +1,68 @@
 require 'helper'
 
 class TestDictionary < Test::Unit::TestCase
-  def setup
-    @dictionary = Rubius::Dictionary.new
-  end
-  
   context "A Rubius::Dictionary" do
-    should "load and parse a RADIUS dictionary file" do
-      IO.stubs(:readlines).returns(RADIUS_DICTIONARY)
+    setup do
+      @dictionary = Rubius::Dictionary.new
+    end
     
-      assert @dictionary.load("file")
+    context "provided with a valid RADIUS dictionary file" do
+      setup do
+        IO.stubs(:readlines).returns(RADIUS_DICTIONARY)
+      end
+      
+      should "load and parse it" do
+        assert @dictionary.load("filename")
+        
+        assert_equal "Cisco", @dictionary.vendor_name(9)
+        assert_equal "Juniper", @dictionary.vendor_name(2636)
+
+        assert_equal "Service-Type", @dictionary.attribute_name(6)
+        assert_equal "string", @dictionary.attribute_type(2, 9)
+        assert_equal 1, @dictionary.attribute_id("Juniper-Local-User-Name", 2636)
+      end
+    end
     
-      assert_equal "Cisco", @dictionary.vendor_name(9)
-      assert_equal "Juniper", @dictionary.vendor_name(2636)
+    context "provided with a non-existant RADIUS dictionary file" do
+      setup do
+        IO.stubs(:readlines).raises(Errno::ENOENT)
+      end
+      
+      should "raise an exception" do
+        assert_raise Rubius::InvalidDictionaryError do
+          @dictionary.load("/no/existing/file")
+        end
+      end
+    end
+    
+    context "provided with a malformed RADIUS dictionary file" do
+      should "handle broken VENDOR lines" do
+        IO.stubs(:readlines).returns(RADIUS_DICTIONARY+DICT_BROKEN_VENDOR)
+        
+        assert @dictionary.load("filename")
+        
+        assert !@dictionary.vendors.include?("Microsoft")
+        assert_nil @dictionary.attribute_name(8344)
+        
+        assert @dictionary.vendors.include?("Apple")
+        assert_equal "Is-Cool", @dictionary.attribute_name(1337, 25)
+        
+        assert !@dictionary.vendors.include?("NoId")
+      end
+      
+      should "handle broken ATTRIBUTE lines" do
+        IO.stubs(:readlines).returns(RADIUS_DICTIONARY+DICT_BROKEN_ATTR)
+        
+        assert @dictionary.load("filename")
+        
+        assert_equal 'IBM-Attr-Included', @dictionary.attribute_name(5137, 123)
+        assert_nil @dictionary.attribute_name(5138, 123)
+        assert_equal 'IBM-Attr-Included2', @dictionary.attribute_name(5139, 123)
+      end
       
-      assert_equal "Service-Type", @dictionary.attribute_name(6)
-      assert_equal "string", @dictionary.attribute_type(2, 9)
-      assert_equal 1, @dictionary.attribute_id("Juniper-Local-User-Name", 2636)
+      should "handle broken VALUE lines" do
+        
+      end
     end
   end
 end

data/test/test_rails.rb

@@ -0,0 +1,62 @@
+require 'helper'
+
+module Rails; end
+
+class TestRails < Test::Unit::TestCase
+  context "a Rubius::Rails.init call" do
+    context "in a standalone application" do
+      setup do
+        Object.instance_eval{ remove_const("Rails") } if defined?(::Rails) 
+      end
+      
+      context "without any parameters" do
+        should "try to load the config file at current_dir/config/rubius.yml with the 'development' environment" do
+          Rubius::Authenticator.any_instance.stubs(:init_from_config).with(File.join(FileUtils.pwd, 'config', 'rubius.yml'), 'development').returns(true)
+          assert Rubius::Rails.init
+        end
+      end
+    
+      context "with path specified" do
+        should "try to load the config at the specified path with the 'development' environment" do
+          config_file = File.join('path', 'to', 'config')
+        
+          Rubius::Authenticator.any_instance.stubs(:init_from_config).with(File.join(config_file, 'rubius.yml'), 'development').returns(true)
+        
+          assert Rubius::Rails.init(config_file)
+        end
+      end
+    end
+    
+    context "in a Rails application" do
+      setup do
+        ::Rails.stubs(:env).returns('stubbed')
+        ::Rails.stubs(:root).returns('/home/rails')
+      end
+      
+      should "use Rails path and environment" do
+        Rubius::Authenticator.any_instance.stubs(:init_from_config).with(File.join('/', 'home', 'rails', 'config', 'rubius.yml'), 'stubbed').returns(true)
+        assert Rubius::Rails.init
+      end
+    end
+    
+    context "with a non-existant configuration file" do
+      should "raise an exception" do
+        Rubius::Authenticator.any_instance.stubs(:init_from_config).raises(Rubius::MissingConfiguration)
+        
+        assert_raises Rubius::MissingConfiguration do
+          Rubius::Rails.init('/bla')
+        end
+      end
+    end
+    
+    context "with a configuration file thats missing the current environment" do
+      should "raise an exception" do
+        Rubius::Authenticator.any_instance.stubs(:init_from_config).raises(Rubius::MissingEnvironmentConfiguration)
+        
+        assert_raises Rubius::MissingEnvironmentConfiguration do
+          Rubius::Rails.init('/bla')
+        end
+      end
+    end 
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: rubius
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ralph Rooding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -255,6 +255,72 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  requirement: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
+  name: autotest-standalone
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.5.5
+  type: :development
+  prerelease: false
+  version_requirements: *id028
 description: Rubius provides a simple interface to RADIUS authentication
 email: ralph@izerion.com
 executables: []
@@ -278,12 +344,15 @@ files:
 - lib/rubius.rb
 - lib/rubius/authenticator.rb
 - lib/rubius/dictionary.rb
+- lib/rubius/exceptions.rb
 - lib/rubius/packet.rb
 - lib/rubius/rails.rb
 - lib/rubius/string.rb
 - rubius.gemspec
 - test/helper.rb
+- test/test_authenticator.rb
 - test/test_dictionary.rb
+- test/test_rails.rb
 - test/test_string.rb
 has_rdoc: true
 homepage: http://github.com/rahvin/rubius
@@ -299,7 +368,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3471732790188196430
+      hash: -3168222850208807811
       segments: 
       - 0
       version: "0"
@@ -318,5 +387,7 @@ specification_version: 3
 summary: A simple ruby RADIUS authentication gem
 test_files: 
 - test/helper.rb
+- test/test_authenticator.rb
 - test/test_dictionary.rb
+- test/test_rails.rb
 - test/test_string.rb