radiustar 0.0.3 → 0.0.5

data/History.txt

@@ -1,3 +1,14 @@
+== 0.0.5 / 2012-02-02
+* Bugfixes(charl, Mark Bryars, jamesotron, dguerri, gderosa, mkocher)
+* You can now use VSAs in packets (jamesotron)
+* Add support for CoA and Disconnect Packets (Mark Bryars)
+
+== 0.0.4 / 2010-12/04
+* github fork (dguerri)
+* bugfixes
+* added multiple dictionary files support (dguerri)
+* added accounting support
+
 == 0.0.3 / 2010-06-30
 * no longer require to specify your own IP (via bwlang)
 

data/README.rdoc

@@ -32,27 +32,50 @@ Ruby Radius Library
 
 == FEATURES
 
-* Import your own radius dictionary
-* Test authentication
-* Check radius replies
-
-== COMING SOON
-
-* Use vendor specific attributes
+* Import your own radius dictionaries
+* Authentication
+* Accounting
 
 == SYNOPSIS:
 
+  require 'rubygems'
   require 'radiustar'
 
-	req = Radiustar::Request.new('server')
-	resp = req.authenticate('my_user', 'my_password', 'shared_secret')
-	resp #=> true
-
-	attrs = req.get_attributes('my_user', 'my_password', 'shared_secret')
-	attrs #=> ["Access-Accept", {"Service-Type"=>"Framed-User",
-						                   "Framed-Protocol"=>"PPP",
-						 									 "Framed-IP-Address"=>"255.255.255.254",
-															 "Framed-IP-Netmask"=>"255.255.255.255"} ]
+  # Load dictionaries from freeradius directory
+  dict = Radiustar::Dictionary.new('/usr/share/freeradius/')
+
+  # Lets get authenticated
+  auth_custom_attr = {
+    'Framed-Address'  => '127.0.0.1',
+    'NAS-Port'        => 0,
+    'NAS-Port-Type'   => 'Ethernet'
+  }
+
+  req = Radiustar::Request.new('127.0.0.1', { :dict => dict })
+  reply = req.authenticate('John Doe', 'hello', 'testing123', auth_custom_attr)
+
+  if reply[:code] == 'Access-Accept'
+    req = Radiustar::Request.new('127.0.0.1:1813', { :dict => dict })
+    
+    acct_custom_attr = {
+      'Framed-Address'  => '127.0.0.1',
+      'NAS-Port'        => 0,
+      'NAS-Port-Type'   => 'Ethernet',
+      'Acct-Session-Time' => 0
+    }
+    
+    timings = Time.now
+    reply = req.accounting_start('John Doe', 'testing123', '123456', acct_custom_attr)
+    
+    sleep(rand 5)
+    acct_custom_attr['Acct-Session-Time'] = Time.now - timings
+    reply = req.accounting_update('John Doe', 'testing123', '123456', acct_custom_attr)
+    
+    sleep(rand 5)
+    acct_custom_attr['Acct-Session-Time'] = Time.now - timings
+    reply = req.accounting_stop('John Doe', 'testing123', '123456', acct_custom_attr)
+
+  end
 
 == REQUIREMENTS:
 
@@ -62,6 +85,17 @@ Ruby Radius Library
 
 	gem install radiustar
 
+== Thanks:
+Thanks to everyone who has contributed to this project. Without your help and support, this would not have been possible.
+
+* charl
+* Mark Bryars
+* jamesotron
+* dguerri
+* gderosa
+* mkocher
+* bwlang
+
 == LICENSE:
 
 Copyright (c) 2010 [PJ Davis], released under the CC0 1.0 Universal license.

data/Rakefile

@@ -9,12 +9,12 @@ task :default => 'test:run'
 task 'gem:release' => 'test:run'
 
 Bones {
-  name  'radiustar'
-  authors       'PJ Davis'
-  email         'pj.davis@gmail.com'
-  url           'http://github.com/pjdavis/radiustar'
-  ignore_file   '.gitignore'
-  readme_file   'README.rdoc'
-
+  name        'radiustar'
+  authors     'PJ Davis'
+  email       'pj.davis@gmail.com'
+  url         'http://github.com/pjdavis/radiustar'
+  ignore_file '.gitignore'
+  readme_file 'README.rdoc'
+  depend_on 'ipaddr_extensions'
 }
 

data/lib/radiustar/dictionary.rb

@@ -4,38 +4,25 @@ module Radiustar
 
     include Radiustar
 
-    DEFAULT_DICTIONARY_PATH = ::File.join(::File.dirname(__FILE__), '..', '..', 'templates', 'default.txt')
+    DEFAULT_DICTIONARIES_PATH = ::File.join(::File.dirname(__FILE__), '..', '..', 'templates')
 
     def initialize(initial_path = nil)
       @attributes = AttributesCollection.new
       @vendors = VendorCollection.new
 
-      read initial_path if initial_path
+      read_files 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"
-            current_vendor.nil? ? set_attr(split_line) : set_vendor_attr(current_vendor, split_line)
-          when "VALUE"
-            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
+    def read_files(path)
+      dict_files = File.join(path, "*")
+      Dir.glob(dict_files) { |file|
+        read_attributes(file)
+      }
+      Dir.glob(dict_files) { |file|
+        read_values(file)
+      }
     end
-
+    
     def find_attribute_by_name(name)
       @attributes.find_by_name(name)
     end
@@ -67,9 +54,59 @@ module Radiustar
     class << self
 
       def default
-        new DEFAULT_DICTIONARY_PATH
+        new DEFAULT_DICTIONARIES_PATH
+      end
+
+    end
+
+    protected
+    
+    def read_attributes(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"
+            current_vendor.nil? ? set_attr(split_line) : set_vendor_attr(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 read_values(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 "VALUE"
+            if current_vendor.nil?
+              set_value(split_line)
+            else
+              begin
+                set_vendor_value(current_vendor, split_line)
+              rescue
+                set_value(split_line)
+              end
+            end
+          when "BEGIN-VENDOR"
+            current_vendor = set_vendor(split_line)
+          when "END-VENDOR"
+            current_vendor = nil
+          end
+        end
+      end
     end
 
     private
@@ -100,4 +137,4 @@ module Radiustar
 
   end
 
-end
+end

data/lib/radiustar/dictionary/attributes.rb

@@ -2,13 +2,20 @@ module Radiustar
 
   class AttributesCollection < Array
 
-    def initialize
+    attr_accessor :vendor
+
+    def initialize vendor=nil
       @collection = {}
-      @revcollection = []
+      @revcollection = {}
+      @vendor = vendor if vendor
     end
 
     def add(name, id, type)
-      @collection[name] ||= Attribute.new(name, id.to_i, type)
+      if vendor?
+        @collection[name] ||= Attribute.new(name, id.to_i, type, @vendor)
+      else
+        @collection[name] ||= Attribute.new(name, id.to_i, type)
+      end
       @revcollection[id.to_i] ||= @collection[name]
       self << @collection[name]
     end
@@ -18,7 +25,11 @@ module Radiustar
     end
 
     def find_by_id(id)
-      @revcollection[id.to_i]
+      @revcollection[id]
+    end
+
+    def vendor?
+      !!@vendor
     end
 
   end
@@ -27,13 +38,14 @@ module Radiustar
 
     include Radiustar
 
-    attr_reader :name, :id, :type
+    attr_reader :name, :id, :type, :vendor
 
-    def initialize(name, id, type)
+    def initialize(name, id, type, vendor=nil)
       @values = ValuesCollection.new
       @name = name
       @id = id.to_i
       @type = type
+      @vendor = vendor if vendor
     end
 
     def add_value(name, id)
@@ -56,6 +68,10 @@ module Radiustar
       @values
     end
 
+    def vendor?
+      !!@vendor
+    end
+
   end
 
-end
+end

data/lib/radiustar/dictionary/values.rb

@@ -4,7 +4,7 @@ module Radiustar
 
     def initialize
       @collection = {}
-      @revcollection = []
+      @revcollection = {}
     end
 
     def add(name, id)
@@ -31,7 +31,7 @@ module Radiustar
 
     include Radiustar
 
-    attr_accessor :name
+    attr_accessor :name, :id
 
     def initialize(name, id)
       @name = name
@@ -40,4 +40,4 @@ module Radiustar
 
   end
 
-end
+end

data/lib/radiustar/packet.rb

@@ -1,13 +1,17 @@
 module Radiustar
 
   require 'digest/md5'
+  require 'ipaddr_extensions'
 
   class Packet
 
     CODES = { 'Access-Request' => 1,        'Access-Accept' => 2,
               'Access-Reject' => 3,         'Accounting-Request' => 4,
               'Accounting-Response' => 5,   'Access-Challenge' => 11,
-              'Status-Server' => 12,        'Status-Client' => 13 }
+              'Status-Server' => 12,        'Status-Client' => 13,
+              'Disconnect-Request' => 40,   'Disconnect-ACK' => 41,
+              'Disconnect-NAK' => 42,       'CoA-Request' => 43,
+              'CoA-ACK' => 44,              'CoA-NAK' => 45 }
 
 
     HDRLEN = 1 + 1 + 2 + 16	# size of packet header
@@ -15,7 +19,7 @@ module Radiustar
     P_ATTR = "CCa*"		# pack template for attribute
 
     attr_accessor :code
-    attr_reader :id, :attributes
+    attr_reader :id, :attributes, :authenticator
 
     def initialize(dictionary, id, data = nil)
       @dict = dictionary
@@ -38,63 +42,100 @@ module Radiustar
 
     # Generate an authenticator. It will try to use /dev/urandom if
     # possible, or the system rand call if that's not available.
-    def gen_authenticator
-      authenticator = []
-      8.times do
-        authenticator << rand(65536)
-      end
-      authenticator.pack("n8")
+    def gen_auth_authenticator
       if (File.exist?("/dev/urandom"))
         File.open("/dev/urandom") do |urandom|
-          authenticator = urandom.read(16)
+          @authenticator = urandom.read(16)
+        end
+      else
+        @authenticator = []
+        8.times do
+          @authenticator << rand(65536)
         end
+        @authenticator = @authenticator.pack("n8")
+      end
+    end
+
+    def gen_acct_authenticator(secret)
+      # From RFC2866
+      # Request Authenticator
+      # 
+      #       In Accounting-Request Packets, the Authenticator value is a 16
+      #       octet MD5 [5] checksum, called the Request Authenticator.
+      # 
+      #       The NAS and RADIUS accounting server share a secret.  The Request
+      #       Authenticator field in Accounting-Request packets contains a one-
+      #       way MD5 hash calculated over a stream of octets consisting of the
+      #       Code + Identifier + Length + 16 zero octets + request attributes +
+      #       shared secret (where + indicates concatenation).  The 16 octet MD5
+      #       hash value is stored in the Authenticator field of the
+      #       Accounting-Request packet.
+      # 
+      #       Note that the Request Authenticator of an Accounting-Request can
+      #       not be done the same way as the Request Authenticator of a RADIUS
+      #       Access-Request, because there is no User-Password attribute in an
+      #       Accounting-Request.
+      #       
+      @authenticator = "\000"*16
+      @authenticator = Digest::MD5.digest(pack + secret)
+      @packed = nil
+      @authenticator
+    end
+
+    def gen_response_authenticator(secret, request_authenticator)
+      @authenticator = request_authenticator
+      @authenticator = Digest::MD5.digest(pack + secret)
+      @packed = nil
+      @authenticator
+    end
+
+    def validate_acct_authenticator(secret)
+      if @authenticator
+        original_authenticator = @authenticator
+        if gen_acct_authenticator(secret) == original_authenticator
+          true
+        else
+          @authenticator = original_authenticator
+          false
+        end
+      else
+        false
       end
-      @authenticator = authenticator
     end
 
     def set_attribute(name, value)
-      @attributes[name] = value
+      @attributes[name] = Attribute.new(@dict, name, value)
     end
 
     def unset_attribute(name)
-      @attributes[name] = nil
+      @attributes.delete(name)
     end
 
     def attribute(name)
-      @attributes[name]
+      if @attributes[name]
+        @attributes[name].value
+      end
     end
 
     def unset_all_attributes
-      @attributes = Hash.new
+      @attributes = {}
     end
 
     def set_encoded_attribute(name, value, secret)
-      @attributes[name] = encode(value, secret)
+      @attributes[name] = Attribute.new(@dict, name, encode(value, secret))
     end
 
-    def pack
+    def decode_attribute(name, secret)
+      if @attributes[name]
+        decode(@attributes[name].value.to_s, secret)
+      end
+    end
 
+    def pack
       attstr = ""
-      @attributes.each_pair do |attribute, value|
-        attribute = @dict.find_attribute_by_name(attribute)
-        anum = attribute.id
-        val = case attribute.type
-        when "string"
-          value
-        when "integer"
-          [attribute.has_values? ? attribute.find_values_by_id(value) : value].pack("N")
-        when "ipaddr"
-          [inet_aton(value)].pack("N")
-        when "date"
-          [value].pack("N")
-        when "time"
-          [value].pack("N")
-        else
-          next
-        end
-        attstr += [attribute.id, val.length + 2, val].pack(P_ATTR)
+      @attributes.values.each do |attribute|
+        attstr += attribute.pack
       end
-
       @packed = [CODES[@code], @id, attstr.length + HDRLEN, @authenticator, attstr].pack(P_HDR)
     end
 
@@ -102,7 +143,10 @@ module Radiustar
 
     def unpack
       @code, @id, len, @authenticator, attribute_data = @packed.unpack(P_HDR)
-      @code = CODES.index(@code)
+      raise "Incomplete Packet(read #{@packed.length} != #{len})" if @packed.length != len
+
+      @code = CODES.key(@code)
+      vendor = nil
 
       unset_all_attributes
 
@@ -111,41 +155,43 @@ module Radiustar
         attribute_type, attribute_value = attribute_data.unpack("Cxa#{length-2}")
         attribute_type = attribute_type.to_i
 
-        attribute = @dict.find_attribute_by_id(attribute_type)
-        attribute_value = case attribute.class
+        if attribute_type == 26 # Vendor Specific Attribute
+          vid, attribute_type, attribute_value = attribute_data.unpack("xxNCxa#{length-6}")
+          vendor =  @dict.vendors.find_by_id(vid)
+          attribute = vendor.find_attribute_by_id(attribute_type)
+        else
+          vendor = nil
+          attribute = @dict.find_attribute_by_id(attribute_type)
+        end
+
+        attribute_value = case attribute.type
         when 'string'
           attribute_value
         when 'integer'
           attribute.has_values? ? attribute.find_values_by_id(attribute_value.unpack("N")[0]).name : attribute_value.unpack("N")[0]
         when 'ipaddr'
-          inet_ntoa(attribute_value.unpack("N")[0])
+          attribute_value.unpack("N")[0].to_ip.to_s
         when 'time'
           attribute_value.unpack("N")[0]
         when 'date'
           attribute_value.unpack("N")[0]
         end
 
-        set_attribute(attribute.name, attribute_value) if attribute
-        attribute_data[0, length] = ""
-      end
-    end
+        if vendor
+          set_attribute(vendor.name+"/"+attribute.name, attribute_value) if attribute
+        else
+          set_attribute(attribute.name, attribute_value) if attribute
+        end
 
-    def inet_aton(hostname)
-      if (hostname =~ /([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/)
-        return (($1.to_i & 0xff) << 24) + (($2.to_i & 0xff) << 16) + (($3.to_i & 0xff) << 8) + (($4.to_i & 0xff))
+        attribute_data[0, length] = ""
       end
-      0
-    end
-
-    def inet_ntoa(iaddr)
-      sprintf("%d.%d.%d.%d", (iaddr >> 24) & 0xff, (iaddr >> 16) & 0xff, (iaddr >> 8) & 0xff, (iaddr) & 0xff)
     end
 
     def xor_str(str1, str2)
       i = 0
       newstr = ""
       str1.each_byte do |c1|
-        c2 = str2[i]
+        c2 = str2.bytes.to_a[i]
         newstr = newstr << (c1 ^ c2)
         i = i+1
       end
@@ -168,7 +214,7 @@ module Radiustar
       decoded_value = ""
       lastround = @authenticator
       0.step(value.length-1, 16) do |i|
-	      decoded_value = xor_str(value[i, 16], Digest::MD5.digest(secret + lastround))
+	      decoded_value += xor_str(value[i, 16], Digest::MD5.digest(secret + lastround))
 	      lastround = value[i, 16]
       end
 
@@ -177,5 +223,92 @@ module Radiustar
       return decoded_value
     end
 
+    class Attribute
+
+      attr_reader :dict, :name, :vendor
+      attr_accessor :value
+
+      def initialize dict, name, value, vendor=nil
+        @dict = dict
+        # This is the cheapest and easiest way to add VSA's!
+        if (name && (chunks = name.split('/')) && (chunks.size == 2))
+          @vendor = chunks[0]
+          @name = chunks[1]
+        else
+          @name = name
+        end
+        @vendor ||= vendor
+        @value = value.is_a?(Attribute) ? value.to_s : value
+      end
+
+      def vendor?
+        !!@vendor
+      end
+
+      def pack
+        attribute = if (vendor? && (@dict.vendors.find_by_name(@vendor)))
+                      @dict.vendors.find_by_name(@vendor).attributes.find_by_name(@name)
+                    else
+                      @dict.find_attribute_by_name(@name)
+                    end
+        raise "Undefined attribute '#{@name}'." if attribute.nil?
+
+        if vendor?
+          pack_vendor_specific_attribute attribute
+        else
+          pack_attribute attribute
+        end
+      end
+
+      def inspect
+        @value
+      end
+
+      def to_s
+        @value
+      end
+
+      private
+
+      def pack_vendor_specific_attribute attribute
+        inside_attribute = pack_attribute attribute
+        vid = attribute.vendor.id.to_i
+        header = [ 26, inside_attribute.size + 6 ].pack("CC") # 26: Type = Vendor-Specific, 4: length of Vendor-Id field
+        header += [ 0, vid >> 16, vid >> 8, vid ].pack("CCCC") # first byte of Vendor-Id is 0
+        header + inside_attribute
+      end
+
+      def pack_attribute attribute
+        anum = attribute.id
+        val = case attribute.type
+              when "string"
+                @value
+              when "integer"
+                raise "Invalid value name '#{@value}'." if attribute.has_values? && attribute.find_values_by_name(@value).nil?
+                [attribute.has_values? ? attribute.find_values_by_name(@value).id : @value].pack("N")
+              when "ipaddr"
+                [@value.to_ip.to_i].pack("N")
+              when "ipv6addr"
+                ipi = @value.to_ip.to_i
+                [ ipi >> 96, ipi >> 64, ipi >> 32, ipi ].pack("NNNN")
+              when "date"
+                [@value].pack("N")
+              when "time"
+                [@value].pack("N")
+              else
+                ""
+              end
+        begin
+        [anum, 
+          val.length + 2, 
+          val
+        ].pack(P_ATTR)
+        rescue 
+          puts "#{@name} => #{@value}"
+          puts [anum, val.length + 2, val].inspect
+        end
+      end
+
+    end
   end
-end
+end

data/lib/radiustar/request.rb

@@ -4,12 +4,14 @@ module Radiustar
 
   class Request
 
-    def initialize(server, my_ip = nil, dict_file = nil)
-      @dict = dict_file.nil? ? Dictionary.default : Dictionary.new(dict_file)
+    def initialize(server, options = {})
+      @dict = options[:dict].nil? ? Dictionary.default : options[:dict]
+      @nas_ip = options[:nas_ip] || get_my_ip(@host)
+      @nas_identifier = options[:nas_identifier] || @nas_ip
+      @reply_timeout = options[:reply_timeout].nil? ? 60 : options[:reply_timeout].to_i
+      @retries_number = options[:retries_number].nil? ? 1 : options[:retries_number].to_i
 
       @host, @port = server.split(":")
-      
-      @my_ip = my_ip || get_my_ip(@host)
 
       @port = Socket.getservbyname("radius", "udp") unless @port
       @port = 1812 unless @port
@@ -18,29 +20,104 @@ module Radiustar
       @socket.connect(@host, @port)
     end
 
-    def authenticate(name, password, secret)
+    def authenticate(name, password, secret, user_attributes = {})
       @packet = Packet.new(@dict, Process.pid & 0xff)
+      @packet.gen_auth_authenticator
       @packet.code = 'Access-Request'
-      @packet.gen_authenticator
       @packet.set_attribute('User-Name', name)
-      @packet.set_attribute('NAS-IP-Address', @my_ip)
+      @packet.set_attribute('NAS-Identifier', @nas_identifier)
+      @packet.set_attribute('NAS-IP-Address', @nas_ip)
       @packet.set_encoded_attribute('User-Password', password, secret)
-      send_packet
-      @recieved_packet = recv_packet
-      return @recieved_packet.code == 'Access-Accept'
+
+      user_attributes.each_pair do |name, value|
+        @packet.set_attribute(name, value)
+      end
+
+      retries = @retries_number
+      begin
+        send_packet
+        @received_packet = recv_packet(@reply_timeout)
+      rescue Exception => e
+        retry if (retries -= 1) > 0
+        raise
+      end
+
+      reply = { :code => @received_packet.code }
+      reply.merge @received_packet.attributes
     end
+    
+    def accounting_request(status_type, name, secret, sessionid, user_attributes = {})
 
-    def get_attributes(name, password, secret)
       @packet = Packet.new(@dict, Process.pid & 0xff)
-      @packet.code = 'Access-Request'
-      @packet.gen_authenticator
+      @packet.code = 'Accounting-Request'
+
       @packet.set_attribute('User-Name', name)
-      @packet.set_attribute('NAS-IP-Address', @my_ip)
-      @packet.set_encoded_attribute('User-Password', password, secret)
-      send_packet
-      @recieved_packet = recv_packet
-      recieved_thing = [@recieved_packet.code]
-      recieved_thing << @recieved_packet.attributes
+      @packet.set_attribute('NAS-Identifier', @nas_identifier)
+      @packet.set_attribute('NAS-IP-Address', @nas_ip)
+      @packet.set_attribute('Acct-Status-Type', status_type)
+      @packet.set_attribute('Acct-Session-Id', sessionid)
+      @packet.set_attribute('Acct-Authentic', 'RADIUS')
+
+      user_attributes.each_pair do |name, value|
+        @packet.set_attribute(name, value)
+      end
+
+      @packet.gen_acct_authenticator(secret)
+
+      retries = @retries_number
+      begin
+        send_packet
+        @received_packet = recv_packet(@reply_timeout)
+      rescue Exception => e
+        retry if (retries -= 1) > 0
+        raise
+      end
+
+      return true
+    end
+
+    def generic_request(code, secret, user_attributes = {})
+      @packet = Packet.new(@dict, Process.pid & 0xff)
+      @packet.code =  code
+      @packet.set_attribute('NAS-Identifier', @nas_identifier)
+      @packet.set_attribute('NAS-IP-Address', @nas_ip)
+
+      user_attributes.each_pair do |name, value|
+        @packet.set_attribute(name, value)
+      end
+
+      @packet.gen_acct_authenticator(secret)
+
+      retries = @retries_number
+      begin
+        send_packet
+        @received_packet = recv_packet(@reply_timeout)
+      rescue Exception => e
+        retry if (retries -= 1) > 0
+        raise
+      end
+
+      return true
+    end
+
+    def coa_request(secret, user_attributes = {})
+      generic_request('CoA-Request', secret, user_attributes)
+    end
+
+    def disconnect_request(secret, user_attributes = {})
+      generic_request('Disconnect-Request', secret, user_attributes)
+    end
+
+    def accounting_start(name, secret, sessionid, options = {})
+      accounting_request('Start', name, secret, sessionid, options)
+    end
+
+    def accounting_update(name, secret, sessionid, options = {})
+      accounting_request('Interim-Update', name, secret, sessionid, options)
+    end
+
+    def accounting_stop(name, secret, sessionid, options = {})
+      accounting_request('Stop', name, secret, sessionid, options)
     end
 
     def inspect
@@ -51,15 +128,14 @@ module Radiustar
 
     def send_packet
       data = @packet.pack
-      @packet.increment_id
       @socket.send(data, 0)
     end
 
-    def recv_packet
-      if select([@socket], nil, nil, 60) == nil
-	      raise "Timed out waiting for response packet from server"
+    def recv_packet(timeout)
+      if select([@socket], nil, nil, timeout.to_i) == nil
+        raise "Timed out waiting for response packet from server"
       end
-      data = @socket.recvfrom(64)
+      data = @socket.recvfrom(4096) # rfc2865 max packet length
       Packet.new(@dict, Process.pid & 0xff, data[0])
     end
 
@@ -78,4 +154,4 @@ module Radiustar
 
   end
 
-end
+end

data/lib/radiustar/vendor.rb

@@ -32,7 +32,7 @@ module Radiustar
     def initialize(name, id)
       @name = name
       @id = id
-      @attributes = AttributesCollection.new
+      @attributes = AttributesCollection.new self
     end
 
     def add_attribute(name, id, type)
@@ -57,4 +57,4 @@ module Radiustar
 
   end
 
-end
+end

data/radiustar.gemspec

@@ -1,34 +1,36 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{radiustar}
-  s.version = "0.0.3"
+  s.name = "radiustar"
+  s.version = "0.0.5"
 
   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.date = "2012-02-02"
+  s.description = "Ruby Radius Library"
+  s.email = "pj.davis@gmail.com"
+  s.extra_rdoc_files = ["History.txt", "README.rdoc", "templates/default.txt"]
+  s.files = ["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", "spec/value_spec.rb", "templates/default.txt", "templates/dictionary.digium", "templates/dictionary.rfc2865", "templates/gandalf.dictionary", "test/test_radiustar.rb", "version.txt"]
+  s.homepage = "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.rubyforge_project = "radiustar"
+  s.rubygems_version = "1.8.15"
+  s.summary = "."
   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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ipaddr_extensions>, [">= 2012.1.13"])
+      s.add_development_dependency(%q<bones>, [">= 3.7.3"])
     else
-      s.add_dependency(%q<bones>, [">= 3.4.1"])
+      s.add_dependency(%q<ipaddr_extensions>, [">= 2012.1.13"])
+      s.add_dependency(%q<bones>, [">= 3.7.3"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 3.4.1"])
+    s.add_dependency(%q<ipaddr_extensions>, [">= 2012.1.13"])
+    s.add_dependency(%q<bones>, [">= 3.7.3"])
   end
 end

data/spec/radiustar_spec.rb

@@ -1,6 +1,16 @@
-
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 
-describe Radiustar do
-end
+describe Radiustar::Packet do    
+  it "gen_authenticator generates a random string without /dev/urandom" do
+    File.stub(:exist?).and_return(false)
+    packet = Radiustar::Packet.new(nil, nil)
+    packet.gen_authenticator.class.should == String
+  end
 
+  if File.exist?("/dev/urandom") # don't fail if specs are running on a platform without /dev/urandom
+    it "gen_authenticator generates a random string with /dev/urandom" do
+      packet = Radiustar::Packet.new(nil, nil)
+      packet.gen_authenticator.class.should == String
+    end
+  end
+end

data/spec/value_spec.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe Radiustar::Value do    
+  it "should get numeric value of NAS-Port-Type == Ethernet from dictionary.rfc2865" do
+    dict = Radiustar::Dictionary.new
+    dict.read(File.dirname(__FILE__) + '/../templates/dictionary.rfc2865')
+    attribute = dict.find_attribute_by_name 'NAS-Port-Type'
+    ethernet_value = attribute.find_values_by_name 'Ethernet'
+    ethernet_value.id.should == 15
+  end
+end

data/templates/dictionary.rfc2865

@@ -0,0 +1,137 @@
+# -*- text -*-
+#
+#	Attributes and values defined in RFC 2865.
+#	http://www.ietf.org/rfc/rfc2865.txt
+#
+#	$Id$
+#
+ATTRIBUTE	User-Name				1	string
+ATTRIBUTE	User-Password				2	string encrypt=1
+ATTRIBUTE	CHAP-Password				3	octets
+ATTRIBUTE	NAS-IP-Address				4	ipaddr
+ATTRIBUTE	NAS-Port				5	integer
+ATTRIBUTE	Service-Type				6	integer
+ATTRIBUTE	Framed-Protocol				7	integer
+ATTRIBUTE	Framed-IP-Address			8	ipaddr
+ATTRIBUTE	Framed-IP-Netmask			9	ipaddr
+ATTRIBUTE	Framed-Routing				10	integer
+ATTRIBUTE	Filter-Id				11	string
+ATTRIBUTE	Framed-MTU				12	integer
+ATTRIBUTE	Framed-Compression			13	integer
+ATTRIBUTE	Login-IP-Host				14	ipaddr
+ATTRIBUTE	Login-Service				15	integer
+ATTRIBUTE	Login-TCP-Port				16	integer
+# Attribute 17 is undefined
+ATTRIBUTE	Reply-Message				18	string
+ATTRIBUTE	Callback-Number				19	string
+ATTRIBUTE	Callback-Id				20	string
+# Attribute 21 is undefined
+ATTRIBUTE	Framed-Route				22	string
+ATTRIBUTE	Framed-IPX-Network			23	ipaddr
+ATTRIBUTE	State					24	octets
+ATTRIBUTE	Class					25	octets
+ATTRIBUTE	Vendor-Specific				26	octets
+ATTRIBUTE	Session-Timeout				27	integer
+ATTRIBUTE	Idle-Timeout				28	integer
+ATTRIBUTE	Termination-Action			29	integer
+ATTRIBUTE	Called-Station-Id			30	string
+ATTRIBUTE	Calling-Station-Id			31	string
+ATTRIBUTE	NAS-Identifier				32	string
+ATTRIBUTE	Proxy-State				33	octets
+ATTRIBUTE	Login-LAT-Service			34	string
+ATTRIBUTE	Login-LAT-Node				35	string
+ATTRIBUTE	Login-LAT-Group				36	octets
+ATTRIBUTE	Framed-AppleTalk-Link			37	integer
+ATTRIBUTE	Framed-AppleTalk-Network		38	integer
+ATTRIBUTE	Framed-AppleTalk-Zone			39	string
+
+ATTRIBUTE	CHAP-Challenge				60	octets
+ATTRIBUTE	NAS-Port-Type				61	integer
+ATTRIBUTE	Port-Limit				62	integer
+ATTRIBUTE	Login-LAT-Port				63	string
+
+#
+#	Integer Translations
+#
+
+#	Service types
+
+VALUE	Service-Type			Login-User		1
+VALUE	Service-Type			Framed-User		2
+VALUE	Service-Type			Callback-Login-User	3
+VALUE	Service-Type			Callback-Framed-User	4
+VALUE	Service-Type			Outbound-User		5
+VALUE	Service-Type			Administrative-User	6
+VALUE	Service-Type			NAS-Prompt-User		7
+VALUE	Service-Type			Authenticate-Only	8
+VALUE	Service-Type			Callback-NAS-Prompt	9
+VALUE	Service-Type			Call-Check		10
+VALUE	Service-Type			Callback-Administrative	11
+
+#	Framed Protocols
+
+VALUE	Framed-Protocol			PPP			1
+VALUE	Framed-Protocol			SLIP			2
+VALUE	Framed-Protocol			ARAP			3
+VALUE	Framed-Protocol			Gandalf-SLML		4
+VALUE	Framed-Protocol			Xylogics-IPX-SLIP	5
+VALUE	Framed-Protocol			X.75-Synchronous	6
+
+#	Framed Routing Values
+
+VALUE	Framed-Routing			None			0
+VALUE	Framed-Routing			Broadcast		1
+VALUE	Framed-Routing			Listen			2
+VALUE	Framed-Routing			Broadcast-Listen	3
+
+#	Framed Compression Types
+
+VALUE	Framed-Compression		None			0
+VALUE	Framed-Compression		Van-Jacobson-TCP-IP	1
+VALUE	Framed-Compression		IPX-Header-Compression	2
+VALUE	Framed-Compression		Stac-LZS		3
+
+#	Login Services
+
+VALUE	Login-Service			Telnet			0
+VALUE	Login-Service			Rlogin			1
+VALUE	Login-Service			TCP-Clear		2
+VALUE	Login-Service			PortMaster		3
+VALUE	Login-Service			LAT			4
+VALUE	Login-Service			X25-PAD			5
+VALUE	Login-Service			X25-T3POS		6
+VALUE	Login-Service			TCP-Clear-Quiet		8
+
+#	Login-TCP-Port		(see /etc/services for more examples)
+
+VALUE	Login-TCP-Port			Telnet			23
+VALUE	Login-TCP-Port			Rlogin			513
+VALUE	Login-TCP-Port			Rsh			514
+
+#	Termination Options
+
+VALUE	Termination-Action		Default			0
+VALUE	Termination-Action		RADIUS-Request		1
+
+#	NAS Port Types
+
+VALUE	NAS-Port-Type			Async			0
+VALUE	NAS-Port-Type			Sync			1
+VALUE	NAS-Port-Type			ISDN			2
+VALUE	NAS-Port-Type			ISDN-V120		3
+VALUE	NAS-Port-Type			ISDN-V110		4
+VALUE	NAS-Port-Type			Virtual			5
+VALUE	NAS-Port-Type			PIAFS			6
+VALUE	NAS-Port-Type			HDLC-Clear-Channel	7
+VALUE	NAS-Port-Type			X.25			8
+VALUE	NAS-Port-Type			X.75			9
+VALUE	NAS-Port-Type			G.3-Fax			10
+VALUE	NAS-Port-Type			SDSL			11
+VALUE	NAS-Port-Type			ADSL-CAP		12
+VALUE	NAS-Port-Type			ADSL-DMT		13
+VALUE	NAS-Port-Type			IDSL			14
+VALUE	NAS-Port-Type			Ethernet		15
+VALUE	NAS-Port-Type			xDSL			16
+VALUE	NAS-Port-Type			Cable			17
+VALUE	NAS-Port-Type			Wireless-Other		18
+VALUE	NAS-Port-Type			Wireless-802.11		19

data/version.txt

@@ -1 +1 @@
-0.0.3
+0.0.5

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiustar
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - PJ Davis
@@ -14,23 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -05:00
-default_executable: 
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: ipaddr_extensions
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 16097
         segments: 
-        - 3
-        - 4
+        - 2012
         - 1
-        version: 3.4.1
-  type: :development
+        - 13
+        version: 2012.1.13
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 7
+        - 3
+        version: 3.7.3
+  type: :development
+  version_requirements: *id002
 description: Ruby Radius Library
 email: pj.davis@gmail.com
 executables: []
@@ -41,9 +59,7 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 - templates/default.txt
-- version.txt
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -58,12 +74,13 @@ files:
 - radiustar.gemspec
 - spec/radiustar_spec.rb
 - spec/spec_helper.rb
+- spec/value_spec.rb
 - templates/default.txt
 - templates/dictionary.digium
+- templates/dictionary.rfc2865
 - templates/gandalf.dictionary
 - test/test_radiustar.rb
 - version.txt
-has_rdoc: true
 homepage: http://github.com/pjdavis/radiustar
 licenses: []
 
@@ -74,25 +91,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: radiustar
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Ruby Radius Library
+summary: .
 test_files: 
 - test/test_radiustar.rb

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-announcement.txt
-coverage
-doc
-pkg
-*.gem
-**/.DS_Store