saml_camel 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa10069e1db4964516ddb40334b33aacb5565ca
-  data.tar.gz: fec0501aa4a0b2d778d3ed78193ccacc0e064aa6
+  metadata.gz: e845e0da15a5db2349b6572ccdb63fc432caa961
+  data.tar.gz: 194faeb1fe2914fe1bb5ff83248cd5c45f09e958
 SHA512:
-  metadata.gz: f999dbb2683754347dd79f30a0351ced476e5ab87c149d71f3344080ac865e84fab34ad4cb0aad05976c26fca14985e0fd89d7b8656c9fe4f6fbe9c8c08f842a
-  data.tar.gz: 434a08a6955a4faceac9d7fa09d57f391002f22d22774eedaf371e53869c87ad1a4c6613a281300e6191539ae5554d89a556027436a7d023ed40543b9cd7b6e1
+  metadata.gz: f9d873a64b44da5816d20450df7fc9f0f202abe7f2986193c16abd4bf0c00f7ae94d792e43f81df36107a1fabb52de9d38b4189c4ab0c619f5ba53bdd737d01f
+  data.tar.gz: 36d2840f7e8ddd89f1e155634f172a3fa0583aa47e533108078086588d617a96bd8c73c8b592bb41fa07f95cb8a9650412626450471f8bdac4192435f621d0e1

data/app/controllers/concerns/saml_camel/saml_service.rb

@@ -6,6 +6,7 @@ require_dependency 'saml_camel/application_controller'
 module SamlCamel::SamlService # rubocop:disable Style/ClassAndModuleChildren
   extend ActiveSupport::Concern
 
+
   def cache_available?(app_cache)
     if app_cache
       true
@@ -17,18 +18,36 @@ module SamlCamel::SamlService # rubocop:disable Style/ClassAndModuleChildren
 
   # TODO: refactor
   def saml_protect # rubocop:disable Metrics/MethodLength, Metrics/AbcSize:
+
+    #TODO move this
+    begin
+      settings = JSON.parse(File.read("config/saml/#{Rails.env}/settings.json"))
+      sp_debug = settings['settings']['debug']
+    rescue StandardError # rubocop:disable Lint/HandleExceptions
+      # rescue othewise the generator fails
+    end
+
     user_cache = cache_available?(Rails.cache.fetch(session[:saml_session_id])) if session[:saml_session_id]
     if session[:saml_session_id] && user_cache
+      SamlCamel::Logging.debug('Saml Session and User Cache Found.') if sp_debug
+      SamlCamel::Logging.debug("SAML session id: #{session[:saml_session_id]} | Cache: #{user_cache}") if sp_debug
       sp = SamlCamel::ServiceProvider.new(
         cache_permit_key: session[:saml_session_id].to_sym,
         saml_attributes: session[:saml_attributes]
       )
       session[:sp_session] = sp.validate_sp_session(session[:sp_session], request.remote_ip)
       unless session[:saml_response_success] || session[:sp_session]
+        SamlCamel::Logging.debug('SAML response not successful or no sp session not valid. Generating new request.') if sp_debug
+        SamlCamel::Logging.debug("SAML response: #{session[:saml_response_success]}") if sp_debug
+        SamlCamel::Logging.debug("SP session #{session[:sp_session]}") if sp_debug
+
         saml_request_url = sp.generate_saml_request(request)
         redirect_to(saml_request_url)
       end
     else
+      SamlCamel::Logging.debug('User Cache or saml session id not found. Generating new request.') if sp_debug
+      SamlCamel::Logging.debug("SAML session id: #{session[:saml_session_id]} | Cache: #{user_cache}") if sp_debug
+
       session[:saml_session_id] = SamlCamel::ServiceProvider.generate_permit_key
       saml_request_url = SamlCamel::ServiceProvider.new(
         cache_permit_key: session[:saml_session_id].to_sym

data/app/models/saml_camel/service_provider.rb

@@ -45,6 +45,8 @@ module SamlCamel
       if sp_session
         # if the session has exceeded the allowed lifetime, remove session
         if (Time.now - sp_session_init_time) > sp_lifetime.hour
+          SamlCamel::Logging.debug('Session has exceeded the allowed lifetime.') if SP_DEBUG
+          SamlCamel::Logging.debug("Current Time: #{Time.now} | Session Init: #{ sp_session_init_time}") if SP_DEBUG
           SamlCamel::Logging.expired_session(@saml_attributes)
           return nil
         end

data/lib/saml_camel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SamlCamel
-  VERSION = '1.0.2'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml_camel
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - 'Danai Adkisson '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails