ciam-es 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb8518dd8770087934f1e2c2a660933024bc95cefb2e0236f1d6a6d9978ec261
-  data.tar.gz: d079efe7ad4bfd58517037d553bd16f206db66c0e4a4ea56d6adeeda62380ac5
+  metadata.gz: 8776dcc691c65c5104bc990b84c51693a1e9df07f22a9775c1459a68b58bb938
+  data.tar.gz: 197e0f5cf866e9eae24bdcff42daacfad4f2adc1dfe21c8f1a7e5edc829b7e21
 SHA512:
-  metadata.gz: 4f6c22bf83eeb57247d65cc83a974ce4b759a850cb18d919e4c6053d450e2ed6cde1dd7178cb5122f81171dcfaa7a50d92fbe403b7eaffe8546238065bf2bdb5
-  data.tar.gz: 8f76ca315b71604b04432a619b7c835e222a555335775b80445b4e706eda498d0f22eff938b2708935a4fd82f47e7b277fa01e007f1c92eb32c5075d1e2a9b2e
+  metadata.gz: e4339837cc5e758da12008514e6f4b68323493c8142d98094cc77a09a42af152e03ad9b4f0e70c7673b9f69dd0238ddd5c146dca8688757c66cdfde4b772d3a8
+  data.tar.gz: c6485798511c4ff4f37edc60319d78aace2515987376291256d23cea9f097e44a933e976c2b1e31be73c5798fa42265f989f3a55563f9e658567a56de46a4fc1

data/ciam-es.gemspec

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

data/lib/ciam/ruby-saml/authrequest.rb

@@ -29,7 +29,7 @@ module Ciam::Saml
       # Create AuthnRequest root element using REXML 
       request_doc = Ciam::XMLSecurityNew::Document.new
       request_doc.context[:attribute_quote] = :quote
-      root = request_doc.add_element "saml2p:AuthnRequest", { "xmlns:saml2p" => "urn:oasis:names:tc:SAML:2.0:protocol", 
+      root = request_doc.add_element "samlp:AuthnRequest", { "xmlns:samlp" => "urn:oasis:names:tc:SAML:2.0:protocol", 
                                                               "xmlns:saml" => "urn:oasis:names:tc:SAML:2.0:assertion"
                                                              }
       root.attributes['ID'] = uuid
@@ -72,7 +72,7 @@ module Ciam::Saml
 
 
       if @settings.name_identifier_format != nil
-        root.add_element "saml2p:NameIDPolicy", { 
+        root.add_element "samlp:NameIDPolicy", { 
             # Might want to make AllowCreate a setting?
             #{}"AllowCreate"     => "true",
             "Format"          => @settings.name_identifier_format[0]
@@ -83,8 +83,8 @@ module Ciam::Saml
       # match required for authentication to succeed.  If this is not defined, 
       # the IdP will choose default rules for authentication.  (Shibboleth IdP)
       if @settings.authn_context != nil
-        requested_context = root.add_element "saml2p:RequestedAuthnContext", { 
-          "Comparison" => "minimum"
+        requested_context = root.add_element "samlp:RequestedAuthnContext", { 
+          "Comparison" => "exact"
         }
         context_class = []
         @settings.authn_context.each_with_index{ |context, index|
@@ -95,12 +95,12 @@ module Ciam::Saml
       end
 
       if @settings.requester_identificator != nil
-        requester_identificator = root.add_element "saml2p:Scoping", { 
+        requester_identificator = root.add_element "samlp:Scoping", { 
           "ProxyCount" => "0"
         }
         identificators = []
         @settings.requester_identificator.each_with_index{ |requester, index|
-          identificators[index] = requester_identificator.add_element "saml2p:RequesterID"
+          identificators[index] = requester_identificator.add_element "samlp:RequesterID"
           identificators[index].text = requester
         }
         
@@ -109,12 +109,12 @@ module Ciam::Saml
       request_doc << REXML::XMLDecl.new("1.0", "UTF-8")
       
       #LA FIRMA VA MESSA SOLO NEL CASO CON HTTP POST
-      # cert = @settings.get_sp_cert
-      #   # embed signature
-      #   if @settings.metadata_signed && @settings.sp_private_key && @settings.sp_cert
-      #     private_key = @settings.get_sp_key
-      #     request_doc.sign_document(private_key, cert)
-      #   end
+      cert = @settings.get_cert(@settings.sp_cert)
+      # embed signature
+      if @settings.metadata_signed && @settings.sp_private_key && @settings.sp_cert
+        private_key = @settings.get_sp_key
+        request_doc.sign_document(private_key, cert)
+      end
 
       # stampo come stringa semplice i metadata per non avere problemi con validazione firma
       #ret = request_doc.to_s

data/lib/ciam/ruby-saml/logout_request.rb

@@ -37,11 +37,11 @@ module Ciam::Saml
       opt = { :name_id => nil, :session_index => nil, :extra_parameters => nil  }.merge(options)
       return nil unless opt[:name_id]
       
-      @request = REXML::Document.new
-      @request.context[:attribute_quote] = :quote
+      request_doc = Ciam::XMLSecurityNew::Document.new
+      request_doc.context[:attribute_quote] = :quote
       
                                 
-      root = @request.add_element "saml2p:LogoutRequest", { "xmlns:saml2p" => PROTOCOL }
+      root = request_doc.add_element "samlp:LogoutRequest", { "xmlns:samlp" => PROTOCOL }
       root.attributes['ID'] = @transaction_id
       root.attributes['IssueInstant'] = @issue_instant
       root.attributes['Version'] = "2.0"
@@ -62,60 +62,83 @@ module Ciam::Saml
         name_id.attributes["SPNameQualifier"] = @settings.sp_name_qualifier
       end
       if opt[:session_index] 
-        session_index = root.add_element "saml2p:SessionIndex" #, { "xmlns:samlp" => PROTOCOL }
+        session_index = root.add_element "samlp:SessionIndex" #, { "xmlns:samlp" => PROTOCOL }
         session_index.text = opt[:session_index]
       end
-      Logging.debug "Created LogoutRequest: #{@request}"
-      meta = Metadata.new(@settings)
-      return meta.create_slo_request( to_s, opt[:extra_parameters] )
+
+      request_doc << REXML::XMLDecl.new("1.0", "UTF-8")
+      #sign logout_request
+      cert = @settings.get_cert(@settings.sp_cert)
+      
+      # embed signature
+      if @settings.metadata_signed && @settings.sp_private_key && @settings.sp_cert
+        private_key = @settings.get_sp_key
+        request_doc.sign_document(private_key, cert)
+      end
+
+
+      puts "Created LogoutRequest: #{request_doc}"
+      
+      #Logout per binding redirect
+      # meta = Metadata.new(@settings)
+      # slo_req = meta.create_slo_request( request_doc.to_s, opt[:extra_parameters] )
+      
+      
+      return request_doc.to_s
+      
       #action, content =  binding_select("SingleLogoutService")
       #Logging.debug "action: #{action} content: #{content}"
       #return [action, content]
-     end
+    end
 
-  # function to return the created request as an XML document
+    # function to return the created request as an XML document
     def to_xml
-    text = ""
-    @request.write(text, 1)
-      return text
+        text = ""
+        @request.write(text, 1)
+        return text
+    end
+
+    def to_s
+        @request.to_s
     end
-   def to_s
-     @request.to_s
-   end
+
     # Functions for pulling values out from an IdP initiated LogoutRequest
-  def name_id 
-    element = REXML::XPath.first(@request, "/p:LogoutRequest/a:NameID", { 
-        "p" => PROTOCOL, "a" => ASSERTION } )
-    return nil if element.nil?
-    # Can't seem to get this to work right...
-    #element.context[:compress_whitespace] = ["NameID"]
-    #element.context[:compress_whitespace] = :all
-    str = element.text.gsub(/^\s+/, "")
-    str.gsub!(/\s+$/, "")
-    return str
-  end
+    def name_id 
+      element = REXML::XPath.first(@request, "/p:LogoutRequest/a:NameID", { 
+          "p" => PROTOCOL, "a" => ASSERTION } )
+      return nil if element.nil?
+      # Can't seem to get this to work right...
+      #element.context[:compress_whitespace] = ["NameID"]
+      #element.context[:compress_whitespace] = :all
+      str = element.text.gsub(/^\s+/, "")
+      str.gsub!(/\s+$/, "")
+      return str
+    end
   
-  def transaction_id
-    return @transaction_id if @transaction_id 
-    element = REXML::XPath.first(@request, "/p:LogoutRequest", { 
-        "p" => PROTOCOL} )
-    return nil if element.nil?
-    return element.attributes["ID"]
-  end
-  def is_valid?
-    validate(soft = true)
-  end
+    def transaction_id
+      return @transaction_id if @transaction_id 
+      element = REXML::XPath.first(@request, "/p:LogoutRequest", { 
+          "p" => PROTOCOL} )
+      return nil if element.nil?
+      return element.attributes["ID"]
+    end
+
+    def is_valid?
+      validate(soft = true)
+    end
   
-  def validate!
-    validate( soft = false )
-  end
-  def validate( soft = true )
-    return false if @request.nil?
-      return false if @request.validate(@settings, soft) == false
-    
-    return true
-    
-  end
+    def validate!
+      validate( soft = false )
+    end
+
+    def validate( soft = true )
+      return false if @request.nil?
+        return false if @request.validate(@settings, soft) == false
+      
+      return true
+      
+    end
+
     private 
     
     def self.timestamp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciam-es
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: SAML Ruby Tookit CIAM