Commit a8a822127ee by Yorick Peterse

Revert "Merge branch 'security-pipeline-trigger-tokens-exposure-11-4' into 'security-11-4'"

This reverts commit 426716d1556f821988e67cc178e4ecffc4115897
parent 0315123ec2a
......@@ -99,9 +99,7 @@ module Projects
def define_triggers_variables
@triggers = @project.triggers
.present(current_user: current_user)
@trigger = ::Ci::Trigger.new
.present(current_user: current_user)
end
def define_badges_variables
......
......@@ -66,11 +66,12 @@ class Projects::TriggersController < Projects::ApplicationController
end
def trigger
@trigger ||= project.triggers.find(params[:id])
.present(current_user: current_user)
@trigger ||= project.triggers.find(params[:id]) || render_404
end
def trigger_params
params.require(:trigger).permit(:description)
params.require(:trigger).permit(
:description
)
end
end
......@@ -4,7 +4,6 @@ module Ci
class Trigger < ActiveRecord::Base
extend Gitlab::Ci::Model
include IgnorableColumn
include Presentable
ignore_column :deleted_at
......@@ -30,7 +29,7 @@ module Ci
end
def short_token
token[0...4] if token.present?
token[0...4]
end
def legacy?
......
# frozen_string_literal: true
module Ci
class TriggerPresenter < Gitlab::View::Presenter::Delegated
presents :trigger
def has_token_exposed?
can?(current_user, :admin_trigger, trigger)
end
def token
if has_token_exposed?
trigger.token
else
trigger.short_token
end
end
end
end
%tr
%td
- if trigger.has_token_exposed?
- if can?(current_user, :admin_trigger, trigger)
%span= trigger.token
= clipboard_button(text: trigger.token, title: "Copy trigger token to clipboard")
- else
......
---
title: Expose CI/CD trigger token only to the trigger owner
merge_request:
author:
type: security
......@@ -1161,11 +1161,8 @@ module API
end
class Trigger < Grape::Entity
include ::API::Helpers::Presentable
expose :id
expose :token
expose :description
expose :token, :description
expose :created_at, :updated_at, :last_used
expose :owner, using: Entities::UserBasic
end
......
# frozen_string_literal: true
module API
module Helpers
##
# This module makes it possible to use `app/presenters` with
# Grape Entities. It instantiates model presenter and passes
# options defined in the API endpoint to the presenter itself.
#
# present object, with: Entities::Something,
# current_user: current_user,
# another_option: 'my options'
#
# Example above will make `current_user` and `another_option`
# values available in the subclass of `Gitlab::View::Presenter`
# thorough a separate method in the presenter.
#
# The model class needs to have `::Presentable` module mixed in
# if you want to use `API::Helpers::Presentable`.
#
module Presentable
extend ActiveSupport::Concern
def initialize(object, options = {})
super(object.present(options), options)
end
end
end
end
......@@ -51,7 +51,7 @@ module API
triggers = user_project.triggers.includes(:trigger_requests)
present paginate(triggers), with: Entities::Trigger, current_user: current_user
present paginate(triggers), with: Entities::Trigger
end
# rubocop: enable CodeReuse/ActiveRecord
......@@ -68,7 +68,7 @@ module API
trigger = user_project.triggers.find(params.delete(:trigger_id))
break not_found!('Trigger') unless trigger
present trigger, with: Entities::Trigger, current_user: current_user
present trigger, with: Entities::Trigger
end
desc 'Create a trigger' do
......@@ -85,7 +85,7 @@ module API
declared_params(include_missing: false).merge(owner: current_user))
if trigger.valid?
present trigger, with: Entities::Trigger, current_user: current_user
present trigger, with: Entities::Trigger
else
render_validation_error!(trigger)
end
......@@ -106,7 +106,7 @@ module API
break not_found!('Trigger') unless trigger
if trigger.update(declared_params(include_missing: false))
present trigger, with: Entities::Trigger, current_user: current_user
present trigger, with: Entities::Trigger
else
render_validation_error!(trigger)
end
......@@ -127,7 +127,7 @@ module API
if trigger.update(owner: current_user)
status :ok
present trigger, with: Entities::Trigger, current_user: current_user
present trigger, with: Entities::Trigger
else
render_validation_error!(trigger)
end
......
require 'spec_helper'
describe Ci::TriggerPresenter do
set(:user) { create(:user) }
set(:project) { create(:project) }
set(:trigger) do
create(:ci_trigger, token: '123456789abcd', project: project)
end
subject do
described_class.new(trigger, current_user: user)
end
before do
project.add_maintainer(user)
end
context 'when user is not a trigger owner' do
describe '#token' do
it 'exposes only short token' do
expect(subject.token).not_to eq trigger.token
expect(subject.token).to eq '1234'
end
end
describe '#has_token_exposed?' do
it 'does not have token exposed' do
expect(subject).not_to have_token_exposed
end
end
end
context 'when user is a trigger owner and builds admin' do
before do
trigger.update(owner: user)
end
describe '#token' do
it 'exposes full token' do
expect(subject.token).to eq trigger.token
end
end
describe '#has_token_exposed?' do
it 'has token exposed' do
expect(subject).to have_token_exposed
end
end
end
end
require 'spec_helper'
describe API::Triggers do
set(:user) { create(:user) }
set(:user2) { create(:user) }
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:trigger_token) { 'secure_token' }
let!(:trigger_token_2) { 'secure_token_2' }
let!(:project) { create(:project, :repository, creator: user) }
......@@ -133,17 +132,14 @@ describe API::Triggers do
end
describe 'GET /projects/:id/triggers' do
context 'authenticated user who can access triggers' do
it 'returns a list of triggers with tokens exposed correctly' do
context 'authenticated user with valid permissions' do
it 'returns list of triggers' do
get api("/projects/#{project.id}/triggers", user)
expect(response).to have_gitlab_http_status(200)
expect(response).to include_pagination_headers
expect(json_response).to be_a(Array)
expect(json_response.size).to eq 2
expect(json_response.dig(0, 'token')).to eq trigger_token
expect(json_response.dig(1, 'token')).to eq trigger_token_2[0..3]
expect(json_response[0]).to have_key('token')
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