Skip to content

Commit

Permalink
Merge pull request owncloud#15752 from owncloud/feature/fix-encryptio…
Browse files Browse the repository at this point in the history 
…n-return-values

[enc2] fixing return values and adding tests
  • Loading branch information
@DeepDiver1975 @mmattel
DeepDiver1975 authored and mmattel committed May 22, 2015
2 parents b81a565 + c3b03b3 commit 5bd70c8
Show file tree
Hide file tree
Showing 4 changed files with 299 additions and 93 deletions.
100 changes: 56 additions & 44 deletions apps/encryption/controller/recoverycontroller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

use OCA\Encryption\Recovery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
Expand Down Expand Up @@ -72,31 +73,36 @@ public function __construct($AppName,
public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
// Check if both passwords are the same
if (empty($recoveryPassword)) {
$errorMessage = (string) $this->l->t('Missing recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], 500);
$errorMessage = (string)$this->l->t('Missing recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}

if (empty($confirmPassword)) {
$errorMessage = (string) $this->l->t('Please repeat the recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], 500);
$errorMessage = (string)$this->l->t('Please repeat the recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}

if ($recoveryPassword !== $confirmPassword) {
$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], 500);
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}

if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
return new DataResponse(['status' =>'success', 'data' => array('message' => (string) $this->l->t('Recovery key successfully enabled'))]);
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
}
return new DataResponse(['data' => array('message' => (string) $this->l->t('Could not enable recovery key. Please check your recovery key password!'))]);
return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
return new DataResponse(['data' => array('message' => (string) $this->l->t('Recovery key successfully disabled'))]);
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
}
return new DataResponse(['data' => array('message' => (string) $this->l->t('Could not disable recovery key. Please check your recovery key password!'))]);
return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
}
// this response should never be sent but just in case.
return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
}

/**
Expand All @@ -108,43 +114,42 @@ public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableR
public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
//check if both passwords are the same
if (empty($oldPassword)) {
$errorMessage = (string) $this->l->t('Please provide the old recovery password');
return new DataResponse(array('data' => array('message' => $errorMessage)));
$errorMessage = (string)$this->l->t('Please provide the old recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}

if (empty($newPassword)) {
$errorMessage = (string) $this->l->t('Please provide a new recovery password');
return new DataResponse (array('data' => array('message' => $errorMessage)));
$errorMessage = (string)$this->l->t('Please provide a new recovery password');
return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}

if (empty($confirmPassword)) {
$errorMessage = (string) $this->l->t('Please repeat the new recovery password');
return new DataResponse(array('data' => array('message' => $errorMessage)));
$errorMessage = (string)$this->l->t('Please repeat the new recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}

if ($newPassword !== $confirmPassword) {
$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(array('data' => array('message' => $errorMessage)));
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}

$result = $this->recovery->changeRecoveryKeyPassword($newPassword, $oldPassword);
$result = $this->recovery->changeRecoveryKeyPassword($newPassword,
$oldPassword);

if ($result) {
return new DataResponse(
array(
'status' => 'success' ,
'data' => array(
'message' => (string) $this->l->t('Password successfully changed.'))
)
);
} else {
return new DataResponse(
array(
'data' => array
('message' => (string) $this->l->t('Could not change the password. Maybe the old password was not correct.'))
)
);
[
'data' => [
'message' => (string)$this->l->t('Password successfully changed.')]
]
);
}
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
]
], Http::STATUS_BAD_REQUEST);
}

/**
Expand All @@ -159,22 +164,29 @@ public function userSetRecovery($userEnableRecovery) {
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);

if ($result) {
if ($userEnableRecovery === '0') {
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Recovery Key disabled')]
]
);
}
return new DataResponse(
array(
'status' => 'success',
'data' => array(
'message' => (string) $this->l->t('Recovery Key enabled'))
)
);
} else {
return new DataResponse(
array(
'data' => array
('message' => (string) $this->l->t('Could not enable the recovery key, please try again or contact your administrator'))
)
[
'data' => [
'message' => (string)$this->l->t('Recovery Key enabled')]
]
);
}

}
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
]
], Http::STATUS_BAD_REQUEST);
}

}
65 changes: 36 additions & 29 deletions apps/encryption/js/settings-admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,59 @@
* See the COPYING-README file.
*/

$(document).ready(function(){
$(document).ready(function () {

$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
var recoveryStatus = $( this ).val();
var oldStatus = (1+parseInt(recoveryStatus, 10)) % 2;
var recoveryPassword = $( '#encryptionRecoveryPassword' ).val();
var confirmPassword = $( '#repeatEncryptionRecoveryPassword' ).val();
$('input:radio[name="adminEnableRecovery"]').change(
function () {
var recoveryStatus = $(this).val();
var oldStatus = (1 + parseInt(recoveryStatus)) % 2;
var recoveryPassword = $('#encryptionRecoveryPassword').val();
var confirmPassword = $('#repeatEncryptionRecoveryPassword').val();
OC.msg.startSaving('#encryptionSetRecoveryKey .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/adminRecovery'),
{ adminEnableRecovery: recoveryStatus,
{
adminEnableRecovery: recoveryStatus,
recoveryPassword: recoveryPassword,
confirmPassword: confirmPassword },
function( result ) {
OC.msg.finishedSaving('#encryptionSetRecoveryKey .msg', result);
if (result.status === "error") {
$('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]')
.attr("checked", "true");
confirmPassword: confirmPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#encryptionSetRecoveryKey .msg', data.data.message);

if (recoveryStatus === "0") {
$('p[name="changeRecoveryPasswordBlock"]').addClass("hidden");
} else {
if (recoveryStatus === "0") {
$('p[name="changeRecoveryPasswordBlock"]').addClass("hidden");
} else {
$('input:password[name="changeRecoveryPassword"]').val("");
$('p[name="changeRecoveryPasswordBlock"]').removeClass("hidden");
}
$('input:password[name="changeRecoveryPassword"]').val("");
$('p[name="changeRecoveryPasswordBlock"]').removeClass("hidden");
}
}
);
})
.fail(function (jqXHR) {
$('input:radio[name="adminEnableRecovery"][value="' + oldStatus.toString() + '"]').attr("checked", "true");
OC.msg.finishedError('#encryptionSetRecoveryKey .msg', JSON.parse(jqXHR.responseText).data.message);
});
}
);

// change recovery password

$('button:button[name="submitChangeRecoveryKey"]').click(function() {
$('button:button[name="submitChangeRecoveryKey"]').click(function () {
var oldRecoveryPassword = $('#oldEncryptionRecoveryPassword').val();
var newRecoveryPassword = $('#newEncryptionRecoveryPassword').val();
var confirmNewPassword = $('#repeatedNewEncryptionRecoveryPassword').val();
OC.msg.startSaving('#encryptionChangeRecoveryKey .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/changeRecoveryPassword'),
{ oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword, confirmPassword: confirmNewPassword },
function( data ) {
OC.msg.finishedSaving('#encryptionChangeRecoveryKey .msg', data);
}
);
OC.generateUrl('/apps/encryption/ajax/changeRecoveryPassword'),
{
oldPassword: oldRecoveryPassword,
newPassword: newRecoveryPassword,
confirmPassword: confirmNewPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#encryptionChangeRecoveryKey .msg', data.data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#encryptionChangeRecoveryKey .msg', JSON.parse(jqXHR.responseText).data.message);
});
});

});
48 changes: 28 additions & 20 deletions apps/encryption/js/settings-personal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,64 @@ if (!OC.Encryption) {
}

OC.Encryption = {
updatePrivateKeyPassword: function() {
updatePrivateKeyPassword: function () {
var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
OC.msg.startSaving('#encryption .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword'),
{oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword}
).success(function (response) {
OC.msg.finishedSuccess('#encryption .msg', response.message);
}).fail(function (response) {
OC.msg.finishedError('#encryption .msg', response.responseJSON.message);
});
{
oldPassword: oldPrivateKeyPassword,
newPassword: newPrivateKeyPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#encryption .msg', data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#encryption .msg', JSON.parse(jqXHR.responseText).message);
});
}
};

$(document).ready(function(){
$(document).ready(function () {

// Trigger ajax on recoveryAdmin status change
$( 'input:radio[name="userEnableRecovery"]' ).change(
function() {
var recoveryStatus = $( this ).val();
$('input:radio[name="userEnableRecovery"]').change(
function () {
var recoveryStatus = $(this).val();
OC.msg.startAction('#userEnableRecovery .msg', 'Updating recovery keys. This can take some time...');
$.post(
OC.generateUrl('/apps/encryption/ajax/userSetRecovery'),
{ userEnableRecovery: recoveryStatus },
function( data ) {
OC.msg.finishedAction('#userEnableRecovery .msg', data);
OC.generateUrl('/apps/encryption/ajax/userSetRecovery'),
{
userEnableRecovery: recoveryStatus
}
);
).done(function (data) {
OC.msg.finishedSuccess('#userEnableRecovery .msg', data.data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#userEnableRecovery .msg', JSON.parse(jqXHR.responseText).data.message);
});
// Ensure page is not reloaded on form submit
return false;
}
);

// update private key password

$('input:password[name="changePrivateKeyPassword"]').keyup(function(event) {
$('input:password[name="changePrivateKeyPassword"]').keyup(function (event) {
var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
if (newPrivateKeyPassword !== '' && oldPrivateKeyPassword !== '' ) {
if (newPrivateKeyPassword !== '' && oldPrivateKeyPassword !== '') {
$('button:button[name="submitChangePrivateKeyPassword"]').removeAttr("disabled");
if(event.which === 13) {
if (event.which === 13) {
OC.Encryption.updatePrivateKeyPassword();
}
} else {
$('button:button[name="submitChangePrivateKeyPassword"]').attr("disabled", "true");
}
});

$('button:button[name="submitChangePrivateKeyPassword"]').click(function() {
$('button:button[name="submitChangePrivateKeyPassword"]').click(function () {
OC.Encryption.updatePrivateKeyPassword();
});

Expand Down
Loading

0 comments on commit 5bd70c8

Please sign in to comment.