rack-oauth2 1.12.0 → 1.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +3 -3
- data/README.rdoc +0 -6
- data/VERSION +1 -1
- data/lib/rack/oauth2/client.rb +8 -5
- data/lib/rack/oauth2/server/rails/response_ext.rb +3 -3
- data/lib/rack/oauth2/server/token.rb +3 -1
- data/lib/rack/oauth2/urn.rb +3 -3
- data/lib/rack/oauth2/util.rb +8 -0
- data/rack-oauth2.gemspec +1 -1
- data/spec/rack/oauth2/client_spec.rb +22 -2
- data/spec/rack/oauth2/server/resource/error_spec.rb +7 -7
- data/spec/rack/oauth2/server/token/client_credentials_spec.rb +32 -2
- data/spec/rack/oauth2/server/token/error_spec.rb +3 -3
- data/spec/rack/oauth2/server/token_spec.rb +1 -1
- data/spec/rack/oauth2/util_spec.rb +10 -0
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 656ec18e337c0382c0bc710623e267cfb073c629ba16541451754b72c22c7e43
|
4
|
+
data.tar.gz: 962b029b37278c0dfb59bdb402b8e5b2f0727f081763738afb5bceea2980b5c3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2911133e3fcf04274a883cd56808b3c44cd42a8db963fe94f008139d74dcfc727e45304a5bd2dc071d111cf86b95fd5ea1b86d57f72ecbd15bbdb28655a1a000
|
7
|
+
data.tar.gz: 5007ba0f4de30144cf0aa3ac924e5ea8e30246f6ad2d70050992c8ac81a487ae5ce36df507f4aa00be5e1ef8a89685bf0dc965e6bb6e79c3f4baef903d70f45d
|
data/.travis.yml
CHANGED
data/README.rdoc
CHANGED
@@ -28,17 +28,11 @@ http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
|
|
28
28
|
|
29
29
|
=== Bearer
|
30
30
|
|
31
|
-
Running on Heroku
|
32
|
-
https://rack-oauth2-sample.heroku.com
|
33
|
-
|
34
31
|
Source on GitHub
|
35
32
|
https://github.com/nov/rack-oauth2-sample
|
36
33
|
|
37
34
|
=== MAC
|
38
35
|
|
39
|
-
Running on Heroku
|
40
|
-
https://rack-oauth2-sample-mac.heroku.com
|
41
|
-
|
42
36
|
Source on GitHub
|
43
37
|
https://github.com/nov/rack-oauth2-sample-mac
|
44
38
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.16.0
|
data/lib/rack/oauth2/client.rb
CHANGED
@@ -16,12 +16,12 @@ module Rack
|
|
16
16
|
end
|
17
17
|
|
18
18
|
def authorization_uri(params = {})
|
19
|
+
params[:redirect_uri] ||= self.redirect_uri
|
19
20
|
params[:response_type] ||= :code
|
20
21
|
params[:response_type] = Array(params[:response_type]).join(' ')
|
21
22
|
params[:scope] = Array(params[:scope]).join(' ')
|
22
23
|
Util.redirect_uri absolute_uri_for(authorization_endpoint), :query, params.merge(
|
23
|
-
client_id: self.identifier
|
24
|
-
redirect_uri: self.redirect_uri
|
24
|
+
client_id: self.identifier
|
25
25
|
)
|
26
26
|
end
|
27
27
|
|
@@ -73,17 +73,20 @@ module Rack
|
|
73
73
|
http_client = Rack::OAuth2.http_client
|
74
74
|
|
75
75
|
# NOTE:
|
76
|
-
# Using Array#
|
76
|
+
# Using Array#extract_options! for backward compatibility.
|
77
77
|
# Until v1.0.5, the first argument was 'client_auth_method' in scalar.
|
78
78
|
options = args.extract_options!
|
79
|
-
client_auth_method = args.first || options.delete(:client_auth_method) || :basic
|
79
|
+
client_auth_method = args.first || options.delete(:client_auth_method).try(:to_sym) || :basic
|
80
80
|
|
81
81
|
params[:scope] = Array(options.delete(:scope)).join(' ') if options[:scope].present?
|
82
82
|
params.merge! options
|
83
83
|
|
84
84
|
case client_auth_method
|
85
85
|
when :basic
|
86
|
-
cred =
|
86
|
+
cred = Base64.strict_encode64 [
|
87
|
+
Util.www_form_url_encode(identifier),
|
88
|
+
Util.www_form_url_encode(secret)
|
89
|
+
].join(':')
|
87
90
|
headers.merge!(
|
88
91
|
'Authorization' => "Basic #{cred}"
|
89
92
|
)
|
@@ -5,7 +5,7 @@ module Rack
|
|
5
5
|
module ResponseExt
|
6
6
|
def redirect?
|
7
7
|
ensure_finish do
|
8
|
-
|
8
|
+
super
|
9
9
|
end
|
10
10
|
end
|
11
11
|
|
@@ -17,7 +17,7 @@ module Rack
|
|
17
17
|
|
18
18
|
def json
|
19
19
|
ensure_finish do
|
20
|
-
@
|
20
|
+
@body
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
@@ -39,7 +39,7 @@ module Rack
|
|
39
39
|
end
|
40
40
|
|
41
41
|
def ensure_finish
|
42
|
-
@status, @header, @
|
42
|
+
@status, @header, @body = finish unless finished?
|
43
43
|
yield
|
44
44
|
end
|
45
45
|
end
|
@@ -49,7 +49,9 @@ module Rack
|
|
49
49
|
def initialize(env)
|
50
50
|
auth = Rack::Auth::Basic::Request.new(env)
|
51
51
|
if auth.provided? && auth.basic?
|
52
|
-
@client_id, @client_secret = auth.credentials
|
52
|
+
@client_id, @client_secret = auth.credentials.map do |cred|
|
53
|
+
Util.www_form_url_decode cred
|
54
|
+
end
|
53
55
|
super
|
54
56
|
else
|
55
57
|
super
|
data/lib/rack/oauth2/urn.rb
CHANGED
@@ -3,14 +3,14 @@ module Rack
|
|
3
3
|
module URN
|
4
4
|
module TokenType
|
5
5
|
JWT = 'urn:ietf:params:oauth:token-type:jwt' # RFC7519
|
6
|
-
ACCESS_TOKEN = 'urn:ietf:params:oauth:token-type:
|
7
|
-
REFRESH_TOKEN = 'urn:ietf:params:oauth:token-type:
|
6
|
+
ACCESS_TOKEN = 'urn:ietf:params:oauth:token-type:access_token' # RFC8693
|
7
|
+
REFRESH_TOKEN = 'urn:ietf:params:oauth:token-type:refresh_token' # RFC8693
|
8
8
|
end
|
9
9
|
|
10
10
|
module GrantType
|
11
11
|
JWT_BEARER = 'urn:ietf:params:oauth:grant-type:jwt-bearer' # RFC7523
|
12
12
|
SAML2_BEARER = 'urn:ietf:params:oauth:grant-type:saml2-bearer' # RFC7522
|
13
|
-
TOKEN_EXCHANGE = 'urn:ietf:params:oauth:grant-type:token-exchange' #
|
13
|
+
TOKEN_EXCHANGE = 'urn:ietf:params:oauth:grant-type:token-exchange' # RFC8693
|
14
14
|
end
|
15
15
|
|
16
16
|
module ClientAssertionType
|
data/lib/rack/oauth2/util.rb
CHANGED
@@ -8,6 +8,14 @@ module Rack
|
|
8
8
|
URI.encode(text, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
|
9
9
|
end
|
10
10
|
|
11
|
+
def www_form_url_encode(text)
|
12
|
+
URI.encode_www_form_component(text)
|
13
|
+
end
|
14
|
+
|
15
|
+
def www_form_url_decode(text)
|
16
|
+
URI.decode_www_form_component(text)
|
17
|
+
end
|
18
|
+
|
11
19
|
def base64_encode(text)
|
12
20
|
Base64.encode64(text).delete("\n")
|
13
21
|
end
|
data/rack-oauth2.gemspec
CHANGED
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
|
|
13
13
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
14
14
|
s.files = `git ls-files`.split("\n")
|
15
15
|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
16
|
-
s.add_runtime_dependency 'rack', '
|
16
|
+
s.add_runtime_dependency 'rack', '>= 2.1.0'
|
17
17
|
s.add_runtime_dependency 'httpclient'
|
18
18
|
s.add_runtime_dependency 'activesupport'
|
19
19
|
s.add_runtime_dependency 'attr_required'
|
@@ -1,10 +1,12 @@
|
|
1
1
|
require 'spec_helper.rb'
|
2
2
|
|
3
3
|
describe Rack::OAuth2::Client do
|
4
|
+
let(:client_id) { 'client_id' }
|
5
|
+
let(:client_secret) { 'client_secret' }
|
4
6
|
let :client do
|
5
7
|
Rack::OAuth2::Client.new(
|
6
|
-
identifier:
|
7
|
-
secret:
|
8
|
+
identifier: client_id,
|
9
|
+
secret: client_secret,
|
8
10
|
host: 'server.example.com',
|
9
11
|
redirect_uri: 'https://client.example.com/callback'
|
10
12
|
)
|
@@ -97,6 +99,24 @@ describe Rack::OAuth2::Client do
|
|
97
99
|
client.access_token!
|
98
100
|
end
|
99
101
|
|
102
|
+
context 'when Basic auth method is used' do
|
103
|
+
context 'when client_id is a url' do
|
104
|
+
let(:client_id) { 'https://client.example.com'}
|
105
|
+
|
106
|
+
it 'should be encoded in "application/x-www-form-urlencoded"' do
|
107
|
+
mock_response(
|
108
|
+
:post,
|
109
|
+
'https://server.example.com/oauth2/token',
|
110
|
+
'tokens/bearer.json',
|
111
|
+
request_header: {
|
112
|
+
'Authorization' => 'Basic aHR0cHMlM0ElMkYlMkZjbGllbnQuZXhhbXBsZS5jb206Y2xpZW50X3NlY3JldA=='
|
113
|
+
}
|
114
|
+
)
|
115
|
+
client.access_token!
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
100
120
|
context 'when jwt_bearer auth method specified' do
|
101
121
|
context 'when client_secret is given' do
|
102
122
|
it 'should be JWT bearer client assertion w/ auto-generated HS256-signed JWT assertion' do
|
@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Resource::BadRequest do
|
|
10
10
|
status, header, response = error.finish
|
11
11
|
status.should == 400
|
12
12
|
header['Content-Type'].should == 'application/json'
|
13
|
-
response.
|
13
|
+
response.should == ['{"error":"invalid_request"}']
|
14
14
|
end
|
15
15
|
end
|
16
16
|
end
|
@@ -44,7 +44,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
|
|
44
44
|
status.should == 401
|
45
45
|
header['Content-Type'].should == 'application/json'
|
46
46
|
header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\", error=\"invalid_token\""
|
47
|
-
response.
|
47
|
+
response.should == ['{"error":"invalid_token"}']
|
48
48
|
end
|
49
49
|
|
50
50
|
context 'when error_code is not invalid_token' do
|
@@ -53,7 +53,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
|
|
53
53
|
it 'should have error_code in body but not in WWW-Authenticate header' do
|
54
54
|
status, header, response = error_with_scheme.finish
|
55
55
|
header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
|
56
|
-
response.
|
56
|
+
response.first.should include '"error":"something"'
|
57
57
|
end
|
58
58
|
end
|
59
59
|
|
@@ -63,7 +63,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
|
|
63
63
|
it 'should have error_code in body but not in WWW-Authenticate header' do
|
64
64
|
status, header, response = error_with_scheme.finish
|
65
65
|
header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
|
66
|
-
response.
|
66
|
+
response.first.should == '{"error":"unauthorized"}'
|
67
67
|
end
|
68
68
|
end
|
69
69
|
|
@@ -74,7 +74,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
|
|
74
74
|
it 'should use given realm' do
|
75
75
|
status, header, response = error_with_scheme.finish
|
76
76
|
header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
|
77
|
-
response.
|
77
|
+
response.first.should include '"error":"something"'
|
78
78
|
end
|
79
79
|
end
|
80
80
|
end
|
@@ -91,7 +91,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
|
|
91
91
|
status, header, response = error.finish
|
92
92
|
status.should == 403
|
93
93
|
header['Content-Type'].should == 'application/json'
|
94
|
-
response.
|
94
|
+
response.should == ['{"error":"insufficient_scope"}']
|
95
95
|
end
|
96
96
|
end
|
97
97
|
|
@@ -100,7 +100,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
|
|
100
100
|
|
101
101
|
it 'should have blank WWW-Authenticate header' do
|
102
102
|
status, header, response = error.finish
|
103
|
-
response.
|
103
|
+
response.first.should include '"scope":"scope1 scope2"'
|
104
104
|
end
|
105
105
|
end
|
106
106
|
end
|
@@ -4,14 +4,19 @@ describe Rack::OAuth2::Server::Token::ClientCredentials do
|
|
4
4
|
let(:request) { Rack::MockRequest.new app }
|
5
5
|
let(:app) do
|
6
6
|
Rack::OAuth2::Server::Token.new do |request, response|
|
7
|
+
unless request.client_id == client_id && request.client_secret == client_secret
|
8
|
+
request.invalid_client!
|
9
|
+
end
|
7
10
|
response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
|
8
11
|
end
|
9
12
|
end
|
13
|
+
let(:client_id) { 'client_id '}
|
14
|
+
let(:client_secret) { 'client_secret' }
|
10
15
|
let(:params) do
|
11
16
|
{
|
12
17
|
grant_type: 'client_credentials',
|
13
|
-
client_id:
|
14
|
-
client_secret:
|
18
|
+
client_id: client_id,
|
19
|
+
client_secret: client_secret
|
15
20
|
}
|
16
21
|
end
|
17
22
|
subject { request.post('/', params: params) }
|
@@ -20,4 +25,29 @@ describe Rack::OAuth2::Server::Token::ClientCredentials do
|
|
20
25
|
its(:content_type) { should == 'application/json' }
|
21
26
|
its(:body) { should include '"access_token":"access_token"' }
|
22
27
|
its(:body) { should include '"token_type":"bearer"' }
|
28
|
+
|
29
|
+
context 'basic auth' do
|
30
|
+
let(:params) do
|
31
|
+
{ grant_type: 'client_credentials' }
|
32
|
+
end
|
33
|
+
let(:encoded_creds) do
|
34
|
+
Base64.strict_encode64([
|
35
|
+
Rack::OAuth2::Util.www_form_url_encode(client_id),
|
36
|
+
Rack::OAuth2::Util.www_form_url_encode(client_secret)
|
37
|
+
].join(':'))
|
38
|
+
end
|
39
|
+
subject do
|
40
|
+
request.post('/',
|
41
|
+
{params: params, 'HTTP_AUTHORIZATION' => "Basic #{encoded_creds}"})
|
42
|
+
end
|
43
|
+
|
44
|
+
its(:status) { should == 200 }
|
45
|
+
|
46
|
+
context 'compliance with RFC6749 sec 2.3.1' do
|
47
|
+
let(:client_id) { 'client: yes/please!' }
|
48
|
+
let(:client_secret) { 'terrible:secret:of:space' }
|
49
|
+
|
50
|
+
its(:status) { should == 200 }
|
51
|
+
end
|
52
|
+
end
|
23
53
|
end
|
@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Token::BadRequest do
|
|
10
10
|
status, header, response = error.finish
|
11
11
|
status.should == 400
|
12
12
|
header['Content-Type'].should == 'application/json'
|
13
|
-
response.
|
13
|
+
response.should == ['{"error":"invalid_request"}']
|
14
14
|
end
|
15
15
|
end
|
16
16
|
end
|
@@ -26,7 +26,7 @@ describe Rack::OAuth2::Server::Token::Unauthorized do
|
|
26
26
|
status.should == 401
|
27
27
|
header['Content-Type'].should == 'application/json'
|
28
28
|
header['WWW-Authenticate'].should == 'Basic realm="OAuth2 Token Endpoint"'
|
29
|
-
response.
|
29
|
+
response.should == ['{"error":"invalid_request"}']
|
30
30
|
end
|
31
31
|
end
|
32
32
|
end
|
@@ -74,4 +74,4 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
|
|
74
74
|
end
|
75
75
|
end
|
76
76
|
end
|
77
|
-
end
|
77
|
+
end
|
@@ -30,7 +30,7 @@ describe Rack::OAuth2::Server::Token do
|
|
30
30
|
it 'should fail with unsupported_grant_type' do
|
31
31
|
status, header, response = app.call(env)
|
32
32
|
status.should == 400
|
33
|
-
response.
|
33
|
+
response.first.should include '"error":"invalid_request"'
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
@@ -14,6 +14,16 @@ describe Rack::OAuth2::Util do
|
|
14
14
|
it { should == '%3D%2B%20.-%2F' }
|
15
15
|
end
|
16
16
|
|
17
|
+
describe '.www_form_url_encode' do
|
18
|
+
subject { util.www_form_url_encode '=+ .-/' }
|
19
|
+
it { should == '%3D%2B+.-%2F' }
|
20
|
+
end
|
21
|
+
|
22
|
+
describe '.www_form_urldecode' do
|
23
|
+
subject { util.www_form_url_decode '%3D%2B+.-%2F' }
|
24
|
+
it { should == '=+ .-/' }
|
25
|
+
end
|
26
|
+
|
17
27
|
describe '.base64_encode' do
|
18
28
|
subject { util.base64_encode '=+ .-/' }
|
19
29
|
it { should == 'PSsgLi0v' }
|
metadata
CHANGED
@@ -1,29 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rack-oauth2
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.16.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- nov matake
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-07-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rack
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 2.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version:
|
26
|
+
version: 2.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: httpclient
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|