Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
f27cba0f
Commit
f27cba0f
authored
Jan 15, 2019
by
Luke Duncalfe
Committed by
Yorick Peterse
Jan 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix private user email being visible in tag webhooks
Fixes #54721
parent
29521953
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
changelogs/unreleased/security-fix-user-email-tag-push-leak.yml
...logs/unreleased/security-fix-user-email-tag-push-leak.yml
+5
-0
lib/gitlab/data_builder/push.rb
lib/gitlab/data_builder/push.rb
+1
-1
spec/lib/gitlab/data_builder/push_spec.rb
spec/lib/gitlab/data_builder/push_spec.rb
+2
-2
No files found.
changelogs/unreleased/security-fix-user-email-tag-push-leak.yml
0 → 100644
View file @
f27cba0f
---
title
:
Fix private user email being visible in push (and tag push) webhooks
merge_request
:
author
:
type
:
security
lib/gitlab/data_builder/push.rb
View file @
f27cba0f
...
@@ -93,7 +93,7 @@ module Gitlab
...
@@ -93,7 +93,7 @@ module Gitlab
user_id:
user
.
id
,
user_id:
user
.
id
,
user_name:
user
.
name
,
user_name:
user
.
name
,
user_username:
user
.
username
,
user_username:
user
.
username
,
user_email:
user
.
email
,
user_email:
user
.
public_
email
,
user_avatar:
user
.
avatar_url
(
only_path:
false
),
user_avatar:
user
.
avatar_url
(
only_path:
false
),
project_id:
project
.
id
,
project_id:
project
.
id
,
project:
project
.
hook_attrs
,
project:
project
.
hook_attrs
,
...
...
spec/lib/gitlab/data_builder/push_spec.rb
View file @
f27cba0f
...
@@ -2,7 +2,7 @@ require 'spec_helper'
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
DataBuilder
::
Push
do
describe
Gitlab
::
DataBuilder
::
Push
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
build
(
:user
)
}
let
(
:user
)
{
build
(
:user
,
public_email:
'public-email@example.com'
)
}
describe
'.build_sample'
do
describe
'.build_sample'
do
let
(
:data
)
{
described_class
.
build_sample
(
project
,
user
)
}
let
(
:data
)
{
described_class
.
build_sample
(
project
,
user
)
}
...
@@ -36,7 +36,7 @@ describe Gitlab::DataBuilder::Push do
...
@@ -36,7 +36,7 @@ describe Gitlab::DataBuilder::Push do
it
{
expect
(
data
[
:user_id
]).
to
eq
(
user
.
id
)
}
it
{
expect
(
data
[
:user_id
]).
to
eq
(
user
.
id
)
}
it
{
expect
(
data
[
:user_name
]).
to
eq
(
user
.
name
)
}
it
{
expect
(
data
[
:user_name
]).
to
eq
(
user
.
name
)
}
it
{
expect
(
data
[
:user_username
]).
to
eq
(
user
.
username
)
}
it
{
expect
(
data
[
:user_username
]).
to
eq
(
user
.
username
)
}
it
{
expect
(
data
[
:user_email
]).
to
eq
(
user
.
email
)
}
it
{
expect
(
data
[
:user_email
]).
to
eq
(
user
.
public_
email
)
}
it
{
expect
(
data
[
:user_avatar
]).
to
eq
(
user
.
avatar_url
)
}
it
{
expect
(
data
[
:user_avatar
]).
to
eq
(
user
.
avatar_url
)
}
it
{
expect
(
data
[
:project_id
]).
to
eq
(
project
.
id
)
}
it
{
expect
(
data
[
:project_id
]).
to
eq
(
project
.
id
)
}
it
{
expect
(
data
[
:project
]).
to
be_a
(
Hash
)
}
it
{
expect
(
data
[
:project
]).
to
be_a
(
Hash
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment