Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
This commit is contained in:
Bart Visscher
commit
817b8d151b
5 changed files with 122 additions and 72 deletions
|
|
@ -1,64 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Check if we are a user
|
||||
OCP\JSON::callCheck();
|
||||
OC_JSON::checkLoggedIn();
|
||||
|
||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
||||
OC_APP::loadApps();
|
||||
|
||||
$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
|
||||
$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
|
||||
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
|
||||
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
|
||||
|
||||
$userstatus = null;
|
||||
if (OC_User::isAdminUser(OC_User::getUser())) {
|
||||
$userstatus = 'admin';
|
||||
}
|
||||
if (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
|
||||
$userstatus = 'subadmin';
|
||||
}
|
||||
if (OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
|
||||
$userstatus = 'user';
|
||||
}
|
||||
|
||||
if (is_null($userstatus)) {
|
||||
OC_JSON::error(array('data' => array('message' => 'Authentication error')));
|
||||
exit();
|
||||
}
|
||||
|
||||
if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
|
||||
//handle the recovery case
|
||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
|
||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
||||
|
||||
$validRecoveryPassword = false;
|
||||
$recoveryPasswordSupported = false;
|
||||
if ($recoveryAdminEnabled) {
|
||||
$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
|
||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||
}
|
||||
|
||||
if ($recoveryEnabledForUser && $recoveryPassword === '') {
|
||||
OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
|
||||
} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
|
||||
OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
|
||||
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
|
||||
$result = OC_User::setPassword($username, $password, $recoveryPassword);
|
||||
if (!$result && $recoveryPasswordSupported) {
|
||||
OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." )));
|
||||
} elseif (!$result && !$recoveryPasswordSupported) {
|
||||
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
|
||||
} else {
|
||||
OC_JSON::success(array("data" => array( "username" => $username )));
|
||||
}
|
||||
|
||||
}
|
||||
} else { // if user changes his own password or if encryption is disabled, proceed
|
||||
if (!is_null($password) && OC_User::setPassword($username, $password)) {
|
||||
OC_JSON::success(array('data' => array('username' => $username)));
|
||||
} else {
|
||||
OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
|
||||
}
|
||||
}
|
||||
107
settings/changepassword/controller.php
Normal file
107
settings/changepassword/controller.php
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
<?php
|
||||
|
||||
namespace OC\Settings\ChangePassword;
|
||||
|
||||
class Controller {
|
||||
public static function changePersonalPassword($args) {
|
||||
// Check if we are an user
|
||||
\OC_JSON::callCheck();
|
||||
\OC_JSON::checkLoggedIn();
|
||||
|
||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
||||
\OC_App::loadApps();
|
||||
|
||||
$username = \OC_User::getUser();
|
||||
$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
|
||||
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
|
||||
|
||||
if (!\OC_User::checkPassword($username, $oldPassword)) {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array("data" => array("message" => $l->t("Wrong password")) ));
|
||||
exit();
|
||||
}
|
||||
if (!is_null($password) && \OC_User::setPassword($username, $password)) {
|
||||
\OC_JSON::success();
|
||||
} else {
|
||||
\OC_JSON::error();
|
||||
}
|
||||
}
|
||||
|
||||
public static function changeUserPassword($args) {
|
||||
// Check if we are an user
|
||||
\OC_JSON::callCheck();
|
||||
\OC_JSON::checkLoggedIn();
|
||||
|
||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
||||
\OC_App::loadApps();
|
||||
|
||||
if (isset($_POST['username'])) {
|
||||
$username = $_POST['username'];
|
||||
} else {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array('data' => array('message' => $l->t('No user supplied')) ));
|
||||
exit();
|
||||
}
|
||||
|
||||
$password = isset($_POST['password']) ? $_POST['password'] : null;
|
||||
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
|
||||
|
||||
if (\OC_User::isAdminUser(\OC_User::getUser())) {
|
||||
$userstatus = 'admin';
|
||||
} elseif (\OC_SubAdmin::isUserAccessible(\OC_User::getUser(), $username)) {
|
||||
$userstatus = 'subadmin';
|
||||
} else {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array('data' => array('message' => $l->t('Authentication error')) ));
|
||||
exit();
|
||||
}
|
||||
|
||||
if (\OC_App::isEnabled('files_encryption')) {
|
||||
//handle the recovery case
|
||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
|
||||
$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
||||
|
||||
$validRecoveryPassword = false;
|
||||
$recoveryPasswordSupported = false;
|
||||
if ($recoveryAdminEnabled) {
|
||||
$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
|
||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||
}
|
||||
|
||||
if ($recoveryEnabledForUser && $recoveryPassword === '') {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array('data' => array(
|
||||
'message' => $l->t('Please provide an admin recovery password, otherwise all user data will be lost')
|
||||
)));
|
||||
} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array('data' => array(
|
||||
'message' => $l->t('Wrong admin recovery password. Please check the password and try again.')
|
||||
)));
|
||||
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
|
||||
$result = \OC_User::setPassword($username, $password, $recoveryPassword);
|
||||
if (!$result && $recoveryPasswordSupported) {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array(
|
||||
"data" => array(
|
||||
"message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.")
|
||||
)
|
||||
));
|
||||
} elseif (!$result && !$recoveryPasswordSupported) {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array("data" => array( $l->t("message" => "Unable to change password" ) )));
|
||||
} else {
|
||||
\OC_JSON::success(array("data" => array( "username" => $username )));
|
||||
}
|
||||
|
||||
}
|
||||
} else { // if encryption is disabled, proceed
|
||||
if (!is_null($password) && \OC_User::setPassword($username, $password)) {
|
||||
\OC_JSON::success(array('data' => array('username' => $username)));
|
||||
} else {
|
||||
$l = new \OC_L10n('settings');
|
||||
\OC_JSON::error(array('data' => array('message' => $l->t('Unable to change password'))));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -124,14 +124,17 @@ $(document).ready(function(){
|
|||
$('#passwordchanged').hide();
|
||||
$('#passworderror').hide();
|
||||
// Ajax foo
|
||||
$.post( 'ajax/changepassword.php', post, function(data){
|
||||
$.post(OC.Router.generate('settings_personal_changepassword'), post, function(data){
|
||||
if( data.status === "success" ){
|
||||
$('#pass1').val('');
|
||||
$('#pass2').val('');
|
||||
$('#passwordchanged').show();
|
||||
}
|
||||
else{
|
||||
$('#passworderror').html( data.data.message );
|
||||
} else{
|
||||
if (typeof(data.data) !== "undefined") {
|
||||
$('#passworderror').html(data.data.message);
|
||||
} else {
|
||||
$('#passworderror').html(t('Unable to change password'));
|
||||
}
|
||||
$('#passworderror').show();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ $(document).ready(function () {
|
|||
if ($(this).val().length > 0) {
|
||||
var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
|
||||
$.post(
|
||||
OC.filePath('settings', 'ajax', 'changepassword.php'),
|
||||
OC.Router.generate('settings_users_changepassword'),
|
||||
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
|
||||
function (result) {
|
||||
if (result.status != 'success') {
|
||||
|
|
|
|||
|
|
@ -37,11 +37,15 @@ $this->create('settings_ajax_togglesubadmins', '/settings/ajax/togglesubadmins.p
|
|||
->actionInclude('settings/ajax/togglesubadmins.php');
|
||||
$this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
|
||||
->actionInclude('settings/ajax/removegroup.php');
|
||||
$this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
|
||||
->actionInclude('settings/ajax/changepassword.php');
|
||||
$this->create('settings_users_changepassword', '/settings/users/changepassword')
|
||||
->post()
|
||||
->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
|
||||
$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
|
||||
->actionInclude('settings/ajax/changedisplayname.php');
|
||||
// personel
|
||||
// personal
|
||||
$this->create('settings_personal_changepassword', '/settings/personal/changepassword')
|
||||
->post()
|
||||
->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
|
||||
$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
|
||||
->actionInclude('settings/ajax/lostpassword.php');
|
||||
$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
|
||||
|
|
|
|||
Loading…
Reference in a new issue