Skip to content
Snippets Groups Projects
Unverified Commit f27cba0f authored by Luke Duncalfe's avatar Luke Duncalfe Committed by Yorick Peterse
Browse files

Fix private user email being visible in tag webhooks

Fixes #54721
parent 29521953
No related branches found
No related tags found
No related merge requests found
---
title: Fix private user email being visible in push (and tag push) webhooks
merge_request:
author:
type: security
Loading
Loading
@@ -93,7 +93,7 @@ module Gitlab
user_id: user.id,
user_name: user.name,
user_username: user.username,
user_email: user.email,
user_email: user.public_email,
user_avatar: user.avatar_url(only_path: false),
project_id: project.id,
project: project.hook_attrs,
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@ require 'spec_helper'
 
describe Gitlab::DataBuilder::Push do
let(:project) { create(:project, :repository) }
let(:user) { build(:user) }
let(:user) { build(:user, public_email: 'public-email@example.com') }
 
describe '.build_sample' do
let(:data) { described_class.build_sample(project, user) }
Loading
Loading
@@ -36,7 +36,7 @@ describe Gitlab::DataBuilder::Push do
it { expect(data[:user_id]).to eq(user.id) }
it { expect(data[:user_name]).to eq(user.name) }
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[:project_id]).to eq(project.id) }
it { expect(data[:project]).to be_a(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