diff options
author | Małgorzata Ksionek <meksionek@gmail.com> | 2019-03-20 14:39:07 +0100 |
---|---|---|
committer | Małgorzata Ksionek <meksionek@gmail.com> | 2019-03-21 16:25:01 +0100 |
commit | 41af40d4d52e869b6f3e7ceeead800e9f1c89857 (patch) | |
tree | 90279b54afb50a32062c40ba0ebe7825a0f04efe | |
parent | bcd4e1f55de9482bda8e86cdb638316f1ed88c30 (diff) | |
download | gitlab-ce-41af40d4d52e869b6f3e7ceeead800e9f1c89857.tar.gz |
Disallow changing namespace of a project in update method
-rw-r--r-- | app/controllers/projects_controller.rb | 13 | ||||
-rw-r--r-- | changelogs/unreleased/security-mass-assignment-on-project-update.yml | 5 | ||||
-rw-r--r-- | spec/controllers/projects_controller_spec.rb | 17 |
3 files changed, 30 insertions, 5 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 878816475b2..e347f542605 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -46,7 +46,7 @@ class ProjectsController < Projects::ApplicationController end def create - @project = ::Projects::CreateService.new(current_user, project_params).execute + @project = ::Projects::CreateService.new(current_user, project_params(attributes: project_params_create_attributes)).execute if @project.saved? cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) } @@ -327,9 +327,9 @@ class ProjectsController < Projects::ApplicationController end # rubocop: enable CodeReuse/ActiveRecord - def project_params + def project_params(attributes: project_params_attributes) params.require(:project) - .permit(project_params_attributes) + .permit(attributes) end def project_params_attributes @@ -348,11 +348,10 @@ class ProjectsController < Projects::ApplicationController :last_activity_at, :lfs_enabled, :name, - :namespace_id, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, - :printing_merge_request_link_enabled, :path, + :printing_merge_request_link_enabled, :public_builds, :request_access_enabled, :runners_token, @@ -374,6 +373,10 @@ class ProjectsController < Projects::ApplicationController ] end + def project_params_create_attributes + project_params_attributes << :namespace_id + end + def custom_import_params {} end diff --git a/changelogs/unreleased/security-mass-assignment-on-project-update.yml b/changelogs/unreleased/security-mass-assignment-on-project-update.yml new file mode 100644 index 00000000000..8657dcdd135 --- /dev/null +++ b/changelogs/unreleased/security-mass-assignment-on-project-update.yml @@ -0,0 +1,5 @@ +--- +title: Disallow updating namespace during updating project +merge_request: +author: +type: security diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index f84f069f4db..d060a621cab 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -369,6 +369,23 @@ describe ProjectsController do end end + it 'does not update namespace' do + controller.instance_variable_set(:@project, project) + + params = { + namespace_id: 'test' + } + + expect do + put :update, + params: { + namespace_id: project.namespace, + id: project.id, + project: params + } + end.not_to change {project.namespace} + end + def update_project(**parameters) put :update, params: { |