dguerri-radiustar 0.0.5 → 0.1.0

data/History.txt

@@ -1,7 +1,4 @@
-== 0.0.5 / 2011-04-29
-* Fixed a bug in Request::recv_packet
-
-== 0.0.4 / 2010-12-04
+== 0.0.4 / 2010-12/04
 * github fork (dguerri)
 * bugfixes
 * added multiple dictionary files support

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 = {}
+      @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
@@ -21,19 +28,24 @@ module Radiustar
       @revcollection[id]
     end
 
+    def vendor?
+      !!@vendor
+    end
+
   end
 
   class Attribute
 
     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/packet.rb

@@ -1,6 +1,7 @@
 module Radiustar
 
   require 'digest/md5'
+  require 'ipaddr_extensions'
 
   class Packet
 
@@ -15,7 +16,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
@@ -75,55 +76,63 @@ module Radiustar
       @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
     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_s, value|
-        attribute = @dict.find_attribute_by_name(attribute_s)
-        raise "Undefned attribute '#{attribute_s}'." if attribute.nil?
-        anum = attribute.id
-        val = case attribute.type
-        when "string"
-          value
-        when "integer"
-          if attribute.has_values?
-            raise "Invalid value name '#{value}'" if attribute.find_values_by_name(value).nil?
-          end
-          [attribute.has_values? ? attribute.find_values_by_name(value).id : 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
 
@@ -131,7 +140,7 @@ module Radiustar
 
     def unpack
       @code, @id, len, @authenticator, attribute_data = @packed.unpack(P_HDR)
-      @code = CODES.index(@code)
+      @code = CODES.key(@code)
 
       unset_all_attributes
 
@@ -147,7 +156,7 @@ module Radiustar
         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'
@@ -159,22 +168,11 @@ module Radiustar
       end
     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))
-      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
@@ -206,5 +204,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

@@ -2,8 +2,6 @@ module Radiustar
 
   require 'socket'
 
-  MAX_RADIUS_REPLAY_PACKET_LEN = 512
-
   class Request
 
     def initialize(server, options = {})
@@ -104,7 +102,7 @@ module Radiustar
       if select([@socket], nil, nil, timeout.to_i) == nil
         raise "Timed out waiting for response packet from server"
       end
-      data = @socket.recvfrom(MAX_RADIUS_REPLAY_PACKET_LEN)
+      data = @socket.recvfrom(64)
       Packet.new(@dict, Process.pid & 0xff, data[0])
     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

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dguerri-radiustar}
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["PJ Davis", "Davide Guerri"]
-  s.date = %q{2011-04-29}
+  s.authors = ["PJ Davis", "Davide Guerri", "James Harton"]
+  s.date = %q{2011-09-28}
   s.description = %q{Ruby Radius Library}
-  s.email = %q{davide.guerri@gmail.com}
+  s.email = ["pj.davis@gmail.com", "davide.guerri@gmail.com", "jamesotron@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/dguerri/radiustar}
@@ -25,10 +25,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bones>, [">= 3.4.1"])
+      s.add_development_dependency(%q<ipaddr_extensions>)
     else
       s.add_dependency(%q<bones>, [">= 3.4.1"])
+      s.add_dependency(%q<ipaddr_extensions>)
     end
   else
     s.add_dependency(%q<bones>, [">= 3.4.1"])
+    s.add_dependency(%q<ipaddr_extensions>)
   end
 end

data/version.txt

@@ -1 +1 @@
-0.0.5
+0.0.4

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: dguerri-radiustar
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - PJ Davis
 - Davide Guerri
+- James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,8 +36,25 @@ dependencies:
         version: 3.4.1
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ipaddr_extensions
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Ruby Radius Library
-email: davide.guerri@gmail.com
+email: 
+- pj.davis@gmail.com
+- davide.guerri@gmail.com
+- jamesotron@gmail.com
 executables: []
 
 extensions: []