samlr 2.6.3 → 2.7.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d5a3d362753c92d5fa5b9e824cfbe4a5b64433248b2b2e66d95ff24952a2af
-  data.tar.gz: 648428ea422b99adc72dfc181d25557c533b7fcfc3053645d331aa03ae0b02e4
+  metadata.gz: ee8259662edd9f4e6cc5e347b1ab2c5e2e6d257e91894675be36a0a7c6d82846
+  data.tar.gz: b14b9da0adef31f19f169ecd35bf6396aa31c06dff003d3b67221578ad67bf43
 SHA512:
-  metadata.gz: bf35db8bd85ff9defea4eedcc6938c93d33aa6f5a55445ca06203b0d41ca59c69aae91d94bf67b8931605aa28fd5bbdc1b5a462d973b38bc84ffa4268199e8b5
-  data.tar.gz: cb04e884de40e3362010f853a29f77e75f8a67451fc29b968bd92e76cd03b232e02aa6c9d065536d80d690918d099fe9bf31f1214162ed7e44b0623ab48219fa
+  metadata.gz: d96291bd116451b2f52c812c391da9d35fcc2795183bc3c7ca816c3b2580016cc73672a66136f21a2d7339b39131dd9e276fc0d800d4349cf1f7a1aca03f145c
+  data.tar.gz: b1101f4609b13ba81d9d88ffaa4447a1acb3e4fcb37210b8e905e69ac9a64fba117cb0ffb09af1b8435bee68fc4879df1a4f928a2cb76717f3396970213b1988

data/README.md

@@ -1,4 +1,4 @@
-## Samlr [![Build Status](https://secure.travis-ci.org/zendesk/samlr.png)](http://travis-ci.org/zendesk/samlr)
+## Samlr
 
 Samlr is a clean room implementation of SAML for Ruby. It's focused on implementing the service provider (SP) side rather than the identity provider (IdP).
 
@@ -14,7 +14,6 @@ saml_request = Samlr::Request.new(nil, {
   })
 ```
 
-
 At this point you can access `request.param` if all you want is the encoded params, or you can get a fully valid request URL with an appropriate `RelayState` value:
 
 ```ruby
@@ -190,6 +189,20 @@ Does not build on JRuby. See issue #2.
 
 Pull requests very welcome. Write tests. Adhere to standards employed (indentation, spaces vs. tabs etc.).
 
+### Releasing a new version
+A new version is published to RubyGems.org every time a change to `version.rb` is pushed to the `main` branch.
+In short, follow these steps:
+1. Update `version.rb`,
+2. merge this change into `main`, and
+3. look at [the action](https://github.com/zendesk/samlr/actions/workflows/publish.yml) for output.
+
+To create a pre-release from a non-main branch:
+1. change the version in `version.rb` to something like `1.2.0.pre.1` or `2.0.0.beta.2`,
+2. push this change to your branch,
+3. go to [Actions → “Publish to RubyGems.org” on GitHub](https://github.com/zendesk/samlr/actions/workflows/publish.yml),
+4. click the “Run workflow” button,
+5. pick your branch from a dropdown.
+
 ### Error reporting
 
 Pull requests with a failing test case much preferred.

data/lib/samlr/signature.rb

@@ -15,10 +15,16 @@ module Samlr
       @document = original.dup
       @prefix   = prefix
       @options  = options
-
-      if @signature = document.at("#{prefix}/ds:Signature", NS_MAP)
-        @signature.remove # enveloped signatures only
+      @signature = nil
+
+      # TODO: This option exists only in a pre-release version to allow testing the feature; remove it from the final release
+      if options[:skip_signature_reference_checking]
+        @signature = @document.at("#{prefix}/ds:Signature", NS_MAP)
+      else
+        id = document.at("#{prefix}")&.attribute('ID')
+        @signature = document.at("#{prefix}/ds:Signature/ds:SignedInfo/ds:Reference[@URI='##{id}']", NS_MAP)&.parent&.parent if id
       end
+      @signature.remove if @signature # enveloped signatures only
 
       @fingerprint = if options[:fingerprint]
         Fingerprint.from_string(options[:fingerprint])

data/lib/samlr/tools/metadata_builder.rb

@@ -13,12 +13,14 @@ module Samlr
         name_identity_format     = options[:name_identity_format]
         consumer_service_url     = options[:consumer_service_url]
         consumer_service_binding = options[:consumer_service_binding] || "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+        metadata_id              = options[:metadata_id] || Samlr::Tools.uuid
+        sign_metadata            = options[:sign_metadata] || false
 
         # Mandatory
-        entity_id                 = options.fetch(:entity_id)
+        entity_id                = options.fetch(:entity_id)
 
         builder = Nokogiri::XML::Builder.new do |xml|
-          xml.EntityDescriptor("xmlns:md" => NS_MAP["md"], "entityID" => entity_id) do
+          xml.EntityDescriptor("xmlns:md" => NS_MAP["md"], "ID" => metadata_id, "entityID" => entity_id) do
             xml.doc.root.namespace = xml.doc.root.namespace_definitions.find { |ns| ns.prefix == "md" }
 
             xml["md"].SPSSODescriptor("protocolSupportEnumeration" => NS_MAP["samlp"]) do
@@ -33,9 +35,15 @@ module Samlr
           end
         end
 
-        builder.to_xml(COMPACT)
-      end
+        metadata = builder.doc
+
+        if sign_metadata
+          metadata_options = options.merge(namespaces: [])
+          metadata = ResponseBuilder.sign(metadata, metadata_id, metadata_options)
+        end
 
+        metadata.to_xml(COMPACT)
+      end
     end
   end
 end

data/lib/samlr/tools/response_builder.rb

@@ -125,7 +125,11 @@ module Samlr
           end unless skip_keyinfo
         end
         # digest.root.last_element_child.after "<SignatureValue>#{signature}</SignatureValue>"
-        element.at("./saml:Issuer", NS_MAP).add_next_sibling(digest)
+        if element.at("./saml:Issuer", NS_MAP)
+          element.at("./saml:Issuer", NS_MAP).add_next_sibling(digest)
+        else
+          element.children.first.add_previous_sibling(digest)
+        end
 
         document
       end

data/lib/samlr/version.rb

@@ -1,3 +1,3 @@
 module Samlr
-  VERSION = "2.6.3"
+  VERSION = "2.7.1.pre.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: samlr
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.7.1.pre.1
 platform: ruby
 authors:
 - Morten Primdahl
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -139,7 +138,6 @@ homepage: https://github.com/zendesk/samlr
 licenses:
 - Apache License Version 2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby tools for SAML
 test_files: []