Commit 2164d977 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'jramsay/public-get-epics-api' into 'master'

Fix unathenticated API access to public epics

See merge request gitlab-org/gitlab-ee!11485
parents 2dd7b826 3046609d
---
title: Fix unauthenticated GET of public Epics API
merge_request: 11485
author:
type: fixed
...@@ -5,7 +5,7 @@ module API ...@@ -5,7 +5,7 @@ module API
include PaginationParams include PaginationParams
before do before do
authenticate! authenticate_non_get!
authorize_epics_feature! authorize_epics_feature!
end end
......
...@@ -23,12 +23,6 @@ describe API::Epics do ...@@ -23,12 +23,6 @@ describe API::Epics do
stub_licensed_features(epics: true) stub_licensed_features(epics: true)
end end
it 'returns 401 unauthorized error for non authenticated user' do
get api(url), params: params
expect(response).to have_gitlab_http_status(401)
end
it 'returns 404 not found error for a user without permissions to see the group' do it 'returns 404 not found error for a user without permissions to see the group' do
project.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE) project.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
group.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE) group.update(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
...@@ -130,19 +124,19 @@ describe API::Epics do ...@@ -130,19 +124,19 @@ describe API::Epics do
end end
it 'returns epics authored by the given author id' do it 'returns epics authored by the given author id' do
get api(url, user), params: { author_id: user2.id } get api(url), params: { author_id: user2.id }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
end end
it 'returns epics matching given search string for title' do it 'returns epics matching given search string for title' do
get api(url, user), params: { search: epic2.title } get api(url), params: { search: epic2.title }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
end end
it 'returns epics matching given search string for description' do it 'returns epics matching given search string for description' do
get api(url, user), params: { search: epic2.description } get api(url), params: { search: epic2.description }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
end end
...@@ -154,7 +148,7 @@ describe API::Epics do ...@@ -154,7 +148,7 @@ describe API::Epics do
end end
it 'returns all epics when state set to all' do it 'returns all epics when state set to all' do
get api(url, user), params: { state: :all } get api(url), params: { state: :all }
expect_paginated_array_response([epic2.id, epic.id]) expect_paginated_array_response([epic2.id, epic.id])
end end
...@@ -163,7 +157,7 @@ describe API::Epics do ...@@ -163,7 +157,7 @@ describe API::Epics do
epic.create_award_emoji('thumbsup', user) epic.create_award_emoji('thumbsup', user)
epic2.create_award_emoji('thumbsdown', user) epic2.create_award_emoji('thumbsdown', user)
get api(url, user) get api(url)
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
...@@ -174,37 +168,37 @@ describe API::Epics do ...@@ -174,37 +168,37 @@ describe API::Epics do
end end
it 'sorts by created_at descending by default' do it 'sorts by created_at descending by default' do
get api(url, user) get api(url)
expect_paginated_array_response([epic2.id, epic.id]) expect_paginated_array_response([epic2.id, epic.id])
end end
it 'sorts ascending when requested' do it 'sorts ascending when requested' do
get api(url, user), params: { sort: :asc } get api(url), params: { sort: :asc }
expect_paginated_array_response([epic.id, epic2.id]) expect_paginated_array_response([epic.id, epic2.id])
end end
it 'sorts by updated_at descending when requested' do it 'sorts by updated_at descending when requested' do
get api(url, user), params: { order_by: :updated_at } get api(url), params: { order_by: :updated_at }
expect_paginated_array_response([epic.id, epic2.id]) expect_paginated_array_response([epic.id, epic2.id])
end end
it 'sorts by updated_at ascending when requested' do it 'sorts by updated_at ascending when requested' do
get api(url, user), params: { order_by: :updated_at, sort: :asc } get api(url), params: { order_by: :updated_at, sort: :asc }
expect_paginated_array_response([epic2.id, epic.id]) expect_paginated_array_response([epic2.id, epic.id])
end end
it 'returns an array of labeled epics' do it 'returns an array of labeled epics' do
get api(url, user), params: { labels: label.title } get api(url), params: { labels: label.title }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
end end
it 'returns an array of labeled epics with labels param as array' do it 'returns an array of labeled epics with labels param as array' do
get api(url, user), params: { labels: [label.title] } get api(url), params: { labels: [label.title] }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
end end
...@@ -216,7 +210,7 @@ describe API::Epics do ...@@ -216,7 +210,7 @@ describe API::Epics do
create(:label_link, label: label_b, target: epic2) create(:label_link, label: label_b, target: epic2)
create(:label_link, label: label_c, target: epic2) create(:label_link, label: label_c, target: epic2)
get api(url, user), params: { labels: "#{label.title},#{label_b.title},#{label_c.title}" } get api(url), params: { labels: "#{label.title},#{label_b.title},#{label_c.title}" }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
expect(json_response.first['labels']).to match_array([label.title, label_b.title, label_c.title]) expect(json_response.first['labels']).to match_array([label.title, label_b.title, label_c.title])
...@@ -229,26 +223,26 @@ describe API::Epics do ...@@ -229,26 +223,26 @@ describe API::Epics do
create(:label_link, label: label_b, target: epic2) create(:label_link, label: label_b, target: epic2)
create(:label_link, label: label_c, target: epic2) create(:label_link, label: label_c, target: epic2)
get api(url, user), params: { labels: [label.title, label_b.title, label_c.title] } get api(url), params: { labels: [label.title, label_b.title, label_c.title] }
expect_paginated_array_response([epic2.id]) expect_paginated_array_response([epic2.id])
expect(json_response.first['labels']).to match_array([label.title, label_b.title, label_c.title]) expect(json_response.first['labels']).to match_array([label.title, label_b.title, label_c.title])
end end
it 'returns an empty array if no epic matches labels' do it 'returns an empty array if no epic matches labels' do
get api(url, user), params: { labels: 'foo,bar' } get api(url), params: { labels: 'foo,bar' }
expect_paginated_array_response([]) expect_paginated_array_response([])
end end
it 'returns an empty array if no epic matches labels with labels param as array' do it 'returns an empty array if no epic matches labels with labels param as array' do
get api(url, user), params: { labels: %w(foo bar) } get api(url), params: { labels: %w(foo bar) }
expect_paginated_array_response([]) expect_paginated_array_response([])
end end
it 'returns an array of labeled epics matching given state' do it 'returns an array of labeled epics matching given state' do
get api(url, user), params: { labels: label.title, state: :opened } get api(url), params: { labels: label.title, state: :opened }
expect_paginated_array_response(epic2.id) expect_paginated_array_response(epic2.id)
expect(json_response.first['labels']).to eq([label.title]) expect(json_response.first['labels']).to eq([label.title])
...@@ -256,7 +250,7 @@ describe API::Epics do ...@@ -256,7 +250,7 @@ describe API::Epics do
end end
it 'returns an array of labeled epics matching given state with labels param as array' do it 'returns an array of labeled epics matching given state with labels param as array' do
get api(url, user), params: { labels: [label.title], state: :opened } get api(url), params: { labels: [label.title], state: :opened }
expect_paginated_array_response(epic2.id) expect_paginated_array_response(epic2.id)
expect(json_response.first['labels']).to eq([label.title]) expect(json_response.first['labels']).to eq([label.title])
...@@ -264,43 +258,43 @@ describe API::Epics do ...@@ -264,43 +258,43 @@ describe API::Epics do
end end
it 'returns an empty array if no epic matches labels and state filters' do it 'returns an empty array if no epic matches labels and state filters' do
get api(url, user), params: { labels: label.title, state: :closed } get api(url), params: { labels: label.title, state: :closed }
expect_paginated_array_response([]) expect_paginated_array_response([])
end end
it 'returns an array of epics with any label' do it 'returns an array of epics with any label' do
get api(url, user), params: { labels: IssuesFinder::FILTER_ANY } get api(url), params: { labels: IssuesFinder::FILTER_ANY }
expect_paginated_array_response(epic2.id) expect_paginated_array_response(epic2.id)
end end
it 'returns an array of epics with any label with labels param as array' do it 'returns an array of epics with any label with labels param as array' do
get api(url, user), params: { labels: [IssuesFinder::FILTER_ANY] } get api(url), params: { labels: [IssuesFinder::FILTER_ANY] }
expect_paginated_array_response(epic2.id) expect_paginated_array_response(epic2.id)
end end
it 'returns an array of epics with no label' do it 'returns an array of epics with no label' do
get api(url, user), params: { labels: IssuesFinder::FILTER_NONE } get api(url), params: { labels: IssuesFinder::FILTER_NONE }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
it 'returns an array of epics with no label with labels param as array' do it 'returns an array of epics with no label with labels param as array' do
get api(url, user), params: { labels: [IssuesFinder::FILTER_NONE] } get api(url), params: { labels: [IssuesFinder::FILTER_NONE] }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
it 'returns an array of epics with no label when using the legacy No+Label filter' do it 'returns an array of epics with no label when using the legacy No+Label filter' do
get api(url, user), params: { labels: 'No Label' } get api(url), params: { labels: 'No Label' }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
it 'returns an array of epics with no label when using the legacy No+Label filter with labels param as array' do it 'returns an array of epics with no label when using the legacy No+Label filter with labels param as array' do
get api(url, user), params: { labels: ['No Label'] } get api(url), params: { labels: ['No Label'] }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
...@@ -316,13 +310,13 @@ describe API::Epics do ...@@ -316,13 +310,13 @@ describe API::Epics do
end end
it 'returns epics created before a specific date' do it 'returns epics created before a specific date' do
get api(url, user), params: { created_before: '2000-01-02T00:00:00.060Z' } get api(url), params: { created_before: '2000-01-02T00:00:00.060Z' }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
it 'returns epics updated before a specific date' do it 'returns epics updated before a specific date' do
get api(url, user), params: { updated_before: '2000-01-02T00:00:00.060Z' } get api(url), params: { updated_before: '2000-01-02T00:00:00.060Z' }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
...@@ -336,13 +330,13 @@ describe API::Epics do ...@@ -336,13 +330,13 @@ describe API::Epics do
end end
it 'returns epics created after a specific date' do it 'returns epics created after a specific date' do
get api(url, user), params: { created_after: epic.created_at } get api(url), params: { created_after: epic.created_at }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
it 'returns epics updated after a specific date' do it 'returns epics updated after a specific date' do
get api(url, user), params: { updated_after: epic.updated_at } get api(url), params: { updated_after: epic.updated_at }
expect_paginated_array_response(epic.id) expect_paginated_array_response(epic.id)
end end
...@@ -361,7 +355,7 @@ describe API::Epics do ...@@ -361,7 +355,7 @@ describe API::Epics do
shared_examples 'paginated API endpoint' do shared_examples 'paginated API endpoint' do
it 'returns the correct page' do it 'returns the correct page' do
get api(url, user), params: { page: page, per_page: per_page } get api(url), params: { page: page, per_page: per_page }
expect(response.headers['X-Page']).to eq(page.to_s) expect(response.headers['X-Page']).to eq(page.to_s)
expect_paginated_array_response(expected) expect_paginated_array_response(expected)
...@@ -395,13 +389,13 @@ describe API::Epics do ...@@ -395,13 +389,13 @@ describe API::Epics do
end end
it 'returns 200 status' do it 'returns 200 status' do
get api(url, user) get api(url)
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
end end
it 'matches the response schema' do it 'matches the response schema' do
get api(url, user) get api(url)
expect(response).to match_response_schema('public_api/v4/epic', dir: 'ee') expect(response).to match_response_schema('public_api/v4/epic', dir: 'ee')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment