diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-10-31 23:31:24 +1300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-11-01 19:37:32 +1300 |
| commit | 28dabc67f4db8271ac20c0db458ae2c86a906eee (patch) | |
| tree | a53f7b583cde972f9e3037a5fa27c97765b2a620 /app/controllers/clusters | |
| parent | 1163b235391668d53ae0cea80bc22d40b365e0a7 (diff) | |
| download | gitlab-ce-28dabc67f4db8271ac20c0db458ae2c86a906eee.tar.gz | |
Restore 403 functionality for external auth (EE)
When we unhooked ClustersController from
Project::ApplicationsController, we missed an EE override to
handle_not_found_or_authorized.
Rather than carry on with override RoutingActions, make a specific proc
for Project that we override in EE instead. Use that proc in both
Clusters::BaseController and Project::ApplicationsController.
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/base_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/clusters/base_controller.rb b/app/controllers/clusters/base_controller.rb index 8908b26b914..3a8575769c4 100644 --- a/app/controllers/clusters/base_controller.rb +++ b/app/controllers/clusters/base_controller.rb @@ -2,6 +2,7 @@ class Clusters::BaseController < ApplicationController include RoutableActions + include ProjectUnauthorized skip_before_action :authenticate_user! before_action :require_project_id @@ -21,7 +22,7 @@ class Clusters::BaseController < ApplicationController end def project - @project ||= find_routable!(Project, File.join(params[:namespace_id], params[:project_id])) + @project ||= find_routable!(Project, File.join(params[:namespace_id], params[:project_id]), not_found_or_authorized_proc: project_unauthorized_proc) end def repository |