diff options
author | Robert Speicher <robert@gitlab.com> | 2018-01-18 23:12:02 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-31 14:20:57 -0600 |
commit | 381fab2263cc1bad9e907e604eeee478562ad68f (patch) | |
tree | c4abeccea4d520caeba1a008bcd1bf441266b99f | |
parent | 43625147b510d49cafc5bd837331e512a6ad0ad4 (diff) | |
download | gitlab-ce-381fab2263cc1bad9e907e604eeee478562ad68f.tar.gz |
Merge branch 'security-10-3-todo-api-reveals-sensitive-information' into 'security-10-3'
[10.3] Restrict Todo API mark_as_done endpoint to the user's todos only
See merge request gitlab/gitlabhq!2314
-rw-r--r-- | changelogs/unreleased/security-10-4-todo-api-reveals-sensitive-information.yml | 5 | ||||
-rw-r--r-- | lib/api/todos.rb | 2 | ||||
-rw-r--r-- | lib/api/v3/todos.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/todos_spec.rb | 6 | ||||
-rw-r--r-- | spec/requests/api/v3/todos_spec.rb | 6 |
5 files changed, 19 insertions, 2 deletions
diff --git a/changelogs/unreleased/security-10-4-todo-api-reveals-sensitive-information.yml b/changelogs/unreleased/security-10-4-todo-api-reveals-sensitive-information.yml new file mode 100644 index 00000000000..329825d1e73 --- /dev/null +++ b/changelogs/unreleased/security-10-4-todo-api-reveals-sensitive-information.yml @@ -0,0 +1,5 @@ +--- +title: Restrict Todo API mark_as_done endpoint to the user's todos only +merge_request: +author: +type: security diff --git a/lib/api/todos.rb b/lib/api/todos.rb index ffccfebe752..c6dbcf84e3a 100644 --- a/lib/api/todos.rb +++ b/lib/api/todos.rb @@ -60,7 +60,7 @@ module API end post ':id/mark_as_done' do TodoService.new.mark_todos_as_done_by_ids(params[:id], current_user) - todo = Todo.find(params[:id]) + todo = current_user.todos.find(params[:id]) present todo, with: Entities::Todo, current_user: current_user end diff --git a/lib/api/v3/todos.rb b/lib/api/v3/todos.rb index 2f2cf259987..3e2c61f6dbd 100644 --- a/lib/api/v3/todos.rb +++ b/lib/api/v3/todos.rb @@ -12,7 +12,7 @@ module API end delete ':id' do TodoService.new.mark_todos_as_done_by_ids(params[:id], current_user) - todo = Todo.find(params[:id]) + todo = current_user.todos.find(params[:id]) present todo, with: ::API::Entities::Todo, current_user: current_user end diff --git a/spec/requests/api/todos_spec.rb b/spec/requests/api/todos_spec.rb index c6063a2e089..f074ebf6a16 100644 --- a/spec/requests/api/todos_spec.rb +++ b/spec/requests/api/todos_spec.rb @@ -129,6 +129,12 @@ describe API::Todos do post api("/todos/#{pending_1.id}/mark_as_done", john_doe) end + + it 'returns 404 if the todo does not belong to the current user' do + post api("/todos/#{pending_1.id}/mark_as_done", author_1) + + expect(response.status).to eq(404) + end end end diff --git a/spec/requests/api/v3/todos_spec.rb b/spec/requests/api/v3/todos_spec.rb index 8f5c3fbf8dd..f8feb3ea7be 100644 --- a/spec/requests/api/v3/todos_spec.rb +++ b/spec/requests/api/v3/todos_spec.rb @@ -38,6 +38,12 @@ describe API::V3::Todos do delete v3_api("/todos/#{pending_1.id}", john_doe) end + + it 'returns 404 if the todo does not belong to the current user' do + delete v3_api("/todos/#{pending_1.id}", author_1) + + expect(response.status).to eq(404) + end end end |