observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 6 commits into from
Oct 2, 2024
Merged

observation/FOUR-16703 Insecure email change mechanism #7368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
602625e
Added an authentication when the user wants to change the email
gustavobascope Sep 12, 2024
72e93ae
Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…
gustavobascope Sep 12, 2024
c01ad98
change SSO user validation and clear password
gustavobascope Sep 13, 2024
253e57c
Fix wrong user id variable
gustavobascope Sep 16, 2024
a8e8178
Fix php-unit user update tests
gustavobascope Sep 16, 2024
23de0fd
Fix php-unit user update tests
gustavobascope Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/UserController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
return $result;
}
);
$ssoUser = false;
if (class_exists(SsoUser::class)) {
$ssoUser = SsoUser::where('user_id', $user->id)->exists();
}

// Get global and valid 2FA preferences for the user
$enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
'is2FAEnabledForGroup',
'addons',
'addonsSettings',
'ssoUser',
));
}

Expand Down
47 changes: 47 additions & 0 deletions ProcessMaker/Http/Controllers/Api/UserController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
return $response;
}
}
if ($fields['email'] !== $original['email']) {
if (!isset($fields['valpassword'])) {
return response([
'message' => __(
'A valid authentication is required for for update the email.'
),
'errors' => [
'email' => [
__(
'The password is required.'
),
],
],
], 422);
} else {
$response = $this->validateBeforeChange($user, $fields['valpassword']);
if ($response) {
return $response;
}
}
}
if (Auth::user()->is_administrator && $request->has('is_administrator')) {
// user must be an admin to make another user an admin
$user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
return false;
}

/**
* Validate the phone number for SMS two-factor authentication.
*
* @param User $user User to validate
* @param mixed $password String to validate
*/
private function validateBeforeChange(User $user, $password)
{
if (!Hash::check($password, $user->password)) {
return response([
'message' => __(
'A valid authentication is required for for update the email.'
),
'errors' => [
'email' => [
__(
'The authentication is incorrect.'
),
],
],
], 422);
}

return false;
}

/**
* Update a user's pinned BPMN elements on Modeler
*
Expand Down
8 changes: 7 additions & 1 deletion ProcessMaker/Http/Controllers/ProfileController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
}
);

$ssoUser = false;
if (class_exists(SsoUser::class)) {
$ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
}

// Get global and valid 2FA preferences for the user
$enabled2FA = config('password-policies.2fa_enabled', false);
$global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

return view('profile.edit',
compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
}

/**
Expand Down
70 changes: 48 additions & 22 deletions resources/views/admin/users/edit.blade.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
image: '',
status: @json($status),
global2FAEnabled: @json($global2FAEnabled),
ssoUser:@json($ssoUser),
errors: {
username: null,
firstname: null,
Expand All@@ -282,6 +283,8 @@
groups: [],
userGroupsFilter: '',
focusErrors: 'errors',
originalEmail: '',
emailHasChanged: false,
}
},
created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
if (created) {
ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
}
this.originalEmail = this.formData.email;
},
watch: {
selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
return true
},
profileUpdate($event) {
this.resetErrors();
if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
// User has not enabled two-factor authentication correctly
ProcessMaker.alert(
this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
'warning'
);
return false;
if(this.emailHasChanged && !this.ssoUser) {
$('#validateModal').modal('show');
} else {
this.saveProfileChanges();
}
if (!this.validatePassword()) return false;
if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
.then(response => {
ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
if (this.formData.id == window.ProcessMaker.user.id) {
window.ProcessMaker.events.$emit('update-profile-avatar');
}
})
.catch(error => {
this.errors = error.response.data.errors;
});

},
permissionUpdate() {
ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
.then(response => {
this.groups = response.data.data
});
}
},
showModal() {
$('#validateModal').modal('show');
},
closeModal() {
$('#validateModal').modal('hide');
},
saveProfileChanges() {
this.resetErrors();
if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
// User has not enabled two-factor authentication correctly
ProcessMaker.alert(
this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
'warning'
);
return false;
}
if (!this.validatePassword()) return false;
if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
.then(response => {
ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
if (this.formData.id == window.ProcessMaker.user.id) {
window.ProcessMaker.events.$emit('update-profile-avatar');
this.originalEmail = this.formData.email;
this.formData.valpassword = "";
}
})
.catch(error => {
this.errors = error.response.data.errors;
});

this.closeModal();
},
checkEmailChange() {
this.emailHasChanged = this.formData.email !== this.originalEmail;
},
}
});
</script>
Expand DownExpand Up@@ -627,3 +652,4 @@
}
</style>
@endsection

80 changes: 53 additions & 27 deletions resources/views/profile/edit.blade.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
states: @json($states),
status: @json($status),
global2FAEnabled: @json($global2FAEnabled),
ssoUser:@json($ssoUser),
errors: {
username: null,
firstname: null,
Expand All@@ -146,6 +147,8 @@
},
confPassword: '',
image: '',
originalEmail: '',
emailHasChanged: false,
options: [
{
src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
});
}
},
mounted() {
this.originalEmail = this.formData.email;
},
methods: {
openAvatarModal() {
modalVueInstance.$refs.updateAvatarModal.show();
},
profileUpdate() {
this.resetErrors();
if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
let message = 'The Two Step Authentication Method has not been set. ' +
'Please contact your administrator.';
// User has not enabled two-factor authentication correctly
ProcessMaker.alert(this.$t($message), 'warning');
return false;
}
if (!this.validatePassword()) return false;
if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
return false;
if (this.image) {
this.formData.avatar = this.image;
}
if (this.image === false) {
this.formData.avatar = false;
}
ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
.then((response) => {
ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
window.ProcessMaker.events.$emit('update-profile-avatar');
})
.catch(error => {
this.errors = error.response.data.errors;
});
if(this.emailHasChanged && !this.ssoUser) {
$('#validateModal').modal('show');
} else {
this.saveProfileChanges();
}
},
deleteAvatar() {
let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
onClose() {
window.location.href = '/admin/users';
},
showModal() {
$('#validateModal').modal('show');
},
closeModal() {
$('#validateModal').modal('hide');
},
saveProfileChanges() {
this.resetErrors();
if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
let message = 'The Two Step Authentication Method has not been set. ' +
'Please contact your administrator.';
// User has not enabled two-factor authentication correctly
ProcessMaker.alert(this.$t($message), 'warning');
return false;
}
if (!this.validatePassword()) return false;
if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
return false;
if (this.image) {
this.formData.avatar = this.image;
}
if (this.image === false) {
this.formData.avatar = false;
}
ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
.then((response) => {
ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
window.ProcessMaker.events.$emit('update-profile-avatar');
this.originalEmail = this.formData.email;
this.formData.valpassword = "";
})
.catch(error => {
this.errors = error.response.data.errors;
});

this.closeModal();
},
checkEmailChange() {
this.emailHasChanged = this.formData.email !== this.originalEmail;
},
},
computed: {
state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

//TODO: HANDLE CONNECTION UPDATE
this.onCloseModal;
}
},
}
});
</script>
Expand Down
28 changes: 27 additions & 1 deletion resources/views/shared/users/profile.blade.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
{!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
'form-control', 'v-model'
=> 'formData.email', 'v-bind:class' => '{\'form-control\':true,
\'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
\'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
'@input' => 'checkEmailChange']) !!}
<div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
</div>
</div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
@endforeach
@endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="form-group col">
{!! Form::label('valpassword', __('Password')) !!}
{!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
=> 'formData.valpassword']) !!}
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
<button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
</div>
</div>
</div>
</div>

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
observation/FOUR-16703 Insecure email change mechanism#7368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ryancooley
merged 6 commits into

from

Oct 2, 2024
 Merged


observation/FOUR-16703 Insecure email change mechanism
#7368
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
602625e

Added an authentication when the user wants to change the email


gustavobascope Sep 12, 2024
72e93ae

Merge branch 'next' of github.com:ProcessMaker/processmaker into obse…


gustavobascope Sep 12, 2024
c01ad98

change SSO user validation and clear password


gustavobascope Sep 13, 2024
253e57c

Fix wrong user id variable


gustavobascope Sep 16, 2024
a8e8178

Fix php-unit user update tests


gustavobascope Sep 16, 2024
23de0fd

Fix php-unit user update tests


gustavobascope Sep 16, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
ProcessMaker/Http/Controllers/Admin/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\Permission;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class UserController extends Controller
Expand DownExpand Up@@ -76,6 +77,10 @@ function ($result, $item) {
 return $result;
 }
 );
 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $user->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
Expand DownExpand Up@@ -103,6 +108,7 @@ function ($result, $item) {
 'is2FAEnabledForGroup',
 'addons',
 'addonsSettings',
 'ssoUser',
 ));
 }

Expand Down

47 changes: 47 additions & 0 deletions
ProcessMaker/Http/Controllers/Api/UserController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,6 +329,27 @@ public function update(User $user, Request $request)
 return $response;
 }
 }
 if ($fields['email'] !== $original['email']) {
 if (!isset($fields['valpassword'])) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The password is required.'
 ),
 ],
 ],
 ], 422);
 } else {
 $response = $this->validateBeforeChange($user, $fields['valpassword']);
 if ($response) {
 return $response;
 }
 }
 }
 if (Auth::user()->is_administrator && $request->has('is_administrator')) {
 // user must be an admin to make another user an admin
 $user->is_administrator = $request->get('is_administrator');
Expand DownExpand Up@@ -381,6 +402,32 @@ private function validateCellPhoneNumber(User $user, $number)
 return false;
 }

 /**
 * Validate the phone number for SMS two-factor authentication.
 *
 * @param User $user User to validate
 * @param mixed $password String to validate
 */
 private function validateBeforeChange(User $user, $password)
 {
 if (!Hash::check($password, $user->password)) {
 return response([
 'message' => __(
 'A valid authentication is required for for update the email.'
 ),
 'errors' => [
 'email' => [
 __(
 'The authentication is incorrect.'
 ),
 ],
 ],
 ], 422);
 }

 return false;
 }

 /**
 * Update a user's pinned BPMN elements on Modeler
 *
Expand Down

8 changes: 7 additions & 1 deletion
ProcessMaker/Http/Controllers/ProfileController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
use ProcessMaker\i18nHelper;
use ProcessMaker\Models\JsonData;
use ProcessMaker\Models\User;
use ProcessMaker\Package\Auth\Models\SsoUser;
use ProcessMaker\Traits\HasControllerAddons;

class ProfileController extends Controller
Expand DownExpand Up@@ -50,6 +51,11 @@ function ($result, $item) {
 }
 );

 $ssoUser = false;
 if (class_exists(SsoUser::class)) {
 $ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
 }

 // Get global and valid 2FA preferences for the user
 $enabled2FA = config('password-policies.2fa_enabled', false);
 $global2FAEnabled = config('password-policies.2fa_method', []);
Expand All@@ -60,7 +66,7 @@ function ($result, $item) {

 return view('profile.edit',
 compact('currentUser', 'states', 'timezones', 'countries', 'datetimeFormats', 'availableLangs',
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons'));
 'status', 'enabled2FA', 'global2FAEnabled', 'is2FAEnabledForGroup', 'addons', 'ssoUser'));
 }

 /**
Expand Down

70 changes: 48 additions & 22 deletions
resources/views/admin/users/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -257,6 +257,7 @@
 image: '',
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -282,6 +283,8 @@
 groups: [],
 userGroupsFilter: '',
 focusErrors: 'errors',
 originalEmail: '',
 emailHasChanged: false,
 }
 },
 created() {
Expand DownExpand Up@@ -342,6 +345,7 @@
 if (created) {
 ProcessMaker.alert(this.$t('The user was successfully created'), 'success');
 }
 this.originalEmail = this.formData.email;
 },
 watch: {
 selectedPermissions: function () {
Expand DownExpand Up@@ -468,28 +472,12 @@
 return true
 },
 profileUpdate($event) {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 },
 permissionUpdate() {
 ProcessMaker.apiClient.put("/permissions", {
Expand DownExpand Up@@ -564,7 +552,44 @@
 .then(response => {
 this.groups = response.data.data
 });
 }
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(
 this.$t('The Two Step Authentication Method has not been set. Please contact your administrator.'),
 'warning'
 );
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1) return false;
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then(response => {
 ProcessMaker.alert(this.$t('User Updated Successfully '), 'success');
 if (this.formData.id == window.ProcessMaker.user.id) {
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 }
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 }
 });
 </script>
Expand DownExpand Up@@ -627,3 +652,4 @@
 }
 </style>
@endsection


80 changes: 53 additions & 27 deletions
resources/views/profile/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -136,6 +136,7 @@
 states: @json($states),
 status: @json($status),
 global2FAEnabled: @json($global2FAEnabled),
 ssoUser:@json($ssoUser),
 errors: {
 username: null,
 firstname: null,
Expand All@@ -146,6 +147,8 @@
 },
 confPassword: '',
 image: '',
 originalEmail: '',
 emailHasChanged: false,
 options: [
 {
 src: @json($currentUser['avatar']),
Expand All@@ -169,37 +172,19 @@
 });
 }
 },
 mounted() {
 this.originalEmail = this.formData.email;
 },
 methods: {
 openAvatarModal() {
 modalVueInstance.$refs.updateAvatarModal.show();
 },
 profileUpdate() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });
 if(this.emailHasChanged && !this.ssoUser) {
 $('#validateModal').modal('show');
 } else {
 this.saveProfileChanges();
 }
 },
 deleteAvatar() {
 let optionValues = formVueInstance.$data.options[0];
Expand DownExpand Up@@ -242,6 +227,47 @@
 onClose() {
 window.location.href = '/admin/users';
 },
 showModal() {
 $('#validateModal').modal('show');
 },
 closeModal() {
 $('#validateModal').modal('hide');
 },
 saveProfileChanges() {
 this.resetErrors();
 if (@json($enabled2FA) && this.global2FAEnabled.length === 0) {
 let message = 'The Two Step Authentication Method has not been set. ' +
 'Please contact your administrator.';
 // User has not enabled two-factor authentication correctly
 ProcessMaker.alert(this.$t($message), 'warning');
 return false;
 }
 if (!this.validatePassword()) return false;
 if (@json($enabled2FA) && typeof this.formData.preferences_2fa != "undefined" &&
 this.formData.preferences_2fa != null && this.formData.preferences_2fa.length < 1)
 return false;
 if (this.image) {
 this.formData.avatar = this.image;
 }
 if (this.image === false) {
 this.formData.avatar = false;
 }
 ProcessMaker.apiClient.put('users/' + this.formData.id, this.formData)
 .then((response) => {
 ProcessMaker.alert(this.$t('Your profile was saved.'), 'success')
 window.ProcessMaker.events.$emit('update-profile-avatar');
 this.originalEmail = this.formData.email;
 this.formData.valpassword = "";
 })
 .catch(error => {
 this.errors = error.response.data.errors;
 });

 this.closeModal();
 },
 checkEmailChange() {
 this.emailHasChanged = this.formData.email !== this.originalEmail;
 },
 },
 computed: {
 state2FA() {
Expand DownExpand Up@@ -379,7 +405,7 @@

 //TODO: HANDLE CONNECTION UPDATE
 this.onCloseModal;
 }
 },
 }
 });
 </script>
Expand Down

28 changes: 27 additions & 1 deletion
resources/views/shared/users/profile.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,8 @@ class="mb-2"
 {!! Form::email('email', null, ['id' => 'email', 'rows' => 4, 'class'=>
 'form-control', 'v-model'
 => 'formData.email', 'v-bind:class' => '{\'form-control\':true,
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true']) !!}
 \'is-invalid\':errors.email}', 'required', 'aria-required' => 'true',
 '@input' => 'checkEmailChange']) !!}
 <div class="invalid-feedback" role="alert" v-if="errors.email">@{{errors.email[0]}}
 </div>
 </div>
Expand DownExpand Up@@ -159,3 +160,28 @@ class="mb-2"
 @endforeach
 @endif
</div>

<div class="modal fade" id="validateModal" tabindex="-1" role="dialog" aria-labelledby="modalValidate" aria-hidden="true">
 <div class="modal-dialog" role="document">
 <div class="modal-content">
 <div class="modal-header">
 <h5 class="modal-title" id="modalLabel">Confirm Identity</h5>
 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 <span aria-hidden="true">&times;</span>
 </button>
 </div>
 <div class="modal-body">
 <div class="form-group col">
 {!! Form::label('valpassword', __('Password')) !!}
 {!! Form::password('valpassword', ['id' => 'valpassword', 'rows' => 4, 'class'=> 'form-control', 'v-model'
 => 'formData.valpassword']) !!}
 </div>
 </div>
 <div class="modal-footer">
 <button type="button" class="btn btn-secondary" @click="closeModal">Cancel</button>
 <button type="button" class="btn btn-primary" @click="saveProfileChanges">Save</button>
 </div>
 </div>
 </div>
</div>

Loading