openid_connect 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8deb0d1759eb949d6ed62b8373b3c1dd6aae5486
-  data.tar.gz: 1ff841370e692dc3f954991e0c6e962d66693e91
+  metadata.gz: f0fbea732baa979b9d3914c5320be42299fa4331
+  data.tar.gz: e6ba849b29a5153f5bcd18787a42fac8d1043958
 SHA512:
-  metadata.gz: b0d16c5ab0f0c35e8bf0ffb40948bf8b7bd86b7130841f39e0ee0b69436b5c183b0285663bc4423a5a882bdbfc180567b008757c6b58cfe7b4304c5ab0aa2772
-  data.tar.gz: 5c9e70341db9dd1c3d8e92c52aa71f663777f66783c72ca7801558fd18da3c841d913a2905ff995c24aedbff68d50179aff24bf7cfd18d223a9cc61e9961af59
+  metadata.gz: 513a387a23c013b64e7348ad1efaacb8ba00119371bfbbab17e2f598ae6cff17ad26595ac944cacafd389a0184698f7803b3e08a97009b78e50c8f47514dc151
+  data.tar.gz: 27a73927771c8c7e746b0cbce564f858153e8bfdff183753dd268f38d7e9967cc646725c82c7327013ab6952e73de9350c84e2319bb665b52e98c749cf381305

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/openid_connect/discovery/provider/config.rb

@@ -5,7 +5,8 @@ module OpenIDConnect
         def self.discover!(identifier, cache_options = {})
           uri = URI.parse(identifier)
           Resource.new(uri).discover!(cache_options).tap do |response|
-            response.validate! identifier
+            response.expected_issuer = identifier
+            response.validate!
           end
         rescue SWD::Exception, ValidationFailed => e
           raise DiscoveryFailed.new(e.message)

data/lib/openid_connect/discovery/provider/config/response.rb

@@ -7,6 +7,7 @@ module OpenIDConnect
 
           cattr_accessor :metadata_attributes
           attr_reader :raw
+          attr_accessor :expected_issuer
           uri_attributes = {
             required: [
               :issuer,
@@ -55,6 +56,7 @@ module OpenIDConnect
 
           validates *required_attributes, presence: true
           validates *uri_attributes.values.flatten, url: true, allow_nil: true
+          validates :issuer, with: :validate_issuer_matching
 
           def initialize(hash)
             (required_attributes + optional_attributes).each do |key|
@@ -73,9 +75,7 @@ module OpenIDConnect
           end
 
           def validate!(expected_issuer = nil)
-            valid? && (
-              expected_issuer.blank? || issuer == expected_issuer
-            ) or raise ValidationFailed.new(self)
+            valid? or raise ValidationFailed.new(self)
           end
 
           def jwks
@@ -88,6 +88,14 @@ module OpenIDConnect
           def public_keys
             @public_keys ||= jwks.collect(&:to_key)
           end
+
+          private
+
+          def validate_issuer_matching
+            if expected_issuer.present? && issuer != expected_issuer
+              errors.add :issuer, 'mismatch'
+            end
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json