apache_authtkt 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30514640ce14fbe685c0c66f4516d21f7e448e39
-  data.tar.gz: 943fbebbb53196bed4472d76c929d86ba3cd0619
+SHA256:
+  metadata.gz: c94d37a491b1fa4fbc027c2fdef30c1e6bbc9288ed9aa44d9be7ed08d0d86f7c
+  data.tar.gz: 0afb18e06ca8fb0d121c28575c28bb3061557dc49720c1ebc2481171e2b82ed6
 SHA512:
-  metadata.gz: 4688616bc933b0732e9be7c0067994a85d0d855ad691641db49ffcefb19cb4bc8c7c3e367104af4c5a330b9217b1b0232755890c2df178a82879b1dfb2f8210d
-  data.tar.gz: 1858437c036dfbb33be18c09ac37f6b7c0876f3fdaaebc2dcdb08d4de270b2bcc0d44676c3a23e169531b3abdfb644a91477a603586c1aa7cbe0c8e066efa497
+  metadata.gz: 1c0451431aa9e856f8b2a0ada49d8bf7e93144db16dfeb1c43f43d46adef38191cb41592ee7dbd3f8dd795c39230043924800e3b9d6729ec0413b03df9a16421
+  data.tar.gz: e894a6e7b13510253f8deac5da007a911fd9fd21a953b825e671af297a57d9d2c1830259f8916cb7f996a23bda44c8ccffe4ff8935f49f6717b1655fe6becd46

data/lib/apache_authtkt.rb

@@ -21,6 +21,7 @@ require 'base64'
 require 'digest'
 
 class ApacheAuthTkt
+  class InvalidDigestTypeError < StandardError; end
 
    attr_accessor :secret
    attr_accessor :ipaddr
@@ -30,6 +31,12 @@ class ApacheAuthTkt
    attr_accessor :base64encode
    attr_accessor :lifetime
 
+   DIGEST_LENGTHS = {
+     'md5' => 32,
+     'sha256' => 64,
+     'sha512' => 128,
+   }
+
    def initialize(args)
 
       #puts args.inspect
@@ -58,6 +65,8 @@ class ApacheAuthTkt
          @digest_type = 'md5'
       end
 
+      raise(InvalidDigestTypeError, @digest_type) unless DIGEST_LENGTHS[@digest_type.downcase]
+
       if (args.has_key? :base64encode)
          @base64encode = args[:base64encode]
       else
@@ -129,15 +138,8 @@ class ApacheAuthTkt
       digest0 = nil
       digest  = nil
       raw     = ipts + @secret + user + "\0" + tokens + "\0" + data
-      if (@digest_type == 'md5')
-         digest0 = Digest::MD5.hexdigest(raw)
-         digest  = Digest::MD5.hexdigest(digest0 + @secret)
-      elsif (@digest_type == 'sha256')
-         digest0 = Digest::SHA256.hexdigest(raw)
-         digest  = Digest::SHA256.hexdigest(digest0 + @secret)
-      else
-         raise "unsupported digest type: " + @digest_type
-      end
+      digest0 = digest_klass.hexdigest(raw)
+      digest  = digest_klass.hexdigest(digest0 + @secret)
       return digest
    end
 
@@ -176,7 +178,8 @@ class ApacheAuthTkt
       # parse it
       parts = tkt.split(/\!/)
       parsed = {:tokens => '', :data => ''}
-      if (packed = parts[0].match('^(.{32})(.{8})(.+)$'))
+      digest_length = DIGEST_LENGTHS[@digest_type.downcase]
+      if (packed = parts[0].match("^(.{#{digest_length}})(.{8})(.+)$"))
          parsed[:digest] = packed[1]
          parsed[:ts]     = packed[2].hex
          parsed[:user]    = packed[3]
@@ -202,4 +205,9 @@ class ApacheAuthTkt
       !(parsed[:ts] + @lifetime >= Time.now.to_i)
    end
 
+   private
+
+   def digest_klass
+     Digest.const_get(@digest_type.upcase)
+   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apache_authtkt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - William Johnston
@@ -15,30 +15,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 description: Ruby client for mod_auth_tkt. See http://www.openfusion.com.au/labs/mod_auth_tkt/
 email: wjohnston@mpr.org
 executables: []
@@ -66,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for mod_auth_tkt
 test_files: []
-has_rdoc: