Commit cd6d2649 authored by Aakriti Gupta's avatar Aakriti Gupta

Prevent guests from seeing commits for cycle analytics

- if the user has access level lower than REPORTER,
don't include commit count in summary
parent 43e9756c
---
title: Hide commit counts from guest users in Cycle Analytics.
merge_request:
author:
type: security
...@@ -11,13 +11,29 @@ module Gitlab ...@@ -11,13 +11,29 @@ module Gitlab
end end
def data def data
[serialize(Summary::Issue.new(project: @project, from: @from, to: @to, current_user: @current_user)), summary = [issue_stats]
serialize(Summary::Commit.new(project: @project, from: @from, to: @to)), summary << commit_stats if user_has_sufficient_access?
serialize(Summary::Deploy.new(project: @project, from: @from, to: @to))] summary << deploy_stats
end end
private private
def issue_stats
serialize(Summary::Issue.new(project: @project, from: @from, to: @to, current_user: @current_user))
end
def commit_stats
serialize(Summary::Commit.new(project: @project, from: @from, to: @to))
end
def deploy_stats
serialize(Summary::Deploy.new(project: @project, from: @from, to: @to))
end
def user_has_sufficient_access?
@project.team.member?(@current_user, Gitlab::Access::REPORTER)
end
def serialize(summary_object) def serialize(summary_object)
AnalyticsSummarySerializer.new.represent(summary_object) AnalyticsSummarySerializer.new.represent(summary_object)
end end
......
...@@ -112,6 +112,10 @@ describe 'Cycle Analytics', :js do ...@@ -112,6 +112,10 @@ describe 'Cycle Analytics', :js do
wait_for_requests wait_for_requests
end end
it 'does not show the commit stats' do
expect(page).to have_no_selector(:xpath, commits_counter_selector)
end
it 'needs permissions to see restricted stages' do it 'needs permissions to see restricted stages' do
expect(find('.stage-events')).to have_content(issue.title) expect(find('.stage-events')).to have_content(issue.title)
...@@ -127,8 +131,12 @@ describe 'Cycle Analytics', :js do ...@@ -127,8 +131,12 @@ describe 'Cycle Analytics', :js do
find(:xpath, "//p[contains(text(),'New Issue')]/preceding-sibling::h3") find(:xpath, "//p[contains(text(),'New Issue')]/preceding-sibling::h3")
end end
def commits_counter_selector
"//p[contains(text(),'Commits')]/preceding-sibling::h3"
end
def commits_counter def commits_counter
find(:xpath, "//p[contains(text(),'Commits')]/preceding-sibling::h3") find(:xpath, commits_counter_selector)
end end
def deploys_counter def deploys_counter
......
...@@ -6,6 +6,11 @@ describe Gitlab::CycleAnalytics::StageSummary do ...@@ -6,6 +6,11 @@ describe Gitlab::CycleAnalytics::StageSummary do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:options) { { from: 1.day.ago, current_user: user } } let(:options) { { from: 1.day.ago, current_user: user } }
let(:user) { create(:user, :admin) } let(:user) { create(:user, :admin) }
before do
project.add_maintainer(user)
end
let(:stage_summary) { described_class.new(project, options).data } let(:stage_summary) { described_class.new(project, options).data }
describe "#new_issues" do describe "#new_issues" do
...@@ -86,6 +91,24 @@ describe Gitlab::CycleAnalytics::StageSummary do ...@@ -86,6 +91,24 @@ describe Gitlab::CycleAnalytics::StageSummary do
expect(subject).to eq(2) expect(subject).to eq(2)
end end
end end
context 'when a guest user is signed in' do
let(:guest_user) { create(:user) }
before do
project.add_guest(guest_user)
options.merge!({ current_user: guest_user })
end
it 'does not include commit stats' do
data = described_class.new(project, options).data
expect(includes_commits?(data)).to be_falsy
end
def includes_commits?(data)
data.any? { |h| h["title"] == 'Commits' }
end
end
end end
describe "#deploys" do describe "#deploys" do
......
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