nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-09-09 06:24:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Added encryptíon to folderpath

Browse source 
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
This commit is contained in:
fnuesse 2018-12-30 22:58:55 +01:00
parent b6103785b3
commit c948506887
No known key found for this signature in database
GPG key ID: 2089A3431243E819
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/app/controllers/credential.js
View file

@ -70,30 +70,15 @@
for (var i = 0; i < _credentials.length; i++) { for (var i = 0; i < _credentials.length; i++) {
var _credential = _credentials[i]; var _credential = _credentials[i];
if(_credential.folderpath === null){
_credential.folderpath='/';
}
if(_credential.folderpath.startsWith($scope.currentFolder)){
if($scope.FolderList.indexOf(_credential.folderpath) <= -1){
$scope.FolderList.push(_credential.folderpath);
}
}else{
_credential.folderpath="/";
}
try { try {
if (!_credential.shared_key) { if (!_credential.shared_key) {
_credential = CredentialService.decryptCredential(angular.copy(_credential)); _credential = CredentialService.decryptCredential(angular.copy(_credential));
} else { } else {
var enc_key = EncryptService.decryptString(_credential.shared_key); var enc_key = EncryptService.decryptString(_credential.shared_key);
_credential = ShareService.decryptSharedCredential(angular.copy(_credential), enc_key); _credential = ShareService.decryptSharedCredential(angular.copy(_credential), enc_key);
} }
_credential.tags_raw = _credential.tags; _credential.tags_raw = _credential.tags;
} catch (e) { } catch (e) {
NotificationService.showNotification($translate.instant('error.decrypt'), 5000); NotificationService.showNotification($translate.instant('error.decrypt'), 5000);
//$rootScope.$broadcast('logout'); //$rootScope.$broadcast('logout');
//SettingsService.setSetting('defaultVaultPass', null); //SettingsService.setSetting('defaultVaultPass', null);
@ -101,6 +86,19 @@
//$location.path('/') //$location.path('/')
} }
if(_credential.folderpath !== null){
if(_credential.folderpath.startsWith($scope.currentFolder)){
if($scope.FolderList.indexOf(_credential.folderpath) <= -1){
$scope.FolderList.push(_credential.folderpath);
}
}else{
_credential.folderpath="/";
}
}else{
_credential.folderpath="/";
}
_credentials[i] = _credential; _credentials[i] = _credential;
} }

15
js/app/services/credentialservice.js
View file

@ -55,9 +55,10 @@
'files': [], 'files': [],
'custom_fields': [], 'custom_fields': [],
'otp': {}, 'otp': {},
'hidden': false 'hidden': false,
'folderpath': [],
}; };
var _encryptedFields = ['description', 'username', 'password', 'files', 'custom_fields', 'otp', 'email', 'tags', 'url']; var _encryptedFields = ['description', 'username', 'password', 'files', 'custom_fields', 'otp', 'email', 'tags', 'url', 'folderpath'];
return { return {
@ -140,7 +141,13 @@
var fieldValue = angular.copy(credential[field]); var fieldValue = angular.copy(credential[field]);
var field_decrypted_value; var field_decrypted_value;
try { try {
field_decrypted_value = EncryptService.decryptString(fieldValue, key);
if(fieldValue!==null){
field_decrypted_value = EncryptService.decryptString(fieldValue, key);
}else{
field_decrypted_value="";
}
//field_decrypted_value = EncryptService.decryptString(fieldValue, key);
} catch (e) { } catch (e) {
throw e; throw e;
} }
@ -148,9 +155,7 @@
credential[field] = JSON.parse(field_decrypted_value); credential[field] = JSON.parse(field_decrypted_value);
} catch (e) { } catch (e) {
console.warn('Field' + field + ' in ' + credential.label + ' could not be parsed! Value:' + fieldValue); console.warn('Field' + field + ' in ' + credential.label + ' could not be parsed! Value:' + fieldValue);
} }
} }
return credential; return credential;
}, },