Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

robustness on calling account/consent outside of login process

ulferts05ecbe13ed57
diff --git a/app/controllers/concerns/accounts/user_consent.rb b/app/controllers/concerns/accounts/user_consent.rb
index c17d33a9069..ea40b241bd5 100644
--- a/app/controllers/concerns/accounts/user_consent.rb
+++ b/app/controllers/concerns/accounts/user_consent.rb
@@ -30,10 +30,17 @@
# Intended to be used by the AccountController to implement the user consent
# check.
module Accounts::UserConsent
+ extend ActiveSupport::Concern
+
include ::UserConsentHelper
+ included do
+ before_action :require_consenting_user,
+ only: %i[consent confirm_consent]
+ end
+
def consent
- if user_consent_required? && consenting_user&.consent_expired?
+ if user_consent_required? && consenting_user.consent_expired?
render "account/consent"
else
consent_finished
@@ -41,10 +48,8 @@ module Accounts::UserConsent
end
def confirm_consent
- user = consenting_user
-
- if user.present? && consent_param?
- approve_consent!(user)
+ if consent_param?
+ approve_consent!(consenting_user)
else
reject_consent!
end
@@ -63,8 +68,14 @@ module Accounts::UserConsent
redirect_to authentication_stage_failure_path :consent
end
+ private
+
+ def require_consenting_user
+ reject_consent! unless consenting_user
+ end
+
def consenting_user
- User.find_by id: session[:authenticated_user_id]
+ @consenting_user ||= User.find_by id: session[:authenticated_user_id]
end
def approve_consent!(user)
diff --git a/spec/features/auth/consent_auth_stage_spec.rb b/spec/features/auth/consent_auth_stage_spec.rb
index 0ae82a85849..b34874e9286 100644
--- a/spec/features/auth/consent_auth_stage_spec.rb
+++ b/spec/features/auth/consent_auth_stage_spec.rb
@@ -270,4 +270,13 @@ RSpec.describe "Authentication Stages" do
end
end
end
+
+ context "when calling the consent page outside of the login process" do
+ it "redirects to the login page" do
+ visit "account/consent"
+
+ expect_flash message: "Consent failed, cannot proceed.", type: :error
+ expect(page).to have_current_path "/login"
+ end
+ end
end