Skip to content
Snippets Groups Projects
Unverified Commit 9e29408e authored by Yorick Peterse's avatar Yorick Peterse
Browse files

Don't expose project names in various counters

Various counters would expose either project names, or full project
paths (e.g. "gitlab-org/gitlab-ce"). This commit changes various places
where we use "add_event" so we no longer expose (potentially) private
information.
parent d229e7d3
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Showing
with 20 additions and 38 deletions
Loading
Loading
@@ -48,13 +48,13 @@ class RemoteMirror < ActiveRecord::Base
state :failed
 
after_transition any => :started do |remote_mirror, _|
Gitlab::Metrics.add_event(:remote_mirrors_running, path: remote_mirror.project.full_path)
Gitlab::Metrics.add_event(:remote_mirrors_running)
 
remote_mirror.update(last_update_started_at: Time.now)
end
 
after_transition started: :finished do |remote_mirror, _|
Gitlab::Metrics.add_event(:remote_mirrors_finished, path: remote_mirror.project.full_path)
Gitlab::Metrics.add_event(:remote_mirrors_finished)
 
timestamp = Time.now
remote_mirror.update_attributes!(
Loading
Loading
@@ -63,7 +63,7 @@ class RemoteMirror < ActiveRecord::Base
end
 
after_transition started: :failed do |remote_mirror, _|
Gitlab::Metrics.add_event(:remote_mirrors_failed, path: remote_mirror.project.full_path)
Gitlab::Metrics.add_event(:remote_mirrors_failed)
 
remote_mirror.update(last_update_at: Time.now)
end
Loading
Loading
Loading
Loading
@@ -1025,7 +1025,7 @@ class Repository
end
 
def repository_event(event, tags = {})
Gitlab::Metrics.add_event(event, { path: full_path }.merge(tags))
Gitlab::Metrics.add_event(event, tags)
end
 
def initialize_raw_repository
Loading
Loading
Loading
Loading
@@ -22,7 +22,7 @@ module Gitlab
 
importer_class.new(object, project, client).execute
 
counter.increment(project: project.full_path)
counter.increment
end
 
def counter
Loading
Loading
Loading
Loading
@@ -21,9 +21,7 @@ class RepositoryForkWorker
def fork_repository(target_project, source_repository_storage_name, source_disk_path)
return unless start_fork(target_project)
 
Gitlab::Metrics.add_event(:fork_repository,
source_path: source_disk_path,
target_path: target_project.disk_path)
Gitlab::Metrics.add_event(:fork_repository)
 
result = gitlab_shell.fork_repository(source_repository_storage_name, source_disk_path,
target_project.repository_storage, target_project.disk_path)
Loading
Loading
Loading
Loading
@@ -9,9 +9,7 @@ class RepositoryImportWorker
 
return unless start_import(project)
 
Gitlab::Metrics.add_event(:import_repository,
import_url: project.import_url,
path: project.full_path)
Gitlab::Metrics.add_event(:import_repository)
 
service = Projects::ImportService.new(project, project.creator)
result = service.execute
Loading
Loading
---
title: Don't expose project names in various counters
merge_request:
author:
type: security
---
title: Don't expose project names in GitHub counters
merge_request:
author:
type: security
Loading
Loading
@@ -101,8 +101,7 @@ module API
 
if result.valid?
if result.build
Gitlab::Metrics.add_event(:build_found,
project: result.build.project.full_path)
Gitlab::Metrics.add_event(:build_found)
present result.build, with: Entities::JobRequest::Response
else
Gitlab::Metrics.add_event(:build_not_found)
Loading
Loading
@@ -133,8 +132,7 @@ module API
 
job.trace.set(params[:trace]) if params[:trace]
 
Gitlab::Metrics.add_event(:update_build,
project: job.project.full_path)
Gitlab::Metrics.add_event(:update_build)
 
case params[:state].to_s
when 'running'
Loading
Loading
Loading
Loading
@@ -36,10 +36,6 @@ module Gitlab
@project ||= Project.find_by_full_path(project_path)
end
 
def metrics_params
super.merge(project: project&.full_path)
end
private
 
def create_issue
Loading
Loading
Loading
Loading
@@ -40,10 +40,6 @@ module Gitlab
@project ||= Project.find_by_full_path(project_path)
end
 
def metrics_params
super.merge(project: project&.full_path)
end
private
 
def create_merge_request
Loading
Loading
Loading
Loading
@@ -28,10 +28,6 @@ module Gitlab
record_name: 'comment')
end
 
def metrics_params
super.merge(project: project&.full_path)
end
private
 
def author
Loading
Loading
Loading
Loading
@@ -20,10 +20,6 @@ module Gitlab
noteable.unsubscribe(sent_notification.recipient)
end
 
def metrics_params
super.merge(project: project&.full_path)
end
private
 
def sent_notification
Loading
Loading
Loading
Loading
@@ -43,7 +43,7 @@ module Gitlab
Rails.logger
.info("GitHub importer finished updating repository for #{pname}")
 
repository_updates_counter.increment(project: pname)
repository_updates_counter.increment
end
 
def update_repository?(pr)
Loading
Loading
Loading
Loading
@@ -158,7 +158,6 @@ describe Gitlab::GithubImport::Importer::PullRequestsImporter do
 
expect(importer.repository_updates_counter)
.to receive(:increment)
.with(project: project.path_with_namespace)
.and_call_original
 
Timecop.freeze do
Loading
Loading
Loading
Loading
@@ -51,7 +51,6 @@ describe Gitlab::GithubImport::ObjectImporter do
 
expect(worker.counter)
.to receive(:increment)
.with(project: 'foo/bar')
.and_call_original
 
worker.import(project, client, { 'number' => 10 })
Loading
Loading
Loading
Loading
@@ -33,7 +33,6 @@ describe Gitlab::GithubImport::ImportDiffNoteWorker do
 
expect(worker.counter)
.to receive(:increment)
.with(project: 'foo/bar')
.and_call_original
 
worker.import(project, client, hash)
Loading
Loading
Loading
Loading
@@ -36,7 +36,6 @@ describe Gitlab::GithubImport::ImportIssueWorker do
 
expect(worker.counter)
.to receive(:increment)
.with(project: 'foo/bar')
.and_call_original
 
worker.import(project, client, hash)
Loading
Loading
Loading
Loading
@@ -31,7 +31,6 @@ describe Gitlab::GithubImport::ImportNoteWorker do
 
expect(worker.counter)
.to receive(:increment)
.with(project: 'foo/bar')
.and_call_original
 
worker.import(project, client, hash)
Loading
Loading
Loading
Loading
@@ -42,7 +42,6 @@ describe Gitlab::GithubImport::ImportPullRequestWorker do
 
expect(worker.counter)
.to receive(:increment)
.with(project: 'foo/bar')
.and_call_original
 
worker.import(project, client, hash)
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