doorkeeper 5.3.3 → 5.6.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +216 -9
- data/README.md +30 -21
- data/app/controllers/doorkeeper/application_controller.rb +1 -0
- data/app/controllers/doorkeeper/applications_controller.rb +4 -4
- data/app/controllers/doorkeeper/authorizations_controller.rb +66 -22
- data/app/controllers/doorkeeper/authorized_applications_controller.rb +3 -3
- data/app/controllers/doorkeeper/token_info_controller.rb +12 -2
- data/app/controllers/doorkeeper/tokens_controller.rb +73 -25
- data/app/helpers/doorkeeper/dashboard_helper.rb +1 -1
- data/app/views/doorkeeper/applications/_form.html.erb +1 -1
- data/app/views/doorkeeper/applications/show.html.erb +35 -14
- data/app/views/doorkeeper/authorizations/error.html.erb +3 -1
- data/app/views/doorkeeper/authorizations/form_post.html.erb +15 -0
- data/app/views/doorkeeper/authorizations/new.html.erb +16 -14
- data/config/locales/en.yml +9 -2
- data/lib/doorkeeper/config/abstract_builder.rb +28 -0
- data/lib/doorkeeper/config/option.rb +26 -14
- data/lib/doorkeeper/config/validations.rb +53 -0
- data/lib/doorkeeper/config.rb +182 -134
- data/lib/doorkeeper/engine.rb +10 -3
- data/lib/doorkeeper/grant_flow/fallback_flow.rb +15 -0
- data/lib/doorkeeper/grant_flow/flow.rb +44 -0
- data/lib/doorkeeper/grant_flow/registry.rb +50 -0
- data/lib/doorkeeper/grant_flow.rb +45 -0
- data/lib/doorkeeper/grape/helpers.rb +1 -1
- data/lib/doorkeeper/helpers/controller.rb +9 -5
- data/lib/doorkeeper/models/access_grant_mixin.rb +22 -19
- data/lib/doorkeeper/models/access_token_mixin.rb +115 -52
- data/lib/doorkeeper/models/application_mixin.rb +5 -4
- data/lib/doorkeeper/models/concerns/expirable.rb +1 -1
- data/lib/doorkeeper/models/concerns/expiration_time_sql_math.rb +88 -0
- data/lib/doorkeeper/models/concerns/polymorphic_resource_owner.rb +30 -0
- data/lib/doorkeeper/models/concerns/resource_ownerable.rb +47 -0
- data/lib/doorkeeper/models/concerns/revocable.rb +1 -1
- data/lib/doorkeeper/models/concerns/scopes.rb +5 -1
- data/lib/doorkeeper/models/concerns/secret_storable.rb +1 -3
- data/lib/doorkeeper/oauth/authorization/code.rb +25 -6
- data/lib/doorkeeper/oauth/authorization/context.rb +5 -5
- data/lib/doorkeeper/oauth/authorization/token.rb +24 -16
- data/lib/doorkeeper/oauth/authorization/uri_builder.rb +4 -4
- data/lib/doorkeeper/oauth/authorization_code_request.rb +34 -21
- data/lib/doorkeeper/oauth/base_request.rb +19 -26
- data/lib/doorkeeper/oauth/client/credentials.rb +2 -4
- data/lib/doorkeeper/oauth/client.rb +1 -1
- data/lib/doorkeeper/oauth/client_credentials/creator.rb +31 -15
- data/lib/doorkeeper/oauth/client_credentials/issuer.rb +4 -2
- data/lib/doorkeeper/oauth/client_credentials/validator.rb +5 -4
- data/lib/doorkeeper/oauth/client_credentials_request.rb +8 -7
- data/lib/doorkeeper/oauth/code_request.rb +4 -4
- data/lib/doorkeeper/oauth/code_response.rb +22 -12
- data/lib/doorkeeper/oauth/error_response.rb +7 -9
- data/lib/doorkeeper/oauth/forbidden_token_response.rb +2 -1
- data/lib/doorkeeper/oauth/helpers/scope_checker.rb +2 -8
- data/lib/doorkeeper/oauth/helpers/unique_token.rb +2 -2
- data/lib/doorkeeper/oauth/helpers/uri_checker.rb +4 -22
- data/lib/doorkeeper/oauth/hooks/context.rb +21 -0
- data/lib/doorkeeper/oauth/invalid_token_response.rb +2 -2
- data/lib/doorkeeper/oauth/password_access_token_request.rb +26 -8
- data/lib/doorkeeper/oauth/pre_authorization.rb +65 -33
- data/lib/doorkeeper/oauth/refresh_token_request.rb +42 -25
- data/lib/doorkeeper/oauth/token.rb +5 -6
- data/lib/doorkeeper/oauth/token_introspection.rb +8 -12
- data/lib/doorkeeper/oauth/token_request.rb +3 -3
- data/lib/doorkeeper/oauth/token_response.rb +2 -3
- data/lib/doorkeeper/orm/active_record/mixins/access_grant.rb +14 -4
- data/lib/doorkeeper/orm/active_record/mixins/access_token.rb +34 -4
- data/lib/doorkeeper/orm/active_record/mixins/application.rb +28 -5
- data/lib/doorkeeper/orm/active_record/redirect_uri_validator.rb +6 -1
- data/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb +5 -2
- data/lib/doorkeeper/orm/active_record.rb +30 -38
- data/lib/doorkeeper/rails/routes/abstract_router.rb +35 -0
- data/lib/doorkeeper/rails/routes/mapper.rb +2 -2
- data/lib/doorkeeper/rails/routes/registry.rb +45 -0
- data/lib/doorkeeper/rails/routes.rb +25 -22
- data/lib/doorkeeper/rake/db.rake +3 -3
- data/lib/doorkeeper/request/password.rb +1 -0
- data/lib/doorkeeper/request/refresh_token.rb +2 -1
- data/lib/doorkeeper/request/strategy.rb +2 -2
- data/lib/doorkeeper/request.rb +49 -12
- data/lib/doorkeeper/server.rb +4 -4
- data/lib/doorkeeper/stale_records_cleaner.rb +4 -4
- data/lib/doorkeeper/version.rb +2 -6
- data/lib/doorkeeper.rb +181 -81
- data/lib/generators/doorkeeper/confidential_applications_generator.rb +1 -1
- data/lib/generators/doorkeeper/enable_polymorphic_resource_owner_generator.rb +39 -0
- data/lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb.erb +3 -1
- data/lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb.erb +2 -0
- data/lib/generators/doorkeeper/templates/enable_pkce_migration.rb.erb +2 -0
- data/lib/generators/doorkeeper/templates/enable_polymorphic_resource_owner_migration.rb.erb +17 -0
- data/lib/generators/doorkeeper/templates/initializer.rb +73 -17
- data/lib/generators/doorkeeper/templates/migration.rb.erb +28 -9
- metadata +48 -316
- data/Appraisals +0 -40
- data/CODE_OF_CONDUCT.md +0 -46
- data/CONTRIBUTING.md +0 -49
- data/Dangerfile +0 -67
- data/Dockerfile +0 -29
- data/Gemfile +0 -25
- data/NEWS.md +0 -1
- data/RELEASING.md +0 -11
- data/Rakefile +0 -28
- data/SECURITY.md +0 -15
- data/UPGRADE.md +0 -2
- data/bin/console +0 -16
- data/doorkeeper.gemspec +0 -42
- data/gemfiles/rails_5_0.gemfile +0 -18
- data/gemfiles/rails_5_1.gemfile +0 -18
- data/gemfiles/rails_5_2.gemfile +0 -18
- data/gemfiles/rails_6_0.gemfile +0 -18
- data/gemfiles/rails_master.gemfile +0 -18
- data/spec/controllers/application_metal_controller_spec.rb +0 -64
- data/spec/controllers/applications_controller_spec.rb +0 -274
- data/spec/controllers/authorizations_controller_spec.rb +0 -608
- data/spec/controllers/protected_resources_controller_spec.rb +0 -361
- data/spec/controllers/token_info_controller_spec.rb +0 -50
- data/spec/controllers/tokens_controller_spec.rb +0 -498
- data/spec/dummy/Rakefile +0 -9
- data/spec/dummy/app/assets/config/manifest.js +0 -2
- data/spec/dummy/app/controllers/application_controller.rb +0 -5
- data/spec/dummy/app/controllers/custom_authorizations_controller.rb +0 -9
- data/spec/dummy/app/controllers/full_protected_resources_controller.rb +0 -14
- data/spec/dummy/app/controllers/home_controller.rb +0 -18
- data/spec/dummy/app/controllers/metal_controller.rb +0 -13
- data/spec/dummy/app/controllers/semi_protected_resources_controller.rb +0 -13
- data/spec/dummy/app/helpers/application_helper.rb +0 -7
- data/spec/dummy/app/models/user.rb +0 -7
- data/spec/dummy/app/views/home/index.html.erb +0 -0
- data/spec/dummy/app/views/layouts/application.html.erb +0 -14
- data/spec/dummy/config/application.rb +0 -49
- data/spec/dummy/config/boot.rb +0 -7
- data/spec/dummy/config/database.yml +0 -15
- data/spec/dummy/config/environment.rb +0 -5
- data/spec/dummy/config/environments/development.rb +0 -31
- data/spec/dummy/config/environments/production.rb +0 -64
- data/spec/dummy/config/environments/test.rb +0 -45
- data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -9
- data/spec/dummy/config/initializers/doorkeeper.rb +0 -166
- data/spec/dummy/config/initializers/secret_token.rb +0 -10
- data/spec/dummy/config/initializers/session_store.rb +0 -10
- data/spec/dummy/config/initializers/wrap_parameters.rb +0 -16
- data/spec/dummy/config/locales/doorkeeper.en.yml +0 -5
- data/spec/dummy/config/routes.rb +0 -13
- data/spec/dummy/config.ru +0 -6
- data/spec/dummy/db/migrate/20111122132257_create_users.rb +0 -11
- data/spec/dummy/db/migrate/20120312140401_add_password_to_users.rb +0 -7
- data/spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb +0 -69
- data/spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb +0 -9
- data/spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb +0 -13
- data/spec/dummy/db/migrate/20170822064514_enable_pkce.rb +0 -8
- data/spec/dummy/db/migrate/20180210183654_add_confidential_to_applications.rb +0 -13
- data/spec/dummy/db/schema.rb +0 -68
- data/spec/dummy/public/404.html +0 -26
- data/spec/dummy/public/422.html +0 -26
- data/spec/dummy/public/500.html +0 -26
- data/spec/dummy/public/favicon.ico +0 -0
- data/spec/dummy/script/rails +0 -9
- data/spec/factories.rb +0 -30
- data/spec/generators/application_owner_generator_spec.rb +0 -28
- data/spec/generators/confidential_applications_generator_spec.rb +0 -29
- data/spec/generators/install_generator_spec.rb +0 -36
- data/spec/generators/migration_generator_spec.rb +0 -28
- data/spec/generators/pkce_generator_spec.rb +0 -28
- data/spec/generators/previous_refresh_token_generator_spec.rb +0 -44
- data/spec/generators/templates/routes.rb +0 -4
- data/spec/generators/views_generator_spec.rb +0 -29
- data/spec/grape/grape_integration_spec.rb +0 -137
- data/spec/helpers/doorkeeper/dashboard_helper_spec.rb +0 -26
- data/spec/lib/config_spec.rb +0 -809
- data/spec/lib/doorkeeper_spec.rb +0 -27
- data/spec/lib/models/expirable_spec.rb +0 -61
- data/spec/lib/models/reusable_spec.rb +0 -40
- data/spec/lib/models/revocable_spec.rb +0 -59
- data/spec/lib/models/scopes_spec.rb +0 -53
- data/spec/lib/models/secret_storable_spec.rb +0 -135
- data/spec/lib/oauth/authorization/uri_builder_spec.rb +0 -39
- data/spec/lib/oauth/authorization_code_request_spec.rb +0 -170
- data/spec/lib/oauth/base_request_spec.rb +0 -224
- data/spec/lib/oauth/base_response_spec.rb +0 -45
- data/spec/lib/oauth/client/credentials_spec.rb +0 -90
- data/spec/lib/oauth/client_credentials/creator_spec.rb +0 -134
- data/spec/lib/oauth/client_credentials/issuer_spec.rb +0 -112
- data/spec/lib/oauth/client_credentials/validation_spec.rb +0 -59
- data/spec/lib/oauth/client_credentials_integration_spec.rb +0 -27
- data/spec/lib/oauth/client_credentials_request_spec.rb +0 -107
- data/spec/lib/oauth/client_spec.rb +0 -38
- data/spec/lib/oauth/code_request_spec.rb +0 -46
- data/spec/lib/oauth/code_response_spec.rb +0 -32
- data/spec/lib/oauth/error_response_spec.rb +0 -64
- data/spec/lib/oauth/error_spec.rb +0 -21
- data/spec/lib/oauth/forbidden_token_response_spec.rb +0 -20
- data/spec/lib/oauth/helpers/scope_checker_spec.rb +0 -110
- data/spec/lib/oauth/helpers/unique_token_spec.rb +0 -21
- data/spec/lib/oauth/helpers/uri_checker_spec.rb +0 -262
- data/spec/lib/oauth/invalid_request_response_spec.rb +0 -73
- data/spec/lib/oauth/invalid_token_response_spec.rb +0 -53
- data/spec/lib/oauth/password_access_token_request_spec.rb +0 -190
- data/spec/lib/oauth/pre_authorization_spec.rb +0 -223
- data/spec/lib/oauth/refresh_token_request_spec.rb +0 -177
- data/spec/lib/oauth/scopes_spec.rb +0 -146
- data/spec/lib/oauth/token_request_spec.rb +0 -157
- data/spec/lib/oauth/token_response_spec.rb +0 -84
- data/spec/lib/oauth/token_spec.rb +0 -156
- data/spec/lib/request/strategy_spec.rb +0 -54
- data/spec/lib/secret_storing/base_spec.rb +0 -60
- data/spec/lib/secret_storing/bcrypt_spec.rb +0 -49
- data/spec/lib/secret_storing/plain_spec.rb +0 -44
- data/spec/lib/secret_storing/sha256_hash_spec.rb +0 -48
- data/spec/lib/server_spec.rb +0 -49
- data/spec/lib/stale_records_cleaner_spec.rb +0 -89
- data/spec/models/doorkeeper/access_grant_spec.rb +0 -161
- data/spec/models/doorkeeper/access_token_spec.rb +0 -622
- data/spec/models/doorkeeper/application_spec.rb +0 -482
- data/spec/requests/applications/applications_request_spec.rb +0 -259
- data/spec/requests/applications/authorized_applications_spec.rb +0 -32
- data/spec/requests/endpoints/authorization_spec.rb +0 -91
- data/spec/requests/endpoints/token_spec.rb +0 -75
- data/spec/requests/flows/authorization_code_errors_spec.rb +0 -79
- data/spec/requests/flows/authorization_code_spec.rb +0 -525
- data/spec/requests/flows/client_credentials_spec.rb +0 -166
- data/spec/requests/flows/implicit_grant_errors_spec.rb +0 -46
- data/spec/requests/flows/implicit_grant_spec.rb +0 -91
- data/spec/requests/flows/password_spec.rb +0 -316
- data/spec/requests/flows/refresh_token_spec.rb +0 -233
- data/spec/requests/flows/revoke_token_spec.rb +0 -157
- data/spec/requests/flows/skip_authorization_spec.rb +0 -66
- data/spec/requests/protected_resources/metal_spec.rb +0 -16
- data/spec/requests/protected_resources/private_api_spec.rb +0 -83
- data/spec/routing/custom_controller_routes_spec.rb +0 -133
- data/spec/routing/default_routes_spec.rb +0 -41
- data/spec/routing/scoped_routes_spec.rb +0 -47
- data/spec/spec_helper.rb +0 -54
- data/spec/spec_helper_integration.rb +0 -4
- data/spec/support/dependencies/factory_bot.rb +0 -4
- data/spec/support/doorkeeper_rspec.rb +0 -22
- data/spec/support/helpers/access_token_request_helper.rb +0 -13
- data/spec/support/helpers/authorization_request_helper.rb +0 -43
- data/spec/support/helpers/config_helper.rb +0 -11
- data/spec/support/helpers/model_helper.rb +0 -78
- data/spec/support/helpers/request_spec_helper.rb +0 -110
- data/spec/support/helpers/url_helper.rb +0 -62
- data/spec/support/orm/active_record.rb +0 -5
- data/spec/support/shared/controllers_shared_context.rb +0 -133
- data/spec/support/shared/hashing_shared_context.rb +0 -36
- data/spec/support/shared/models_shared_examples.rb +0 -54
- data/spec/validators/redirect_uri_validator_spec.rb +0 -183
- data/spec/version/version_spec.rb +0 -17
@@ -4,21 +4,27 @@ module Doorkeeper
|
|
4
4
|
module OAuth
|
5
5
|
module Authorization
|
6
6
|
class Code
|
7
|
-
|
7
|
+
attr_reader :pre_auth, :resource_owner, :token
|
8
8
|
|
9
9
|
def initialize(pre_auth, resource_owner)
|
10
10
|
@pre_auth = pre_auth
|
11
11
|
@resource_owner = resource_owner
|
12
12
|
end
|
13
13
|
|
14
|
-
def issue_token
|
15
|
-
@token
|
14
|
+
def issue_token!
|
15
|
+
return @token if defined?(@token)
|
16
|
+
|
17
|
+
@token = Doorkeeper.config.access_grant_model.create!(access_grant_attributes)
|
16
18
|
end
|
17
19
|
|
18
20
|
def oob_redirect
|
19
21
|
{ action: :show, code: token.plaintext_token }
|
20
22
|
end
|
21
23
|
|
24
|
+
def access_grant?
|
25
|
+
true
|
26
|
+
end
|
27
|
+
|
22
28
|
private
|
23
29
|
|
24
30
|
def authorization_code_expires_in
|
@@ -26,13 +32,26 @@ module Doorkeeper
|
|
26
32
|
end
|
27
33
|
|
28
34
|
def access_grant_attributes
|
29
|
-
|
35
|
+
attributes = {
|
30
36
|
application_id: pre_auth.client.id,
|
31
|
-
resource_owner_id: resource_owner.id,
|
32
37
|
expires_in: authorization_code_expires_in,
|
33
38
|
redirect_uri: pre_auth.redirect_uri,
|
34
39
|
scopes: pre_auth.scopes.to_s,
|
35
|
-
|
40
|
+
}
|
41
|
+
|
42
|
+
if Doorkeeper.config.polymorphic_resource_owner?
|
43
|
+
attributes[:resource_owner] = resource_owner
|
44
|
+
else
|
45
|
+
attributes[:resource_owner_id] = resource_owner.id
|
46
|
+
end
|
47
|
+
|
48
|
+
pkce_attributes.merge(attributes).merge(custom_attributes)
|
49
|
+
end
|
50
|
+
|
51
|
+
def custom_attributes
|
52
|
+
# Custom access token attributes are saved into the access grant,
|
53
|
+
# and then included in subsequently generated access tokens.
|
54
|
+
@pre_auth.custom_access_token_attributes.to_h.with_indifferent_access
|
36
55
|
end
|
37
56
|
|
38
57
|
def pkce_attributes
|
@@ -4,12 +4,12 @@ module Doorkeeper
|
|
4
4
|
module OAuth
|
5
5
|
module Authorization
|
6
6
|
class Context
|
7
|
-
attr_reader :client, :grant_type, :scopes
|
7
|
+
attr_reader :client, :grant_type, :resource_owner, :scopes
|
8
8
|
|
9
|
-
def initialize(
|
10
|
-
|
11
|
-
|
12
|
-
|
9
|
+
def initialize(**attributes)
|
10
|
+
attributes.each do |name, value|
|
11
|
+
instance_variable_set(:"@#{name}", value) if respond_to?(name)
|
12
|
+
end
|
13
13
|
end
|
14
14
|
end
|
15
15
|
end
|
@@ -4,10 +4,10 @@ module Doorkeeper
|
|
4
4
|
module OAuth
|
5
5
|
module Authorization
|
6
6
|
class Token
|
7
|
-
|
7
|
+
attr_reader :pre_auth, :resource_owner, :token
|
8
8
|
|
9
9
|
class << self
|
10
|
-
def build_context(pre_auth_or_oauth_client, grant_type, scopes)
|
10
|
+
def build_context(pre_auth_or_oauth_client, grant_type, scopes, resource_owner)
|
11
11
|
oauth_client = if pre_auth_or_oauth_client.respond_to?(:application)
|
12
12
|
pre_auth_or_oauth_client.application
|
13
13
|
elsif pre_auth_or_oauth_client.respond_to?(:client)
|
@@ -17,9 +17,10 @@ module Doorkeeper
|
|
17
17
|
end
|
18
18
|
|
19
19
|
Doorkeeper::OAuth::Authorization::Context.new(
|
20
|
-
oauth_client,
|
21
|
-
grant_type,
|
22
|
-
scopes,
|
20
|
+
client: oauth_client,
|
21
|
+
grant_type: grant_type,
|
22
|
+
scopes: scopes,
|
23
|
+
resource_owner: resource_owner,
|
23
24
|
)
|
24
25
|
end
|
25
26
|
|
@@ -48,24 +49,31 @@ module Doorkeeper
|
|
48
49
|
@resource_owner = resource_owner
|
49
50
|
end
|
50
51
|
|
51
|
-
def issue_token
|
52
|
+
def issue_token!
|
52
53
|
return @token if defined?(@token)
|
53
54
|
|
54
55
|
context = self.class.build_context(
|
55
56
|
pre_auth.client,
|
56
57
|
Doorkeeper::OAuth::IMPLICIT,
|
57
58
|
pre_auth.scopes,
|
59
|
+
resource_owner,
|
58
60
|
)
|
59
61
|
|
60
|
-
@token =
|
61
|
-
|
62
|
-
resource_owner
|
63
|
-
pre_auth.scopes,
|
64
|
-
self.class.access_token_expires_in(
|
65
|
-
false,
|
62
|
+
@token = Doorkeeper.config.access_token_model.find_or_create_for(
|
63
|
+
application: application,
|
64
|
+
resource_owner: resource_owner,
|
65
|
+
scopes: pre_auth.scopes,
|
66
|
+
expires_in: self.class.access_token_expires_in(Doorkeeper.config, context),
|
67
|
+
use_refresh_token: false,
|
66
68
|
)
|
67
69
|
end
|
68
70
|
|
71
|
+
def application
|
72
|
+
return unless pre_auth.client
|
73
|
+
|
74
|
+
pre_auth.client.is_a?(Doorkeeper.config.application_model) ? pre_auth.client : pre_auth.client.application
|
75
|
+
end
|
76
|
+
|
69
77
|
def oob_redirect
|
70
78
|
{
|
71
79
|
controller: controller,
|
@@ -74,12 +82,12 @@ module Doorkeeper
|
|
74
82
|
}
|
75
83
|
end
|
76
84
|
|
77
|
-
|
78
|
-
|
79
|
-
def configuration
|
80
|
-
Doorkeeper.config
|
85
|
+
def access_token?
|
86
|
+
true
|
81
87
|
end
|
82
88
|
|
89
|
+
private
|
90
|
+
|
83
91
|
def controller
|
84
92
|
@controller ||= begin
|
85
93
|
mapping = Doorkeeper::Rails::Routes.mapping[:token_info] || {}
|
@@ -8,9 +8,9 @@ module Doorkeeper
|
|
8
8
|
class URIBuilder
|
9
9
|
class << self
|
10
10
|
def uri_with_query(url, parameters = {})
|
11
|
-
uri
|
11
|
+
uri = URI.parse(url)
|
12
12
|
original_query = Rack::Utils.parse_query(uri.query)
|
13
|
-
uri.query
|
13
|
+
uri.query = build_query(original_query.merge(parameters))
|
14
14
|
uri.to_s
|
15
15
|
end
|
16
16
|
|
@@ -23,8 +23,8 @@ module Doorkeeper
|
|
23
23
|
private
|
24
24
|
|
25
25
|
def build_query(parameters = {})
|
26
|
-
parameters
|
27
|
-
Rack::Utils.build_query
|
26
|
+
parameters.reject! { |_, value| value.blank? }
|
27
|
+
Rack::Utils.build_query(parameters)
|
28
28
|
end
|
29
29
|
end
|
30
30
|
end
|
@@ -3,17 +3,15 @@
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
5
|
class AuthorizationCodeRequest < BaseRequest
|
6
|
-
validate :pkce_support, error: :invalid_request
|
7
6
|
validate :params, error: :invalid_request
|
8
7
|
validate :client, error: :invalid_client
|
9
8
|
validate :grant, error: :invalid_grant
|
10
|
-
# @see https://
|
9
|
+
# @see https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
|
11
10
|
validate :redirect_uri, error: :invalid_grant
|
12
11
|
validate :code_verifier, error: :invalid_grant
|
13
12
|
|
14
|
-
|
15
|
-
|
16
|
-
attr_reader :invalid_request_reason, :missing_param
|
13
|
+
attr_reader :grant, :client, :redirect_uri, :access_token, :code_verifier,
|
14
|
+
:invalid_request_reason, :missing_param
|
17
15
|
|
18
16
|
def initialize(server, grant, client, parameters = {})
|
19
17
|
@server = server
|
@@ -35,28 +33,35 @@ module Doorkeeper
|
|
35
33
|
|
36
34
|
find_or_create_access_token(
|
37
35
|
grant.application,
|
38
|
-
|
36
|
+
resource_owner,
|
39
37
|
grant.scopes,
|
38
|
+
custom_token_attributes_with_data,
|
40
39
|
server,
|
41
40
|
)
|
42
41
|
end
|
42
|
+
|
43
43
|
super
|
44
44
|
end
|
45
45
|
|
46
|
-
def
|
47
|
-
|
48
|
-
|
49
|
-
|
46
|
+
def resource_owner
|
47
|
+
if Doorkeeper.config.polymorphic_resource_owner?
|
48
|
+
grant.resource_owner
|
49
|
+
else
|
50
|
+
grant.resource_owner_id
|
51
|
+
end
|
52
|
+
end
|
50
53
|
|
51
|
-
|
54
|
+
def pkce_supported?
|
55
|
+
Doorkeeper.config.access_grant_model.pkce_supported?
|
52
56
|
end
|
53
57
|
|
54
58
|
def validate_params
|
55
|
-
@missing_param =
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
59
|
+
@missing_param =
|
60
|
+
if grant&.uses_pkce? && code_verifier.blank?
|
61
|
+
:code_verifier
|
62
|
+
elsif redirect_uri.blank?
|
63
|
+
:redirect_uri
|
64
|
+
end
|
60
65
|
|
61
66
|
@missing_param.nil?
|
62
67
|
end
|
@@ -78,11 +83,11 @@ module Doorkeeper
|
|
78
83
|
)
|
79
84
|
end
|
80
85
|
|
81
|
-
# if either side (server or client) request
|
82
|
-
# against the DB - if
|
86
|
+
# if either side (server or client) request PKCE, check the verifier
|
87
|
+
# against the DB - if PKCE is supported
|
83
88
|
def validate_code_verifier
|
84
|
-
return true unless
|
85
|
-
return
|
89
|
+
return true unless pkce_supported?
|
90
|
+
return grant.code_challenge.blank? if code_verifier.blank?
|
86
91
|
|
87
92
|
if grant.code_challenge_method == "S256"
|
88
93
|
grant.code_challenge == generate_code_challenge(code_verifier)
|
@@ -94,7 +99,15 @@ module Doorkeeper
|
|
94
99
|
end
|
95
100
|
|
96
101
|
def generate_code_challenge(code_verifier)
|
97
|
-
|
102
|
+
Doorkeeper.config.access_grant_model.generate_code_challenge(code_verifier)
|
103
|
+
end
|
104
|
+
|
105
|
+
def custom_token_attributes_with_data
|
106
|
+
grant
|
107
|
+
.attributes
|
108
|
+
.with_indifferent_access
|
109
|
+
.slice(*Doorkeeper.config.custom_access_token_attributes)
|
110
|
+
.symbolize_keys
|
98
111
|
end
|
99
112
|
end
|
100
113
|
end
|
@@ -5,11 +5,11 @@ module Doorkeeper
|
|
5
5
|
class BaseRequest
|
6
6
|
include Validations
|
7
7
|
|
8
|
-
attr_reader :grant_type
|
8
|
+
attr_reader :grant_type, :server
|
9
9
|
|
10
|
-
|
11
|
-
validate
|
10
|
+
delegate :default_scopes, to: :server
|
12
11
|
|
12
|
+
def authorize
|
13
13
|
if valid?
|
14
14
|
before_successful_response
|
15
15
|
@response = TokenResponse.new(access_token)
|
@@ -26,35 +26,28 @@ module Doorkeeper
|
|
26
26
|
@scopes ||= build_scopes
|
27
27
|
end
|
28
28
|
|
29
|
-
def
|
30
|
-
|
31
|
-
|
29
|
+
def find_or_create_access_token(client, resource_owner, scopes, custom_attributes, server)
|
30
|
+
context = Authorization::Token.build_context(client, grant_type, scopes, resource_owner)
|
31
|
+
application = client.is_a?(Doorkeeper.config.application_model) ? client : client&.application
|
32
32
|
|
33
|
-
|
34
|
-
|
35
|
-
|
33
|
+
token_attributes = {
|
34
|
+
application: application,
|
35
|
+
resource_owner: resource_owner,
|
36
|
+
scopes: scopes,
|
37
|
+
expires_in: Authorization::Token.access_token_expires_in(server, context),
|
38
|
+
use_refresh_token: Authorization::Token.refresh_token_enabled?(server, context),
|
39
|
+
}
|
36
40
|
|
37
|
-
|
38
|
-
|
39
|
-
@access_token = server_config.access_token_model.find_or_create_for(
|
40
|
-
client,
|
41
|
-
resource_owner_id,
|
42
|
-
scopes,
|
43
|
-
Authorization::Token.access_token_expires_in(server, context),
|
44
|
-
Authorization::Token.refresh_token_enabled?(server, context),
|
45
|
-
)
|
41
|
+
@access_token =
|
42
|
+
Doorkeeper.config.access_token_model.find_or_create_for(**token_attributes.merge(custom_attributes))
|
46
43
|
end
|
47
44
|
|
48
45
|
def before_successful_response
|
49
|
-
|
46
|
+
Doorkeeper.config.before_successful_strategy_response.call(self)
|
50
47
|
end
|
51
48
|
|
52
49
|
def after_successful_response
|
53
|
-
|
54
|
-
end
|
55
|
-
|
56
|
-
def server_config
|
57
|
-
Doorkeeper.config
|
50
|
+
Doorkeeper.config.after_successful_strategy_response.call(self, @response)
|
58
51
|
end
|
59
52
|
|
60
53
|
private
|
@@ -63,10 +56,10 @@ module Doorkeeper
|
|
63
56
|
if @original_scopes.present?
|
64
57
|
OAuth::Scopes.from_string(@original_scopes)
|
65
58
|
else
|
66
|
-
client_scopes = @client
|
59
|
+
client_scopes = @client&.scopes
|
67
60
|
return default_scopes if client_scopes.blank?
|
68
61
|
|
69
|
-
default_scopes &
|
62
|
+
default_scopes & client_scopes
|
70
63
|
end
|
71
64
|
end
|
72
65
|
end
|
@@ -9,7 +9,7 @@ module Doorkeeper
|
|
9
9
|
credentials_methods.inject(nil) do |_, method|
|
10
10
|
method = self.method(method) if method.is_a?(Symbol)
|
11
11
|
credentials = Credentials.new(*method.call(request))
|
12
|
-
break credentials
|
12
|
+
break credentials if credentials.present?
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
@@ -27,9 +27,7 @@ module Doorkeeper
|
|
27
27
|
|
28
28
|
# Public clients may have their secret blank, but "credentials" are
|
29
29
|
# still present
|
30
|
-
|
31
|
-
uid.blank?
|
32
|
-
end
|
30
|
+
delegate :blank?, to: :uid
|
33
31
|
end
|
34
32
|
end
|
35
33
|
end
|
@@ -2,34 +2,50 @@
|
|
2
2
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
|
-
|
5
|
+
module ClientCredentials
|
6
6
|
class Creator
|
7
7
|
def call(client, scopes, attributes = {})
|
8
|
-
|
9
|
-
existing_token = find_existing_token_for(client, scopes)
|
10
|
-
return existing_token if server_config.reuse_access_token && existing_token&.reusable?
|
8
|
+
existing_token = nil
|
11
9
|
|
12
|
-
|
10
|
+
if lookup_existing_token?
|
11
|
+
existing_token = find_active_existing_token_for(client, scopes)
|
12
|
+
return existing_token if Doorkeeper.config.reuse_access_token && existing_token&.reusable?
|
13
13
|
end
|
14
14
|
|
15
|
-
|
16
|
-
client
|
17
|
-
|
18
|
-
|
15
|
+
with_revocation(existing_token: existing_token) do
|
16
|
+
application = client.is_a?(Doorkeeper.config.application_model) ? client : client&.application
|
17
|
+
Doorkeeper.config.access_token_model.create_for(
|
18
|
+
application: application,
|
19
|
+
resource_owner: nil,
|
20
|
+
scopes: scopes,
|
21
|
+
**attributes,
|
22
|
+
)
|
23
|
+
end
|
19
24
|
end
|
20
25
|
|
21
26
|
private
|
22
27
|
|
23
|
-
def
|
24
|
-
|
28
|
+
def with_revocation(existing_token:)
|
29
|
+
if existing_token && Doorkeeper.config.revoke_previous_client_credentials_token?
|
30
|
+
existing_token.with_lock do
|
31
|
+
raise Errors::DoorkeeperError, :invalid_token_reuse if existing_token.revoked?
|
32
|
+
|
33
|
+
existing_token.revoke
|
34
|
+
|
35
|
+
yield
|
36
|
+
end
|
37
|
+
else
|
38
|
+
yield
|
39
|
+
end
|
25
40
|
end
|
26
41
|
|
27
|
-
def
|
28
|
-
|
42
|
+
def lookup_existing_token?
|
43
|
+
Doorkeeper.config.reuse_access_token ||
|
44
|
+
Doorkeeper.config.revoke_previous_client_credentials_token?
|
29
45
|
end
|
30
46
|
|
31
|
-
def
|
32
|
-
Doorkeeper.config
|
47
|
+
def find_active_existing_token_for(client, scopes)
|
48
|
+
Doorkeeper.config.access_token_model.matching_token_for(client, nil, scopes, include_expired: false)
|
33
49
|
end
|
34
50
|
end
|
35
51
|
end
|
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
|
-
|
5
|
+
module ClientCredentials
|
6
6
|
class Issuer
|
7
|
-
|
7
|
+
attr_reader :token, :validator, :error
|
8
8
|
|
9
9
|
def initialize(server, validator)
|
10
10
|
@server = server
|
@@ -19,6 +19,7 @@ module Doorkeeper
|
|
19
19
|
@token = false
|
20
20
|
@error = validator.error
|
21
21
|
end
|
22
|
+
|
22
23
|
@token
|
23
24
|
end
|
24
25
|
|
@@ -29,6 +30,7 @@ module Doorkeeper
|
|
29
30
|
client,
|
30
31
|
Doorkeeper::OAuth::CLIENT_CREDENTIALS,
|
31
32
|
scopes,
|
33
|
+
nil,
|
32
34
|
)
|
33
35
|
ttl = Authorization::Token.access_token_expires_in(@server, context)
|
34
36
|
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
|
-
|
5
|
+
module ClientCredentials
|
6
6
|
class Validator
|
7
7
|
include Validations
|
8
8
|
include OAuth::Helpers
|
@@ -26,20 +26,21 @@ module Doorkeeper
|
|
26
26
|
end
|
27
27
|
|
28
28
|
def validate_client_supports_grant_flow
|
29
|
+
return if @client.blank?
|
30
|
+
|
29
31
|
Doorkeeper.config.allow_grant_flow_for_client?(
|
30
32
|
Doorkeeper::OAuth::CLIENT_CREDENTIALS,
|
31
|
-
@client,
|
33
|
+
@client.application,
|
32
34
|
)
|
33
35
|
end
|
34
36
|
|
35
37
|
def validate_scopes
|
36
|
-
return true if @request.scopes.blank?
|
37
|
-
|
38
38
|
application_scopes = if @client.present?
|
39
39
|
@client.application.scopes
|
40
40
|
else
|
41
41
|
""
|
42
42
|
end
|
43
|
+
return true if @request.scopes.blank? && application_scopes.blank?
|
43
44
|
|
44
45
|
ScopeChecker.valid?(
|
45
46
|
scope_str: @request.scopes.to_s,
|
@@ -3,18 +3,12 @@
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
5
|
class ClientCredentialsRequest < BaseRequest
|
6
|
-
|
7
|
-
attr_reader :response
|
8
|
-
attr_writer :issuer
|
6
|
+
attr_reader :client, :original_scopes, :response
|
9
7
|
|
10
8
|
alias error_response response
|
11
9
|
|
12
10
|
delegate :error, to: :issuer
|
13
11
|
|
14
|
-
def issuer
|
15
|
-
@issuer ||= Issuer.new(server, Validator.new(server, self))
|
16
|
-
end
|
17
|
-
|
18
12
|
def initialize(server, client, parameters = {})
|
19
13
|
@client = client
|
20
14
|
@server = server
|
@@ -26,6 +20,13 @@ module Doorkeeper
|
|
26
20
|
issuer.token
|
27
21
|
end
|
28
22
|
|
23
|
+
def issuer
|
24
|
+
@issuer ||= ClientCredentials::Issuer.new(
|
25
|
+
server,
|
26
|
+
ClientCredentials::Validator.new(server, self),
|
27
|
+
)
|
28
|
+
end
|
29
|
+
|
29
30
|
private
|
30
31
|
|
31
32
|
def valid?
|
@@ -3,17 +3,17 @@
|
|
3
3
|
module Doorkeeper
|
4
4
|
module OAuth
|
5
5
|
class CodeRequest
|
6
|
-
|
6
|
+
attr_reader :pre_auth, :resource_owner
|
7
7
|
|
8
8
|
def initialize(pre_auth, resource_owner)
|
9
|
-
@pre_auth
|
9
|
+
@pre_auth = pre_auth
|
10
10
|
@resource_owner = resource_owner
|
11
11
|
end
|
12
12
|
|
13
13
|
def authorize
|
14
14
|
auth = Authorization::Code.new(pre_auth, resource_owner)
|
15
|
-
auth.issue_token
|
16
|
-
CodeResponse.new(pre_auth, auth)
|
15
|
+
auth.issue_token!
|
16
|
+
CodeResponse.new(pre_auth, auth, response_on_fragment: pre_auth.response_mode == "fragment")
|
17
17
|
end
|
18
18
|
|
19
19
|
def deny
|
@@ -5,7 +5,7 @@ module Doorkeeper
|
|
5
5
|
class CodeResponse < BaseResponse
|
6
6
|
include OAuth::Helpers
|
7
7
|
|
8
|
-
|
8
|
+
attr_reader :pre_auth, :auth, :response_on_fragment
|
9
9
|
|
10
10
|
def initialize(pre_auth, auth, options = {})
|
11
11
|
@pre_auth = pre_auth
|
@@ -17,23 +17,33 @@ module Doorkeeper
|
|
17
17
|
true
|
18
18
|
end
|
19
19
|
|
20
|
-
def
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
20
|
+
def issued_token
|
21
|
+
auth.token
|
22
|
+
end
|
23
|
+
|
24
|
+
def body
|
25
|
+
if auth.try(:access_token?)
|
26
|
+
{
|
26
27
|
access_token: auth.token.plaintext_token,
|
27
28
|
token_type: auth.token.token_type,
|
28
29
|
expires_in: auth.token.expires_in_seconds,
|
29
30
|
state: pre_auth.state,
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
pre_auth.redirect_uri,
|
31
|
+
}
|
32
|
+
elsif auth.try(:access_grant?)
|
33
|
+
{
|
34
34
|
code: auth.token.plaintext_token,
|
35
35
|
state: pre_auth.state,
|
36
|
-
|
36
|
+
}
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
def redirect_uri
|
41
|
+
if URIChecker.oob_uri?(pre_auth.redirect_uri)
|
42
|
+
auth.oob_redirect
|
43
|
+
elsif response_on_fragment
|
44
|
+
Authorization::URIBuilder.uri_with_fragment(pre_auth.redirect_uri, body)
|
45
|
+
else
|
46
|
+
Authorization::URIBuilder.uri_with_query(pre_auth.redirect_uri, body)
|
37
47
|
end
|
38
48
|
end
|
39
49
|
end
|