openid_connect 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f06997a441c5c602002a3b24896e9abd6036b376746124ad25743bf7b1b64e2
-  data.tar.gz: 6456f15afc0c4a58926887765caa3c388f12a55f4afa37f52d4483dc9c5139e3
+  metadata.gz: deb0c8a4b1878a09d9a42f7051201bccfcf4bd4b17f7bdaae0835d30bb4de502
+  data.tar.gz: d7f73dd36717f85c2f084102aa5b89688ed4a76e4742816fbe158ccd0861cc69
 SHA512:
-  metadata.gz: 3fb6ecdd315275864320503e3c6287c03be8a8239bfcc1abe7d652896d2d015d0289b838a691e6711f7c96385e207ab9fafb6628de203327808a8b5568125e25
-  data.tar.gz: 89496d0a2d23455b40099ac2c71137771b43230e40c2f40a2758a315d10b32c9803e012cc6358bc3564d38d968c8fd1e5e4e37031969c526f96c37412804c289
+  metadata.gz: '0801e7a784512bfa3d68cd2c0acd3532afbf1549905510541c0e4575abb1fff11f74bda75d10e770054617b1086510fcd0cbb344d9b9085c65d0292992770cb9'
+  data.tar.gz: c5406c9166d87823ca1a81d13101d6969db7af82d6f274cd9fcaa6152ac8c904003f3f088dab5ce20332f4429c024f3859c1758427cdeb0b24b01102251fedd8

data/.github/workflows/spec.yml

@@ -11,21 +11,21 @@ permissions:
 
 jobs:
   spec:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        os: ['ubuntu-20.04', 'ubuntu-22.04']
-        ruby-version: ['3.1', '3.2', '3.3']
-        include:
-        - os: 'ubuntu-20.04'
-          ruby-version: '3.0'
-    runs-on: ${{ matrix.os }}
-
+        ruby:
+          - '3.2'
+          - '3.3'
+          - '3.4'
+          - '4.0'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Run Specs
       run: bundle exec rake spec

data/README.rdoc

@@ -41,6 +41,10 @@ There is also OpenID Foudation Certified RP implementation using this gem below.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Documentation
+
+see GitHub Wiki (https://github.com/nov/openid_connect/wiki)
+
 == Copyright
 
 Copyright (c) 2011 nov matake. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/openid_connect/access_token.rb

@@ -8,9 +8,17 @@ module OpenIDConnect
       @token_type = :bearer
     end
 
-    def userinfo!(params = {})
+    def userinfo!(params = {}, http_method: :get, headers: {})
+      raise ArgumentError, 'http_method must be :get or :post' unless [:get, :post].include?(http_method)
+
       hash = resource_request do
-        get client.userinfo_uri, params
+        case http_method
+        when :get
+          get client.userinfo_uri, params, headers
+        when :post
+          # Per OIDC Core §5.3.1
+          post client.userinfo_uri, params, { 'Content-Type' => 'application/x-www-form-urlencoded' }.merge(headers)
+        end
       end
       ResponseObject::UserInfo.new hash
     end
@@ -30,7 +38,7 @@ module OpenIDConnect
       when 200
         res.body.with_indifferent_access
       when 400
-        raise BadRequest.new('API Access Faild', res)
+        raise BadRequest.new('API Access Failed', res)
       when 401
         raise Unauthorized.new('Access Token Invalid or Expired', res)
       when 403
@@ -42,4 +50,4 @@ module OpenIDConnect
   end
 end
 
-require 'openid_connect/access_token/mtls'
+require 'openid_connect/access_token/mtls'

data/lib/openid_connect/client/registrar.rb

@@ -118,7 +118,7 @@ module OpenIDConnect
 
       def valid_uri?(uri, schemes = ['http', 'https'])
         # NOTE: specify nil for schemes to allow any schemes
-        URI::regexp(schemes).match(uri).present?
+        URI::DEFAULT_PARSER.make_regexp(schemes).match(uri).present?
       end
 
       def validate_contacts

data/spec/openid_connect/access_token_spec.rb

@@ -92,6 +92,28 @@ describe OpenIDConnect::AccessToken do
       userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
     end
 
+    context 'when http_method is :post' do
+      it 'should make a POST request and return UserInfo' do
+        userinfo = mock_json :post, client.userinfo_uri, 'userinfo/openid', params: {}, request_header: { 'Content-Type' => 'application/x-www-form-urlencoded' } do
+          access_token.userinfo!(http_method: :post)
+        end
+        userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
+      end
+
+      it 'should allow overriding Content-Type via headers' do
+        userinfo = mock_json :post, client.userinfo_uri, 'userinfo/openid', params: {}, request_header: { 'Content-Type' => 'application/json' } do
+          access_token.userinfo!(http_method: :post, headers: { 'Content-Type' => 'application/json' })
+        end
+        userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
+      end
+    end
+
+    context 'when http_method is invalid' do
+      it 'should raise ArgumentError' do
+        expect { access_token.userinfo!(http_method: :delete) }.to raise_error ArgumentError, 'http_method must be :get or :post'
+      end
+    end
+
     describe 'error handling' do
       let(:endpoint) { client.userinfo_uri }
       let(:request) { access_token.userinfo! }

data/spec/openid_connect/discovery/provider/config/resource_spec.rb

@@ -9,7 +9,7 @@ describe OpenIDConnect::Discovery::Provider::Config::Resource do
   describe '#endpoint' do
     context 'when invalid host' do
       before do
-        resource.host = 'hoge*hoge'
+        resource.host = 'invalid:host'
       end
 
       it do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - nov matake
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -362,7 +361,6 @@ homepage: https://github.com/nov/openid_connect
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -377,8 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: OpenID Connect Server & Client Library
 test_files: