rack-saml 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814e3162772ca1b7deea5751c77af1fa07b969c4
-  data.tar.gz: 7ead1385a2a3b93c4e74b269d2f764bca77c8bce
+  metadata.gz: 351da5cbd3ac2dee0229017a33144a4263d1ed2d
+  data.tar.gz: 71724a4318c0f7765f32346bcfa0e61ad7b017fc
 SHA512:
-  metadata.gz: 06a068a3c5ae379525c365abf7096dec77013be2d722e66baf62019135d93297258b25af3a805b283139d01e125dfb834c5dfe1f47f6d23c7f3f169c15889abb
-  data.tar.gz: 71382a6922efbeb60ce3284720c114a1e2e1764ab03115857cb0fed51f2059488413628199c116f09e3bd49aeac4156fa1027fa3026a1cbaf0ca12319fc5b234
+  metadata.gz: 9a70cc5feb6435a22310849406420d3ad3fc8faab1e0f1218c38656d428ae89b0141d96c1f8125787d588ffb8b2b617c43ce7274c8b183ce862c2a4a55a5beff
+  data.tar.gz: 062c93f2dc4060cbe67dcd86dfd5947efaade19dff67689372307cf1d178b79e84dbc5a967c374e368a804324459757fc7cc46716fe7a5d2eb18c4cb31099fba

data/lib/rack-saml/version.rb

@@ -1,6 +1,5 @@
-require 'rack'
 module Rack
   module Saml
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/rack/saml.rb

@@ -18,15 +18,15 @@ module Rack
   #   'rack_saml' => {
   #     'ds.session' => {
   #       'sid' => temporally_generated_hash,
-  #       'expires_at' => xxxxx # timestamp
+  #       'expires' => xxxxx # timestamp (string)
   #     }
   #     'saml_authreq.session' => {
   #       'sid' => temporally_generated_hash,
-  #       'expires_at' => xxxxx # timestamp
+  #       'expires' => xxxxx # timestamp (string)
   #     }
   #     'saml_res.session' => {
   #       'sid' => temporally_generated_hash,
-  #       'expires_at' => xxxxx # timestamp,
+  #       'expires' => xxxxx, # timestamp (string)
   #       'env' => {}
   #     }
   #   }
@@ -39,41 +39,35 @@ module Rack
     class ValidationError < StandardError
     end
 
+    FILE_TYPE = [:config, :metadata, :attribute_map]
+    FILE_NAME = {
+      :config => 'rack-saml.yml',
+      :metadata => 'metadata.yml',
+      :attribute_map => 'attribute-map.yml'
+    }
+
     def default_config_path(config_file)
       ::File.expand_path("../../../config/#{config_file}", __FILE__)
     end
 
-    def default_config
-      default_config_path('rack-saml.yml')
-    end
-
-    def default_metadata
-      default_config_path('metadata.yml')
-    end
-
-    def default_attribute_map
-      default_config_path('attribute-map.yml')
+    def load_file(type)
+      if @opts[type].nil? || !::File.exists?(@opts[type])
+        @opts[type] = default_config_path(FILE_NAME[type])
+      end
+      eval "@#{type} = YAML.load_file(@opts[:#{type}])"
     end
 
     def initialize app, opts = {}
       @app = app
       @opts = opts
 
-      if @opts[:config].nil? || !::File.exists?(@opts[:config])
-        @opts[:config] = default_config
+      FILE_TYPE.each do |type|
+        load_file(type)
       end
-      @config = YAML.load_file(@opts[:config])
+
       if @config['assertion_handler'].nil?
         raise ArgumentError, "'assertion_handler' parameter should be specified in the :config file"
       end
-      if @opts[:metadata].nil? || !::File.exists?(@opts[:metadata])
-        @opts[:metadata] = default_metadata
-      end
-      @metadata = YAML.load_file(@opts[:metadata])
-      if @opts[:attribute_map].nil? || !::File.exists?(@opts[:attribute_map])
-        @opts[:attribute_map] = default_attribute_map
-      end
-      @attribute_map = YAML.load_file(@opts[:attribute_map])
     end
 
     class Session
@@ -102,7 +96,7 @@ module Rack
       def start(type, timeout = 300)
         sid = nil
         if timeout.nil?
-          period = nil
+          period = Time.now + 300
         else
           period = Time.now + timeout
         end
@@ -115,7 +109,7 @@ module Rack
           sid = generate_sid
         end
         @session["#{type}.session"]['sid'] = sid
-        @session["#{type}.session"]['expires_at'] = period
+        @session["#{type}.session"]['expires'] = period.to_s
         @session["#{type}.session"]
       end
 
@@ -130,11 +124,11 @@ module Rack
       def is_valid?(type, sid = nil)
         session = @session["#{type}.session"]
         return false if session['sid'].nil? # no valid session
-        if session['expires_at'].nil? # no expiration
+        if session['expires'].nil? # no expiration
           return true if sid.nil? # no sid check
           return true if session['sid'] == sid # sid check
         else
-          if Time.now < Time.parse(session['expires_at'].to_s) # before expiration
+          if Time.now < Time.parse(session['expires']) # before expiration
             return true if sid.nil? # no sid check
             return true if session['sid'] == sid # sid check
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-saml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack