mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-24 12:06:11 +10:00
Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow'
This commit is contained in:
committed by
Robert Speicher
parent
f160bd3f0c
commit
412120de02
@@ -1,5 +1,8 @@
|
||||
Please view this file on the master branch, on stable branches it's out of date.
|
||||
|
||||
v 8.2.2
|
||||
- Fix: Raw private snippets access workflow
|
||||
|
||||
v 8.2.1
|
||||
- Forcefully update builds that didn't want to update with state machine
|
||||
- Fix: saving GitLabCiService as Admin Template
|
||||
|
||||
@@ -2,7 +2,7 @@ class SnippetsController < ApplicationController
|
||||
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
|
||||
|
||||
# Allow read snippet
|
||||
before_action :authorize_read_snippet!, only: [:show]
|
||||
before_action :authorize_read_snippet!, only: [:show, :raw]
|
||||
|
||||
# Allow modify snippet
|
||||
before_action :authorize_update_snippet!, only: [:edit, :update]
|
||||
|
||||
@@ -115,4 +115,119 @@ describe SnippetsController do
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'GET #raw' do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
context 'when the personal snippet is private' do
|
||||
let(:personal_snippet) { create(:personal_snippet, :private, author: user) }
|
||||
|
||||
context 'when signed in' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
context 'when signed in user is not the author' do
|
||||
let(:other_author) { create(:author) }
|
||||
let(:other_personal_snippet) { create(:personal_snippet, :private, author: other_author) }
|
||||
|
||||
it 'responds with status 404' do
|
||||
get :raw, id: other_personal_snippet.to_param
|
||||
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when signed in user is the author' do
|
||||
it 'renders the raw snippet' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(assigns(:snippet)).to eq(personal_snippet)
|
||||
expect(response.status).to eq(200)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when not signed in' do
|
||||
it 'redirects to the sign in page' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(response).to redirect_to(new_user_session_path)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the personal snippet is internal' do
|
||||
let(:personal_snippet) { create(:personal_snippet, :internal, author: user) }
|
||||
|
||||
context 'when signed in' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it 'renders the raw snippet' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(assigns(:snippet)).to eq(personal_snippet)
|
||||
expect(response.status).to eq(200)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when not signed in' do
|
||||
it 'redirects to the sign in page' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(response).to redirect_to(new_user_session_path)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the personal snippet is public' do
|
||||
let(:personal_snippet) { create(:personal_snippet, :public, author: user) }
|
||||
|
||||
context 'when signed in' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it 'renders the raw snippet' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(assigns(:snippet)).to eq(personal_snippet)
|
||||
expect(response.status).to eq(200)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when not signed in' do
|
||||
it 'renders the raw snippet' do
|
||||
get :raw, id: personal_snippet.to_param
|
||||
|
||||
expect(assigns(:snippet)).to eq(personal_snippet)
|
||||
expect(response.status).to eq(200)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the personal snippet does not exist' do
|
||||
context 'when signed in' do
|
||||
before do
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it 'responds with status 404' do
|
||||
get :raw, id: 'doesntexist'
|
||||
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when not signed in' do
|
||||
it 'responds with status 404' do
|
||||
get :raw, id: 'doesntexist'
|
||||
|
||||
expect(response.status).to eq(404)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user