ciam-es 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498429de58aab734f5741b9078d070112ef121d2110c09bda62ede09ea905487
-  data.tar.gz: 85c613f6892c7e6bfa0965d3a34bdb85fba2ffe69487043036f12e019549b79e
+  metadata.gz: 0c80df6472d22b7b301cc4cb8947380d8f8bd8d281baeb1277f646393e86595a
+  data.tar.gz: 990ce44721bc98af1881030a10272a486680054e801e87bca74e0d6eddf0454b
 SHA512:
-  metadata.gz: 19b95be981cc0c506a3a04ecfe9a1e6aee57fdf3ccadf48568e1bac0b8754502eabf411165b4e158a3703ba299c7292ac70b6a0c27100d751f1a4f3f2dd23292
-  data.tar.gz: f64eb5ab251e2141a82c580758c4705fd0b6cbf09d1302e999119305e349b3e5b8eaa3b7ab4bb5d0868783246d1af01ae12a3e1b82bb847a765c2da3dc539ade
+  metadata.gz: 3ed091145eb483be7d4c5ece184b3e2ff674bb1778b756bd7b96a4a3e30087e7cf18df02811a72d6f138edd9fa89f653e06a33c5d8f6d6563742797f8d7d554e
+  data.tar.gz: 074e0d01c85fa224e1c4bd74c41ae3cfb9421ceff6d8fb025e9b2bc46f6464847c453e00ee3a074504a16f60804b1c840feaf94586c935d03fdd27ecebc3b0dd

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.5'
+  s.version = '0.1.0'
 
   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

@@ -37,7 +37,6 @@ module Ciam::Saml
       root.attributes['Version'] = "2.0"
       #root.attributes['ProtocolBinding'] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
       root.attributes['AttributeConsumingServiceIndex'] = @settings.assertion_consumer_service_index
-      root.attributes['ForceAuthn'] = "true"
       #root.attributes['IsPassive'] = "false"
       #usato AssertionConsumerServiceURL e ProtocolBinding in alternativa, pag 8 regole tecniche
       root.attributes['AssertionConsumerServiceIndex'] = @settings.attribute_consuming_service_index

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

@@ -41,26 +41,24 @@ module Ciam::Saml
       request_doc.context[:attribute_quote] = :quote
       
                                 
-      root = request_doc.add_element "samlp:LogoutRequest", { "xmlns:samlp" => PROTOCOL }
+      root = request_doc.add_element "samlp:LogoutRequest", { "xmlns:samlp" => PROTOCOL, "xmlns:saml" => ASSERTION }
       root.attributes['ID'] = @transaction_id
       root.attributes['IssueInstant'] = @issue_instant
       root.attributes['Version'] = "2.0"
       root.attributes['Destination'] = @settings.single_logout_destination
       
-      issuer = root.add_element "saml2:Issuer", { "xmlns:saml2" => ASSERTION  }
-      issuer.attributes['Format'] = "urn:oasis:names:tc:SAML:2.0:nameid-format:entity"
-      #issuer.text = @settings.issuer
-      #per la federazione trentina qui ci vanno i metadati...
-      issuer.text = @settings.idp_metadata
+      issuer = root.add_element "saml:Issuer"#, { "xmlns:saml2" => ASSERTION  }
+      #issuer.attributes['Format'] = "urn:oasis:names:tc:SAML:2.0:nameid-format:entity"
+      issuer.text = @settings.issuer
 
-      name_id = root.add_element "saml2:NameID", { "xmlns:saml2" => ASSERTION }
+      name_id = root.add_element "saml:NameID"#, { "xmlns:saml2" => ASSERTION }
       name_id.attributes['Format'] = "urn:oasis:names:tc:SAML:2.0:nameid-format:transient"
       name_id.attributes['NameQualifier'] = @settings.idp_name_qualifier
       name_id.text = opt[:name_id]
       # I believe the rest of these are optional
-      if @settings && @settings.sp_name_qualifier
-        name_id.attributes["SPNameQualifier"] = @settings.sp_name_qualifier
-      end
+      # if @settings && @settings.sp_name_qualifier
+      #   name_id.attributes["SPNameQualifier"] = @settings.sp_name_qualifier
+      # end
       if opt[:session_index] 
         session_index = root.add_element "samlp:SessionIndex" #, { "xmlns:samlp" => PROTOCOL }
         session_index.text = opt[:session_index]

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

@@ -5,13 +5,15 @@ require "rexml/document"
 module Ciam
   module Saml
     class LogoutResponse
-      include Coding
+        include Coding
 		include Request
 		ASSERTION = "urn:oasis:names:tc:SAML:2.0:assertion"
 		PROTOCOL  = "urn:oasis:names:tc:SAML:2.0:protocol"
 		DSIG      = "http://www.w3.org/2000/09/xmldsig#"
 
-      def initialize( options = { } )
+		attr_accessor :settings
+
+		def initialize( options = { } )
 			opt = { :response => nil, :settings => nil }.merge(options)
 			# We've recieved a LogoutResponse from the IdP 
 			if opt[:response]
@@ -32,7 +34,7 @@ module Ciam
 			if opt[:settings]
 				@settings = opt[:settings]
 			end
-      end
+		end
 
 		# Create a LogoutResponse to to the IdP's LogoutRequest
 		#  (For IdP initiated SLO)
@@ -42,70 +44,85 @@ module Ciam
 				:status => "urn:oasis:names:tc:SAML:2.0:status:Success", 
 				:extra_parameters => nil }.merge(options)
 			return nil if opt[:transaction_id].nil?
-			@response = REXML::Document.new
-			@response.context[:attribute_quote] = :quote
+			response_doc = Ciam::XMLSecurityNew::Document.new
+			response_doc.context[:attribute_quote] = :quote
+
 			uuid = "_" + UUID.new.generate
 			time = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
-			root = @response.add_element "saml2p:LogoutResponse", { "xmlns:saml2p" => PROTOCOL }
+			root = response_doc.add_element "saml2p:LogoutResponse", { "xmlns:saml2p" => PROTOCOL }
 			root.attributes['ID'] = uuid
 			root.attributes['IssueInstant'] = time
 			root.attributes['Version'] = "2.0"
+			root.attributes['Destination'] = @settings.single_logout_destination
 			# Just convenient naming to accept both names as InResponseTo
 			if opt[:transaction_id] 
 				root.attributes['InResponseTo'] = opt[:transaction_id]
 			elsif opt[:in_response_to]
 				root.attributes['InResponseTo'] = opt[:in_response_to]
 			end
-			if opt[:status]
-				status = root.add_element "saml2p:Status"
-				status_code = status.add_element "saml2p:StatusCode", {
-						"Value" => opt[:status]
-				}
-			end
 			if @settings && @settings.issuer
 				issuer = root.add_element "saml:Issuer", {
 					"xmlns:saml" => "urn:oasis:names:tc:SAML:2.0:assertion"
 				}
 				issuer.text = @settings.issuer
 			end
-			meta = Metadata.new( @settings )
-			Logging.debug "Created LogoutResponse:\n#{@response}"
-			return meta.create_slo_response( to_s, opt[:extra_parameters] )
+
+			response_doc << REXML::XMLDecl.new("1.0", "UTF-8")
+      		#sign logout_response
+      		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
+				response_doc.sign_document(private_key, cert)
+			end
 			
-			#root.attributes['Destination'] = action
+			if opt[:status]
+				status = root.add_element "saml2p:Status"
+				status_code = status.add_element "saml2p:StatusCode", {
+						"Value" => opt[:status]
+				}
+			end
+
+			Logging.debug "Created LogoutResponse:\n #{response_doc}"
 			
+			return response_doc.to_s
+
 		end
+
 		# function to return the created request as an XML document
 		def to_xml
 			text = ""
 			@response.write(text, 1)
 			return text
 		end
+
 		def to_s
 			@response.to_s
 		end
 		
-      def issuer
-			element = REXML::XPath.first(@response, "/p:LogoutResponse/a:Issuer", { 
-						"p" => PROTOCOL, "a" => ASSERTION} )
-			return nil if element.nil?
-			element.text
-      end
+		def issuer
+				element = REXML::XPath.first(@response, "/p:LogoutResponse/a:Issuer", { 
+							"p" => PROTOCOL, "a" => ASSERTION} )
+				return nil if element.nil?
+				element.text
+		end
 
-      def in_response_to
+		def in_response_to
 			element = REXML::XPath.first(@response, "/p:LogoutResponse", {
 					 "p" => PROTOCOL })
 			return nil if element.nil?
-        element.attributes["InResponseTo"]
-      end
+        	element.attributes["InResponseTo"]
+      	end
 
-      def success?
+      	def success?
 			element = REXML::XPath.first(@response, "/p:LogoutResponse/p:Status/p:StatusCode", {
 					"p" => PROTOCOL })
 			return false if element.nil?
-        element.attributes["Value"] == "urn:oasis:names:tc:SAML:2.0:status:Success"
-        
-      end
+			element.attributes["Value"] == "urn:oasis:names:tc:SAML:2.0:status:Success"
+			
+		end
+
 		def is_valid?
 			validate(soft = true)
 		end
@@ -113,6 +130,7 @@ module Ciam
 		def validate!
 			validate( soft = false )
 		end
+
 		def validate( soft = true )
 			return false if @response.nil?
 			# Skip validation with a failed response if we don't have settings
@@ -123,10 +141,12 @@ module Ciam
 			
 		end
 
-    protected
+	protected
+	
       def document
         REXML::Document.new(@response)
       end
-    end
+	
+	end
   end
 end

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

@@ -98,8 +98,13 @@ module Ciam
             parse_time(node, "SessionNotOnOrAfter")
           end
         end
-        
 
+        def session_index
+          @session_index ||= begin
+            node = REXML::XPath.first(document, "/p:Response/a:Assertion/a:AuthnStatement", { "p" => PROTOCOL, "a" => ASSERTION })
+            node.attributes["SessionIndex"] unless node.blank?
+          end
+        end
 
         # Checks the status of the response for a "Success" code
         def success?

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

@@ -1,5 +1,5 @@
 module Ciam
   module Saml
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciam-es
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix