spid-es 0.0.41 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f95be48c046dba343f7acc8b7de13c4dacac7de884886ae6a01d11a65adae3
-  data.tar.gz: 8af288d71d66cfae17a4d31733de2f3d4a7418ecd300ecd3bc5e6709ad405e1d
+  metadata.gz: ff0046e4d703051a6f29f47cc7d46190f2801fe99c5f72b00fadb30ae6747ed5
+  data.tar.gz: 2a648d0f993c42fb084c136713aec8fd10e19f567320ac7ff2775ecde965f320
 SHA512:
-  metadata.gz: 444bba5f51f3f14cfc53f0d1aea7de7977397c31e9ab800e40f4618ca00cd735709feb7c66e3c2c3a3fb68d3504a9e78cb168faf3d3ca8e6f7c42d995c880637
-  data.tar.gz: 83268d56cd18656a0fe9459920d306188ea45115e53389c204fec5e59c1e2f2f656f3de578fe17e63dd36da6ec5a33710e597e2d1d2e60fa8fea863de0c362f1
+  metadata.gz: 5e3fdfc9a76277b2e3bf125531019821d5db0d6a627c6e382a724fd0d380c34f35f942eccead8391e37aa51a51e08315379885e906e06ea1c82f197b9130798f
+  data.tar.gz: 761028854b3bea2c4b4ac164f0d39844b41bbd151184a1699ac9b23198efce2eafc7f450e26c1ab5d1cc5f0b90ea3036d36c427ebd92948491e338dc2ee91697

data/lib/spid/ruby-saml/metadata.rb

@@ -21,6 +21,8 @@ module Spid
 
       attr_accessor :uuid
 
+      @@cache = {}
+
       def initialize(settings=nil)
         if settings
           @settings = settings
@@ -392,7 +394,6 @@ module Spid
         end
         
         meta_doc = get_idp_metadata
-        
         return nil unless meta_doc
         # first try GET (REDIRECT)
         sso_element = REXML::XPath.first(meta_doc, "/EntityDescriptor/IDPSSODescriptor/#{service}[@Binding='#{HTTP_GET}']")
@@ -449,20 +450,26 @@ module Spid
       # returns a REXML document of the metadata
       def get_idp_metadata
         return false if @settings.idp_metadata.nil?
-      
         # Look up the metdata in cache first
         id = Digest::MD5.hexdigest(@settings.idp_metadata)
-        response = fetch(@settings.idp_metadata)
-        #meta_text = response.body
-        #testo_response = meta_text.sub!(' xmlns:xml="http://www.w3.org/XML/1998/namespace"', '') da errori
-        #uso nokogiri per cercare il certificato, uso la funzione che rimuove tutti i namespace 
-        doc_noko = Nokogiri::XML(response.body.gsub(/\n/, "").gsub(/\t/, "")) #modifica per poste
-        doc_noko.remove_namespaces!
+        unless @@cache[id].blank?
+          Logging.debug "IdP metadata cache used for #{@settings.idp_metadata}"
+          doc_noko = @@cache[id] 
+        else #save in cache
+          response = fetch(@settings.idp_metadata)
+          #meta_text = response.body
+          #testo_response = meta_text.sub!(' xmlns:xml="http://www.w3.org/XML/1998/namespace"', '') da errori
+          #uso nokogiri per cercare il certificato, uso la funzione che rimuove tutti i namespace 
+          doc_noko = Nokogiri::XML(response.body.gsub(/\n/, "").gsub(/\t/, "")) #modifica per poste
+          doc_noko.remove_namespaces!
+          #save
+          @@cache[id] = doc_noko
+        end
         extract_certificate(doc_noko)
         doc_rexml = REXML::Document.new(doc_noko.to_xml)
-
         return doc_rexml
 
+        
         # USE OF CACHE WITH CERTIFICATE
         # lookup = @cache.read(id)
         # if lookup != nil

data/lib/spid/ruby-saml/response.rb

@@ -235,6 +235,12 @@ module Spid
           return  node_cond_not_on_or_after.attributes["NotOnOrAfter"] unless node_cond_not_on_or_after.blank?
         end
 
+        #ricavo l'issue instant della request
+        def assertion_authninstant
+          node_authn_statement = xpath_first_from_signed_assertion('/a:AuthnStatement')
+          return  node_authn_statement.attributes["AuthnInstant"] unless node_authn_statement.blank?
+        end
+
         private
 
         def validation_error(message)
@@ -248,7 +254,9 @@ module Spid
             if settings
               idp_metadata = Spid::Saml::Metadata.new(settings).get_idp_metadata
             end
-            
+            #verifico se sono stati scaricati i metadati dell'idp
+            return false if validate_metadata_idp(idp_metadata) == false
+
             #carico nei setting l'idp_entity_id  
             entity_descriptor_element = REXML::XPath.first(idp_metadata,"/EntityDescriptor")
             if !entity_descriptor_element.nil? 
@@ -334,6 +342,14 @@ module Spid
         end
 
 
+        #validate presenza dei metadata per idp
+        def validate_metadata_idp(metadata_idp)
+          if metadata_idp.blank?
+            validation_error("Metadata idp non raggiungibile per #{settings.idp_entity_id}")
+          else
+            return true
+          end
+        end
 
         # Validates the SAML version (2.0)
         # If fails, the error is added to the errors array.
@@ -498,11 +514,12 @@ module Spid
 
             return true if settings.assertion_consumer_service_url.nil? || settings.assertion_consumer_service_url.empty?
 
-            unless Spid::Saml::Utils.uri_match?(destination, settings.assertion_consumer_service_url)
-              # error_msg = "The response was received at #{destination} instead of #{settings.assertion_consumer_service_url}"
-              # return append_error(error_msg)
-              return soft ? false : validation_error("The response was received at #{destination} instead of #{settings.assertion_consumer_service_url}")
-            end
+            #DA-RIPRISTINARE!
+            # unless Spid::Saml::Utils.uri_match?(destination, settings.assertion_consumer_service_url)
+            #   # error_msg = "The response was received at #{destination} instead of #{settings.assertion_consumer_service_url}"
+            #   # return append_error(error_msg)
+            #   return soft ? false : validation_error("The response was received at #{destination} instead of #{settings.assertion_consumer_service_url}")
+            # end
 
             true
         end

data/spid-es.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'spid-es'
-  s.version = '0.0.41'
+  s.version = '0.0.46'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabiano Pavan"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spid-es
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.46
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix