Skip to content
Snippets Groups Projects
Commit 879ca8ab authored by Aakriti Gupta's avatar Aakriti Gupta
Browse files

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 5bdfcaa1
No related branches found
No related tags found
No related merge requests found
---
title: Hide commit counts from guest users in Cycle Analytics.
merge_request:
author:
type: security
Loading
Loading
@@ -10,13 +10,29 @@ module Gitlab
end
 
def data
[serialize(Summary::Issue.new(project: @project, from: @from, current_user: @current_user)),
serialize(Summary::Commit.new(project: @project, from: @from)),
serialize(Summary::Deploy.new(project: @project, from: @from))]
summary = [issue_stats]
summary << commit_stats if user_has_sufficient_access?
summary << deploy_stats
end
 
private
 
def issue_stats
serialize(Summary::Issue.new(project: @project, from: @from, current_user: @current_user))
end
def commit_stats
serialize(Summary::Commit.new(project: @project, from: @from))
end
def deploy_stats
serialize(Summary::Deploy.new(project: @project, from: @from))
end
def user_has_sufficient_access?
@project.team.member?(@current_user, Gitlab::Access::REPORTER)
end
def serialize(summary_object)
AnalyticsSummarySerializer.new.represent(summary_object)
end
Loading
Loading
Loading
Loading
@@ -108,6 +108,10 @@ describe 'Cycle Analytics', :js do
wait_for_requests
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
expect(find('.stage-events')).to have_content(issue.title)
 
Loading
Loading
@@ -123,8 +127,12 @@ describe 'Cycle Analytics', :js do
find(:xpath, "//p[contains(text(),'New Issue')]/preceding-sibling::h3")
end
 
def commits_counter_selector
"//p[contains(text(),'Commits')]/preceding-sibling::h3"
end
def commits_counter
find(:xpath, "//p[contains(text(),'Commits')]/preceding-sibling::h3")
find(:xpath, commits_counter_selector)
end
 
def deploys_counter
Loading
Loading
Loading
Loading
@@ -8,6 +8,10 @@ describe Gitlab::CycleAnalytics::StageSummary do
let(:user) { create(:user, :admin) }
subject { described_class.new(project, from: Time.now, current_user: user).data }
 
before do
project.add_maintainer(user)
end
describe "#new_issues" do
it "finds the number of issues created after the 'from date'" do
Timecop.freeze(5.days.ago) { create(:issue, project: project) }
Loading
Loading
@@ -42,6 +46,23 @@ describe Gitlab::CycleAnalytics::StageSummary do
 
expect(subject.second[:value]).to eq(100)
end
context 'when a guest user is signed in' do
let(:guest_user) { create(:user) }
before do
project.add_guest(guest_user)
end
it 'does not include commit stats' do
data = described_class.new(project, from: from, current_user: guest_user).data
expect(includes_commits?(data)).to be_falsy
end
def includes_commits?(data)
data.any? { |h| h["title"] == 'Commits' }
end
end
end
 
describe "#deploys" do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment