kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'security-event-counters-private-data' into 'master'

Browse source 
[master] Don't expose project names in various counters

See merge request gitlab/gitlabhq!2418
This commit is contained in:
Felipe Artur Cardozo 2018-07-24 20:25:25 +00:00
commit 236ed1f2f3
19 changed files with 20 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/remote_mirror.rb
View file

@ -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!(
@ -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

2
app/models/repository.rb
View file

@ -1029,7 +1029,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

2
app/workers/concerns/gitlab/github_import/object_importer.rb
View file

@ -22,7 +22,7 @@ module Gitlab
importer_class.new(object, project, client).execute
counter.increment(project: project.full_path)
counter.increment
end
def counter

4
app/workers/repository_fork_worker.rb
View file

@ -23,9 +23,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)

4
app/workers/repository_import_worker.rb
View file

@ -11,9 +11,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

5
changelogs/unreleased/event-counters-private-data.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Don't expose project names in various counters
merge_request:
author:
type: security

5
changelogs/unreleased/pr-importer-project-name.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Don't expose project names in GitHub counters
merge_request:
author:
type: security

6
lib/api/runner.rb
View file

@ -108,8 +108,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)
@ -140,8 +139,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'

4
lib/gitlab/email/handler/create_issue_handler.rb
View file

@ -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

4
lib/gitlab/email/handler/create_merge_request_handler.rb
View file

@ -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

4
lib/gitlab/email/handler/create_note_handler.rb
View file

@ -28,10 +28,6 @@ module Gitlab
record_name: 'comment')
end
def metrics_params
super.merge(project: project&.full_path)
end
private
def author

4
lib/gitlab/email/handler/unsubscribe_handler.rb
View file

@ -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

2
lib/gitlab/github_import/importer/pull_requests_importer.rb
View file

@ -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)

1
spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
View file

@ -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

1
spec/workers/concerns/gitlab/github_import/object_importer_spec.rb
View file

@ -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 })

1
spec/workers/gitlab/github_import/import_diff_note_worker_spec.rb
View file

@ -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)

1
spec/workers/gitlab/github_import/import_issue_worker_spec.rb
View file

@ -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)

1
spec/workers/gitlab/github_import/import_note_worker_spec.rb
View file

@ -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)

1
spec/workers/gitlab/github_import/import_pull_request_worker_spec.rb
View file

@ -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)