radiustar 0.0.2 → 0.0.3

data/History.txt

@@ -1,2 +1,5 @@
+== 0.0.3 / 2010-06-30
+* no longer require to specify your own IP (via bwlang)
+
 == 0.0.1 / 2010-04-14
 * winning at radius

data/README.rdoc

@@ -44,7 +44,7 @@ Ruby Radius Library
 
   require 'radiustar'
 
-	req = Radiustar::Request.new('server', 'my_ip_address')
+	req = Radiustar::Request.new('server')
 	resp = req.authenticate('my_user', 'my_password', 'shared_secret')
 	resp #=> true
 

data/lib/radiustar/dictionary.rb

@@ -2,45 +2,66 @@ module Radiustar
 
   class Dictionary
 
+    include Radiustar
+
     DEFAULT_DICTIONARY_PATH = ::File.join(::File.dirname(__FILE__), '..', '..', 'templates', 'default.txt')
 
     def initialize(initial_path = nil)
       @attributes = AttributesCollection.new
+      @vendors = VendorCollection.new
 
       read initial_path if initial_path
     end
 
     def read(path)
       file = File.open(path) do |f|
+        current_vendor = nil
         f.each_line do |line|
         	next if line =~ /^\#/	# discard comments
         	split_line = line.split(/\s+/)
         	next if split_line == []
           case split_line.first.upcase
           when "ATTRIBUTE"
-            set_attr(split_line)
+            current_vendor.nil? ? set_attr(split_line) : set_vendor_attr(current_vendor, split_line)
           when "VALUE"
-            set_value(split_line)
+            current_vendor.nil? ? set_value(split_line) : set_vendor_value(current_vendor, split_line)
+          when "VENDOR"
+            add_vendor(split_line)
+          when "BEGIN-VENDOR"
+            current_vendor = set_vendor(split_line)
+          when "END-VENDOR"
+            current_vendor = nil
           end
         end
       end
+    end
 
-      def find_attribute_by_name(name)
-        @attributes.find_by_name(name)
-      end
+    def find_attribute_by_name(name)
+      @attributes.find_by_name(name)
+    end
 
-      def find_attribute_by_id(id)
-        @attributes.find_by_id(id)
-      end
+    def find_attribute_by_id(id)
+      @attributes.find_by_id(id)
+    end
 
-      def attribute_name_defined?(name)
-        !@attributes.find_by_name(name).nil?
-      end
+    def attribute_name_defined?(name)
+      !@attributes.find_by_name(name).nil?
+    end
 
-      def attribute_id_defined?(id)
-        !@attributes.find_by_id(id).nil?
-      end
+    def attribute_id_defined?(id)
+      !@attributes.find_by_id(id).nil?
+    end
+
+    def vendors
+      @vendors
+    end
+
+    def attributes
+      @attributes
+    end
 
+    def name
+      "Dictionary"
     end
 
     class << self
@@ -61,6 +82,22 @@ module Radiustar
       @attributes.find_by_name(line[1]).add_value(line[2], line[3])
     end
 
+    def add_vendor(line)
+      @vendors.add(line[2], line[1])
+    end
+
+    def set_vendor(line)
+      @vendors.find_by_name(line[1])
+    end
+
+    def set_vendor_attr(vendor, line)
+      vendor.add_attribute(line[1], line[2], line[3])
+    end
+
+    def set_vendor_value(vendor, line)
+      vendor.find_attribute_by_name(line[1]).add_value(line[2], line[3])
+    end
+
   end
 
 end

data/lib/radiustar/dictionary/attributes.rb

@@ -1,6 +1,6 @@
 module Radiustar
 
-  class AttributesCollection
+  class AttributesCollection < Array
 
     def initialize
       @collection = {}
@@ -10,6 +10,7 @@ module Radiustar
     def add(name, id, type)
       @collection[name] ||= Attribute.new(name, id.to_i, type)
       @revcollection[id.to_i] ||= @collection[name]
+      self << @collection[name]
     end
 
     def find_by_name(name)
@@ -24,6 +25,8 @@ module Radiustar
 
   class Attribute
 
+    include Radiustar
+
     attr_reader :name, :id, :type
 
     def initialize(name, id, type)
@@ -49,6 +52,10 @@ module Radiustar
       !@values.empty?
     end
 
+    def values
+      @values
+    end
+
   end
 
 end

data/lib/radiustar/dictionary/values.rb

@@ -1,6 +1,6 @@
 module Radiustar
 
-  class ValuesCollection
+  class ValuesCollection < Array
 
     def initialize
       @collection = {}
@@ -10,6 +10,7 @@ module Radiustar
     def add(name, id)
       @collection[name] ||= Value.new(name, id)
       @revcollection[id.to_i] ||= @collection[name]
+      self << @collection[name]
     end
 
     def find_by_name(name)
@@ -27,6 +28,9 @@ module Radiustar
   end
 
   class Value
+
+    include Radiustar
+
     attr_accessor :name
 
     def initialize(name, id)

data/lib/radiustar/packet.rb

@@ -112,7 +112,7 @@ module Radiustar
         attribute_type = attribute_type.to_i
 
         attribute = @dict.find_attribute_by_id(attribute_type)
-        attribute_value = case attribute.type
+        attribute_value = case attribute.class
         when 'string'
           attribute_value
         when 'integer'

data/lib/radiustar/radiustar.rb

@@ -1,3 +1,7 @@
 module Radiustar
 
+  def inspect
+    "#<#{self.class}:#{self.name}>"
+  end
+
 end

data/lib/radiustar/request.rb

@@ -4,10 +4,13 @@ module Radiustar
 
   class Request
 
-    def initialize(server, my_ip, dict_file = nil)
+    def initialize(server, my_ip = nil, dict_file = nil)
       @dict = dict_file.nil? ? Dictionary.default : Dictionary.new(dict_file)
-      @my_ip = my_ip
+
       @host, @port = server.split(":")
+      
+      @my_ip = my_ip || get_my_ip(@host)
+
       @port = Socket.getservbyname("radius", "udp") unless @port
       @port = 1812 unless @port
       @port = @port.to_i	# just in case
@@ -60,6 +63,18 @@ module Radiustar
       Packet.new(@dict, Process.pid & 0xff, data[0])
     end
 
+    #looks up the source IP address with a route to the specified destination
+    def get_my_ip(dest_address)
+      orig_reverse_lookup_setting = Socket.do_not_reverse_lookup
+      Socket.do_not_reverse_lookup = true
+
+      UDPSocket.open do |sock|
+        sock.connect dest_address, 1
+        sock.addr.last
+      end
+    ensure
+       Socket.do_not_reverse_lookup = orig_reverse_lookup_setting
+    end
 
   end
 

data/lib/radiustar/vendor.rb

@@ -0,0 +1,60 @@
+module Radiustar
+
+  class VendorCollection < Array
+
+    def initialize
+      @collection = {}
+      @revcollection = []
+    end
+
+    def add(id, name)
+      @collection[name] ||= Vendor.new(name, id)
+      @revcollection[id.to_i] ||= @collection[name]
+      self << @collection[name]
+    end
+
+    def find_by_name(name)
+      @collection[name]
+    end
+
+    def find_by_id(id)
+      @revcollection[id.to_i]
+    end
+
+  end
+
+  class Vendor
+
+    include Radiustar
+
+    attr_reader :name, :id
+
+    def initialize(name, id)
+      @name = name
+      @id = id
+      @attributes = AttributesCollection.new
+    end
+
+    def add_attribute(name, id, type)
+      @attributes.add(name, id, type)
+    end
+
+    def find_attribute_by_name(name)
+      @attributes.find_by_name(name)
+    end
+
+    def find_attribute_by_id(id)
+      @attributes.find_by_id(id.to_i)
+    end
+
+    def has_attributes?
+      !@attributes.empty?
+    end
+
+    def attributes
+      @attributes
+    end
+
+  end
+
+end

data/radiustar.gemspec

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{radiustar}
+  s.version = "0.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["PJ Davis"]
+  s.date = %q{2010-06-30}
+  s.description = %q{Ruby Radius Library}
+  s.email = %q{pj.davis@gmail.com}
+  s.extra_rdoc_files = ["History.txt", "README.rdoc", "templates/default.txt", "version.txt"]
+  s.files = [".gitignore", "History.txt", "README.rdoc", "Rakefile", "lib/radiustar.rb", "lib/radiustar/dictionary.rb", "lib/radiustar/dictionary/attributes.rb", "lib/radiustar/dictionary/values.rb", "lib/radiustar/packet.rb", "lib/radiustar/radiustar.rb", "lib/radiustar/request.rb", "lib/radiustar/vendor.rb", "radiustar.gemspec", "spec/radiustar_spec.rb", "spec/spec_helper.rb", "templates/default.txt", "templates/dictionary.digium", "templates/gandalf.dictionary", "test/test_radiustar.rb", "version.txt"]
+  s.homepage = %q{http://github.com/pjdavis/radiustar}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{radiustar}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby Radius Library}
+  s.test_files = ["test/test_radiustar.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bones>, [">= 3.4.1"])
+    else
+      s.add_dependency(%q<bones>, [">= 3.4.1"])
+    end
+  else
+    s.add_dependency(%q<bones>, [">= 3.4.1"])
+  end
+end

data/templates/dictionary.digium

@@ -0,0 +1,36 @@
+# -*- text -*-
+##############################################################################
+#
+#       Digium's Asterisk specific radius attributes
+#	markster@digium.com
+#
+#	http://bugs.digium.com/file_download.php\?file_id=9688\&type=bug
+#
+#	$Id$
+#
+##############################################################################
+
+VENDOR		Digium				22736
+
+BEGIN-VENDOR	Digium
+
+ATTRIBUTE	Asterisk-Acc-Code			101	string
+ATTRIBUTE	Asterisk-Src				102	string
+ATTRIBUTE	Asterisk-Dst				103	string
+ATTRIBUTE	Asterisk-Dst-Ctx			104	string
+ATTRIBUTE	Asterisk-Clid				105	string
+ATTRIBUTE	Asterisk-Chan				106	string
+ATTRIBUTE	Asterisk-Dst-Chan			107	string
+ATTRIBUTE	Asterisk-Last-App			108	string
+ATTRIBUTE	Asterisk-Last-Data			109	string
+ATTRIBUTE	Asterisk-Start-Time			110	string
+ATTRIBUTE	Asterisk-Answer-Time			111	string
+ATTRIBUTE	Asterisk-End-Time			112	string
+ATTRIBUTE	Asterisk-Duration			113	integer
+ATTRIBUTE	Asterisk-Bill-Sec			114	integer
+ATTRIBUTE	Asterisk-Disposition			115	string
+ATTRIBUTE	Asterisk-AMA-Flags			116	string
+ATTRIBUTE	Asterisk-Unique-ID			117	string
+ATTRIBUTE	Asterisk-User-Field			118	string
+
+END-VENDOR	Digium

data/templates/gandalf.dictionary

@@ -0,0 +1,105 @@
+# -*- text -*-
+#  Gandalf dictionary
+#
+# Version:	1.00	24-July-2003 Blaise St-Laurent <bstlaurent@okiok.com>
+#
+#	Notes: Dictionary was made specifically for the Gandalf XpressWay
+#		RLAN with Link Authentication through RADIUS
+#
+#	$Id$
+#
+VENDOR		Gandalf				64
+
+#
+#	Vendor-specific attributes
+#
+BEGIN-VENDOR	Gandalf
+
+ATTRIBUTE	Gandalf-Remote-LAN-Name			0	string
+ATTRIBUTE	Gandalf-Operational-Modes		1	integer
+ATTRIBUTE	Gandalf-Compression-Status		2	integer
+ATTRIBUTE	Gandalf-Min-Outgoing-Bearer		3	integer
+ATTRIBUTE	Gandalf-Authentication-String		5	string
+ATTRIBUTE	Gandalf-PPP-Authentication		6	integer
+ATTRIBUTE	Gandalf-PPP-NCP-Type			7	integer
+ATTRIBUTE	Gandalf-Fwd-Multicast-In		8	integer
+ATTRIBUTE	Gandalf-Fwd-Broadcast-In		9	integer
+ATTRIBUTE	Gandalf-Fwd-Unicast-In			10	integer
+ATTRIBUTE	Gandalf-Fwd-Multicast-Out		11	integer
+ATTRIBUTE	Gandalf-Fwd-Broadcast-Out		12	integer
+ATTRIBUTE	Gandalf-Fwd-Unicast-Out			13	integer
+ATTRIBUTE	Gandalf-Around-The-Corner		14	integer
+ATTRIBUTE	Gandalf-Channel-Group-Name-1		15	string
+ATTRIBUTE	Gandalf-Dial-Prefix-Name-1		16	string
+ATTRIBUTE	Gandalf-Phone-Number-1			17	string
+ATTRIBUTE	Gandalf-Calling-Line-ID-1		18	string
+ATTRIBUTE	Gandalf-Channel-Group-Name-2		19	string
+ATTRIBUTE	Gandalf-Dial-Prefix-Name-2		20	string
+ATTRIBUTE	Gandalf-Phone-Number-2			21	string
+ATTRIBUTE	Gandalf-Calling-Line-ID-2		22	string
+ATTRIBUTE	Gandalf-IPX-Spoofing-State		23	integer
+ATTRIBUTE	Gandalf-IPX-Watchdog-Spoof		24	integer
+ATTRIBUTE	Gandalf-SAP-Group-Name-1		25	string
+ATTRIBUTE	Gandalf-SAP-Group-Name-2		26	string
+ATTRIBUTE	Gandalf-SAP-Group-Name-3		27	string
+ATTRIBUTE	Gandalf-SAP-Group-Name-4		28	string
+ATTRIBUTE	Gandalf-SAP-Group-Name-5		29	string
+ATTRIBUTE	Gandalf-Hunt-Group			30	string
+ATTRIBUTE	Gandalf-Modem-Mode			31	integer
+ATTRIBUTE	Gandalf-Modem-Required-1		32	integer
+ATTRIBUTE	Gandalf-Modem-Required-2		33	integer
+
+VALUE	Gandalf-Operational-Modes	Disabled		1
+VALUE	Gandalf-Operational-Modes	Called-Only		2
+VALUE	Gandalf-Operational-Modes	Calling-Called		3
+VALUE	Gandalf-Operational-Modes	Calling-Only		4
+
+VALUE	Gandalf-Compression-Status	Disabled		1
+VALUE	Gandalf-Compression-Status	Enabled			2
+
+VALUE	Gandalf-Min-Outgoing-Bearer	Unrestricted-64K	1
+VALUE	Gandalf-Min-Outgoing-Bearer	Digital-56K		2
+VALUE	Gandalf-Min-Outgoing-Bearer	3100Hz-Audio		3
+
+VALUE	Gandalf-PPP-Authentication	CHAP			1
+VALUE	Gandalf-PPP-Authentication	PAP			2
+VALUE	Gandalf-PPP-Authentication	PAP-Sending-on-Incoming-Calls 3
+
+VALUE	Gandalf-PPP-NCP-Type		BCP			2
+VALUE	Gandalf-PPP-NCP-Type		IPCP			3
+
+VALUE	Gandalf-Fwd-Multicast-In	Disabled		1
+VALUE	Gandalf-Fwd-Multicast-In	Enabled			2
+
+VALUE	Gandalf-Fwd-Broadcast-In	Disabled		1
+VALUE	Gandalf-Fwd-Broadcast-In	Enabled			2
+
+VALUE	Gandalf-Fwd-Unicast-In		Disabled		1
+VALUE	Gandalf-Fwd-Unicast-In		Enabled			2
+
+VALUE	Gandalf-Fwd-Multicast-Out	Disabled		1
+VALUE	Gandalf-Fwd-Multicast-Out	Enabled			2
+
+VALUE	Gandalf-Fwd-Broadcast-Out	Disabled		1
+VALUE	Gandalf-Fwd-Broadcast-Out	Enabled			2
+
+VALUE	Gandalf-Fwd-Unicast-Out		Disabled		1
+VALUE	Gandalf-Fwd-Unicast-Out		Enabled			2
+
+VALUE	Gandalf-IPX-Spoofing-State	Forward			1
+VALUE	Gandalf-IPX-Spoofing-State	Spoof			2
+VALUE	Gandalf-IPX-Spoofing-State	Filter-all-outgoing-RIP-SAP 3
+
+VALUE	Gandalf-IPX-Watchdog-Spoof	Disabled		1
+VALUE	Gandalf-IPX-Watchdog-Spoof	Enabled			2
+
+VALUE	Gandalf-Modem-Mode		Disabled		1
+VALUE	Gandalf-Modem-Mode		Enabled			2
+
+VALUE	Gandalf-Modem-Required-1	Disabled		1
+VALUE	Gandalf-Modem-Required-1	Enabled			2
+
+VALUE	Gandalf-Modem-Required-2	Disabled		1
+VALUE	Gandalf-Modem-Required-2	Enabled			2
+
+END-VENDOR	Gandalf

data/version.txt

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - PJ Davis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -05:00
+date: 2010-06-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,13 @@ files:
 - lib/radiustar/packet.rb
 - lib/radiustar/radiustar.rb
 - lib/radiustar/request.rb
+- lib/radiustar/vendor.rb
+- radiustar.gemspec
 - spec/radiustar_spec.rb
 - spec/spec_helper.rb
 - templates/default.txt
+- templates/dictionary.digium
+- templates/gandalf.dictionary
 - test/test_radiustar.rb
 - version.txt
 has_rdoc: true