doorkeeper 5.3.3 → 5.4.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of doorkeeper might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +82 -4
- data/README.md +6 -4
- data/app/controllers/doorkeeper/applications_controller.rb +4 -4
- data/app/controllers/doorkeeper/authorizations_controller.rb +31 -12
- data/app/controllers/doorkeeper/authorized_applications_controller.rb +2 -2
- data/app/controllers/doorkeeper/tokens_controller.rb +57 -20
- data/app/views/doorkeeper/applications/_form.html.erb +1 -1
- data/app/views/doorkeeper/applications/show.html.erb +19 -2
- data/config/locales/en.yml +3 -1
- data/lib/doorkeeper/config/abstract_builder.rb +28 -0
- data/lib/doorkeeper/config/option.rb +28 -14
- data/lib/doorkeeper/config.rb +64 -35
- data/lib/doorkeeper/engine.rb +1 -1
- data/lib/doorkeeper/grape/helpers.rb +1 -1
- data/lib/doorkeeper/helpers/controller.rb +4 -4
- data/lib/doorkeeper/models/access_grant_mixin.rb +20 -16
- data/lib/doorkeeper/models/access_token_mixin.rb +108 -45
- data/lib/doorkeeper/models/application_mixin.rb +5 -4
- 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 +15 -6
- data/lib/doorkeeper/oauth/authorization/context.rb +2 -2
- data/lib/doorkeeper/oauth/authorization/token.rb +8 -12
- data/lib/doorkeeper/oauth/authorization/uri_builder.rb +4 -4
- data/lib/doorkeeper/oauth/authorization_code_request.rb +18 -8
- data/lib/doorkeeper/oauth/base_request.rb +11 -19
- 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 +26 -8
- data/lib/doorkeeper/oauth/client_credentials/issuer.rb +3 -2
- data/lib/doorkeeper/oauth/client_credentials/validator.rb +4 -2
- data/lib/doorkeeper/oauth/client_credentials_request.rb +8 -7
- data/lib/doorkeeper/oauth/code_request.rb +3 -3
- data/lib/doorkeeper/oauth/code_response.rb +6 -2
- data/lib/doorkeeper/oauth/error_response.rb +2 -4
- data/lib/doorkeeper/oauth/helpers/scope_checker.rb +1 -5
- 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 +4 -6
- data/lib/doorkeeper/oauth/pre_authorization.rb +36 -30
- data/lib/doorkeeper/oauth/refresh_token_request.rb +18 -22
- data/lib/doorkeeper/oauth/token.rb +5 -6
- data/lib/doorkeeper/oauth/token_introspection.rb +4 -8
- data/lib/doorkeeper/oauth/token_request.rb +3 -3
- data/lib/doorkeeper/oauth/token_response.rb +1 -1
- data/lib/doorkeeper/orm/active_record/mixins/access_grant.rb +8 -3
- data/lib/doorkeeper/orm/active_record/mixins/access_token.rb +7 -3
- data/lib/doorkeeper/orm/active_record.rb +10 -2
- 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 +13 -17
- data/lib/doorkeeper/request/refresh_token.rb +2 -1
- data/lib/doorkeeper/request/strategy.rb +2 -2
- data/lib/doorkeeper/server.rb +4 -4
- data/lib/doorkeeper/stale_records_cleaner.rb +4 -4
- data/lib/doorkeeper/version.rb +2 -2
- data/lib/doorkeeper.rb +106 -79
- 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 +2 -0
- 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 +39 -3
- data/lib/generators/doorkeeper/templates/migration.rb.erb +14 -5
- metadata +13 -296
- 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
@@ -1,161 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require "spec_helper"
|
4
|
-
|
5
|
-
describe Doorkeeper::AccessGrant do
|
6
|
-
let(:client) { FactoryBot.build_stubbed(:application) }
|
7
|
-
let(:clazz) { Doorkeeper::AccessGrant }
|
8
|
-
|
9
|
-
subject { FactoryBot.build(:access_grant, application: client) }
|
10
|
-
|
11
|
-
it { expect(subject).to be_valid }
|
12
|
-
|
13
|
-
it_behaves_like "an accessible token"
|
14
|
-
it_behaves_like "a revocable token"
|
15
|
-
it_behaves_like "a unique token" do
|
16
|
-
let(:factory_name) { :access_grant }
|
17
|
-
end
|
18
|
-
|
19
|
-
context "with hashing enabled" do
|
20
|
-
let(:grant) { FactoryBot.create :access_grant }
|
21
|
-
include_context "with token hashing enabled"
|
22
|
-
|
23
|
-
it "holds a volatile plaintext token when created" do
|
24
|
-
expect(grant.plaintext_token).to be_a(String)
|
25
|
-
expect(grant.token)
|
26
|
-
.to eq(hashed_or_plain_token_func.call(grant.plaintext_token))
|
27
|
-
|
28
|
-
# Finder method only finds the hashed token
|
29
|
-
loaded = clazz.find_by(token: grant.token)
|
30
|
-
expect(loaded).to eq(grant)
|
31
|
-
expect(loaded.plaintext_token).to be_nil
|
32
|
-
expect(loaded.token).to eq(grant.token)
|
33
|
-
end
|
34
|
-
|
35
|
-
it "does not find_by plain text tokens" do
|
36
|
-
expect(clazz.find_by(token: grant.plaintext_token)).to be_nil
|
37
|
-
end
|
38
|
-
|
39
|
-
describe "with having a plain text token" do
|
40
|
-
let(:plain_text_token) { "plain text token" }
|
41
|
-
|
42
|
-
before do
|
43
|
-
# Assume we have a plain text token from before activating the option
|
44
|
-
grant.update_column(:token, plain_text_token)
|
45
|
-
end
|
46
|
-
|
47
|
-
context "without fallback lookup" do
|
48
|
-
it "does not provide lookups with either through by_token" do
|
49
|
-
expect(clazz.by_token(plain_text_token)).to eq(nil)
|
50
|
-
expect(clazz.by_token(grant.token)).to eq(nil)
|
51
|
-
|
52
|
-
# And it does not touch the token
|
53
|
-
grant.reload
|
54
|
-
expect(grant.token).to eq(plain_text_token)
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
|
-
context "with fallback lookup" do
|
59
|
-
include_context "with token hashing and fallback lookup enabled"
|
60
|
-
|
61
|
-
it "upgrades a plain token when falling back to it" do
|
62
|
-
# Side-effect: This will automatically upgrade the token
|
63
|
-
expect(clazz).to receive(:upgrade_fallback_value).and_call_original
|
64
|
-
expect(clazz.by_token(plain_text_token))
|
65
|
-
.to have_attributes(
|
66
|
-
resource_owner_id: grant.resource_owner_id,
|
67
|
-
application_id: grant.application_id,
|
68
|
-
redirect_uri: grant.redirect_uri,
|
69
|
-
expires_in: grant.expires_in,
|
70
|
-
scopes: grant.scopes,
|
71
|
-
)
|
72
|
-
|
73
|
-
# Will find subsequently by hashing the token
|
74
|
-
expect(clazz.by_token(plain_text_token))
|
75
|
-
.to have_attributes(
|
76
|
-
resource_owner_id: grant.resource_owner_id,
|
77
|
-
application_id: grant.application_id,
|
78
|
-
redirect_uri: grant.redirect_uri,
|
79
|
-
expires_in: grant.expires_in,
|
80
|
-
scopes: grant.scopes,
|
81
|
-
)
|
82
|
-
|
83
|
-
# Not all the ORM support :id PK
|
84
|
-
expect(clazz.by_token(plain_text_token).id).to eq(grant.id) if grant.respond_to?(:id)
|
85
|
-
|
86
|
-
# And it modifies the token value
|
87
|
-
grant.reload
|
88
|
-
expect(grant.token).not_to eq(plain_text_token)
|
89
|
-
expect(clazz.find_by(token: plain_text_token)).to eq(nil)
|
90
|
-
expect(clazz.find_by(token: grant.token)).not_to be_nil
|
91
|
-
end
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
describe "validations" do
|
97
|
-
it "is invalid without resource_owner_id" do
|
98
|
-
subject.resource_owner_id = nil
|
99
|
-
expect(subject).not_to be_valid
|
100
|
-
end
|
101
|
-
|
102
|
-
it "is invalid without application_id" do
|
103
|
-
subject.application_id = nil
|
104
|
-
expect(subject).not_to be_valid
|
105
|
-
end
|
106
|
-
|
107
|
-
it "is invalid without token" do
|
108
|
-
subject.save
|
109
|
-
subject.token = nil
|
110
|
-
expect(subject).not_to be_valid
|
111
|
-
end
|
112
|
-
|
113
|
-
it "is invalid without expires_in" do
|
114
|
-
subject.expires_in = nil
|
115
|
-
expect(subject).not_to be_valid
|
116
|
-
end
|
117
|
-
end
|
118
|
-
|
119
|
-
describe ".revoke_all_for" do
|
120
|
-
let(:resource_owner) { double(id: 100) }
|
121
|
-
let(:application) { FactoryBot.create :application }
|
122
|
-
let(:default_attributes) do
|
123
|
-
{
|
124
|
-
application: application,
|
125
|
-
resource_owner_id: resource_owner.id,
|
126
|
-
}
|
127
|
-
end
|
128
|
-
|
129
|
-
it "revokes all tokens for given application and resource owner" do
|
130
|
-
FactoryBot.create :access_grant, default_attributes
|
131
|
-
|
132
|
-
described_class.revoke_all_for(application.id, resource_owner)
|
133
|
-
|
134
|
-
described_class.all.each do |token|
|
135
|
-
expect(token).to be_revoked
|
136
|
-
end
|
137
|
-
end
|
138
|
-
|
139
|
-
it "matches application" do
|
140
|
-
access_grant_for_different_app = FactoryBot.create(
|
141
|
-
:access_grant,
|
142
|
-
default_attributes.merge(application: FactoryBot.create(:application)),
|
143
|
-
)
|
144
|
-
|
145
|
-
described_class.revoke_all_for(application.id, resource_owner)
|
146
|
-
|
147
|
-
expect(access_grant_for_different_app.reload).not_to be_revoked
|
148
|
-
end
|
149
|
-
|
150
|
-
it "matches resource owner" do
|
151
|
-
access_grant_for_different_owner = FactoryBot.create(
|
152
|
-
:access_grant,
|
153
|
-
default_attributes.merge(resource_owner_id: 90),
|
154
|
-
)
|
155
|
-
|
156
|
-
described_class.revoke_all_for application.id, resource_owner
|
157
|
-
|
158
|
-
expect(access_grant_for_different_owner.reload).not_to be_revoked
|
159
|
-
end
|
160
|
-
end
|
161
|
-
end
|