Skip to content

Commit aefe0ce

Browse files
committed
DP-542 Fix email sanitization issues
1 parent 0a21684 commit aefe0ce

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

src/Resources/BaseUserResource.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ protected function sendInvite($userId, $deleteOnError = false)
211211
'link' => url(\Config::get('df.confirm_invite_url')) .
212212
'?code=' . $user->confirm_code .
213213
'&email=' . $email .
214-
'&username=' . $user->username .
214+
'&username=' . strip_tags($user->username) .
215215
'&admin=' . $user->is_sys_admin,
216-
'first_name' => $user->first_name,
217-
'last_name' => $user->last_name,
218-
'name' => $user->name,
216+
'first_name' => strip_tags($user->first_name),
217+
'last_name' => strip_tags($user->last_name),
218+
'name' => strip_tags($user->name),
219219
'email' => $user->email,
220-
'phone' => $user->phone,
220+
'phone' => strip_tags($user->phone),
221221
'content_header' => array_get($templateData, 'subject',
222222
'You are invited to try DreamFactory.'),
223223
'app_name' => \Config::get('app.name'),

src/Resources/UserPasswordResource.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ protected static function userLogin($email, $password)
410410
*/
411411
protected function sendPasswordResetEmail(User $user)
412412
{
413+
413414
$email = $user->email;
414415

415416
/** @var \DreamFactory\Core\User\Services\User $parent */
@@ -441,15 +442,15 @@ protected function sendPasswordResetEmail(User $user)
441442

442443
$data['to'] = $email;
443444
$data['content_header'] = 'Password Reset';
444-
$data['first_name'] = $user->first_name;
445-
$data['last_name'] = $user->last_name;
446-
$data['name'] = $user->name;
447-
$data['phone'] = $user->phone;
445+
$data['first_name'] = strip_tags($user->first_name);
446+
$data['last_name'] = strip_tags($user->last_name);
447+
$data['name'] = strip_tags($user->name);
448+
$data['phone'] = strip_tags($user->phone);
448449
$data['email'] = $user->email;
449450
$data['link'] = url(\Config::get('df.confirm_reset_url')) .
450451
'?code=' . $user->confirm_code .
451452
'&email=' . $email .
452-
'&username=' . $user->username .
453+
'&username=' . strip_tags($user->username) .
453454
'&admin=' . $user->is_sys_admin;
454455
$data['confirm_code'] = $user->confirm_code;
455456

0 commit comments

Comments
 (0)