login custom fields view/edit

This commit is contained in:
Kyle Spearrin 2017-09-21 22:45:24 -04:00
parent 56e1f6c25b
commit 835bb6ffa7
13 changed files with 255 additions and 50 deletions

View File

@ -753,5 +753,17 @@
}, },
"privateModeMessage": { "privateModeMessage": {
"message": "Unfortunately this window is not available in private mode for this browser." "message": "Unfortunately this window is not available in private mode for this browser."
},
"customFields": {
"message": "Custom Fields"
},
"copyValue": {
"message": "Copy Value"
},
"toggleValue": {
"message": "Toggle Value"
},
"value": {
"message": "Value"
} }
} }

View File

@ -289,12 +289,12 @@ var bg_isBackground = true,
chrome.webRequest.onCompleted.addListener(completeAuthRequest, { urls: ['http://*/*'] }); chrome.webRequest.onCompleted.addListener(completeAuthRequest, { urls: ['http://*/*'] });
chrome.webRequest.onErrorOccurred.addListener(completeAuthRequest, { urls: ['http://*/*'] }); chrome.webRequest.onErrorOccurred.addListener(completeAuthRequest, { urls: ['http://*/*'] });
}
function completeAuthRequest(details) { function completeAuthRequest(details) {
var i = pendingAuthRequests.indexOf(details.requestId); var i = pendingAuthRequests.indexOf(details.requestId);
if (i > -1) { if (i > -1) {
pendingAuthRequests.splice(i, 1); pendingAuthRequests.splice(i, 1);
}
} }
} }

View File

@ -18,6 +18,17 @@
default: default:
break; break;
} }
if (cipher.fields) {
this.fields = [];
for (var i = 0; i < cipher.fields.length; i++) {
this.fields.push({
type: cipher.fields[i].type,
name: cipher.fields[i].name ? cipher.fields[i].name.encryptedString : null,
value: cipher.fields[i].value ? cipher.fields[i].value.encryptedString : null,
});
}
}
}; };
var FolderRequest = function (folder) { var FolderRequest = function (folder) {

View File

@ -145,16 +145,17 @@ var SyncResponse = function (response) {
this.profile = new ProfileResponse(response.Profile); this.profile = new ProfileResponse(response.Profile);
} }
var i;
this.folders = []; this.folders = [];
if (response.Folders) { if (response.Folders) {
for (var i = 0; i < response.Folders.length; i++) { for (i = 0; i < response.Folders.length; i++) {
this.folders.push(new FolderResponse(response.Folders[i])); this.folders.push(new FolderResponse(response.Folders[i]));
} }
} }
this.ciphers = []; this.ciphers = [];
if (response.Ciphers) { if (response.Ciphers) {
for (var i = 0; i < response.Ciphers.length; i++) { for (i = 0; i < response.Ciphers.length; i++) {
this.ciphers.push(new CipherResponse(response.Ciphers[i])); this.ciphers.push(new CipherResponse(response.Ciphers[i]));
} }
} }

View File

@ -31,9 +31,17 @@ var LoginData = function (response, userId) {
this.favorite = response.favorite; this.favorite = response.favorite;
this.revisionDate = response.revisionDate; this.revisionDate = response.revisionDate;
var i;
if (response.data.Fields) {
this.fields = [];
for (i = 0; i < response.data.Fields.length; i++) {
this.fields.push(new FieldData(response.data.Fields[i]));
}
}
if (response.attachments) { if (response.attachments) {
this.attachments = []; this.attachments = [];
for (var i = 0; i < response.attachments.length; i++) { for (i = 0; i < response.attachments.length; i++) {
this.attachments.push(new AttachmentData(response.attachments[i])); this.attachments.push(new AttachmentData(response.attachments[i]));
} }
} }
@ -46,3 +54,9 @@ var AttachmentData = function (response) {
this.size = response.size; this.size = response.size;
this.sizeName = response.sizeName; this.sizeName = response.sizeName;
}; };
var FieldData = function (response) {
this.type = response.Type;
this.name = response.Name;
this.value = response.Value;
};

View File

@ -114,15 +114,39 @@ var Login = function (obj, alreadyEncrypted, localData) {
this.totp = obj.totp ? new CipherString(obj.totp) : null; this.totp = obj.totp ? new CipherString(obj.totp) : null;
} }
var i;
if (obj.attachments) { if (obj.attachments) {
this.attachments = []; this.attachments = [];
for (var i = 0; i < obj.attachments.length; i++) { for (i = 0; i < obj.attachments.length; i++) {
this.attachments.push(new Attachment(obj.attachments[i], alreadyEncrypted)); this.attachments.push(new Attachment(obj.attachments[i], alreadyEncrypted));
} }
} }
else { else {
this.attachments = null; this.attachments = null;
} }
if (obj.fields) {
this.fields = [];
for (i = 0; i < obj.fields.length; i++) {
this.fields.push(new Field(obj.fields[i], alreadyEncrypted));
}
}
else {
this.fields = null;
}
};
var Field = function (obj, alreadyEncrypted) {
this.type = obj.type;
if (alreadyEncrypted === true) {
this.name = obj.name ? obj.name : null;
this.value = obj.value ? obj.value : null;
}
else {
this.name = obj.name ? new CipherString(obj.name) : null;
this.value = obj.value ? new CipherString(obj.value) : null;
}
}; };
var Attachment = function (obj, alreadyEncrypted) { var Attachment = function (obj, alreadyEncrypted) {
@ -182,9 +206,9 @@ var Folder = function (obj, alreadyEncrypted) {
}; };
var attachments = []; var attachments = [];
var deferred = Q.defer(); var fields = [];
self.name.decrypt(self.organizationId).then(function (val) { return self.name.decrypt(self.organizationId).then(function (val) {
model.name = val; model.name = val;
if (self.uri) { if (self.uri) {
return self.uri.decrypt(self.organizationId); return self.uri.decrypt(self.organizationId);
@ -222,24 +246,58 @@ var Folder = function (obj, alreadyEncrypted) {
model.totp = val; model.totp = val;
if (self.attachments) { if (self.attachments) {
var attachmentPromises = []; return self.attachments.reduce(function (promise, attachment) {
for (var i = 0; i < self.attachments.length; i++) { return promise.then(function () {
(function (attachment) { return attachment.decrypt(self.organizationId);
var promise = attachment.decrypt(self.organizationId).then(function (decAttachment) { }).then(function (decAttachment) {
attachments.push(decAttachment); attachments.push(decAttachment);
}); });
attachmentPromises.push(promise); }, Q());
})(self.attachments[i]);
}
return Q.all(attachmentPromises);
} }
return; return;
}).then(function () { }).then(function () {
model.attachments = attachments.length ? attachments : null; model.attachments = attachments.length ? attachments : null;
deferred.resolve(model);
});
return deferred.promise; if (self.fields) {
return self.fields.reduce(function (promise, field) {
return promise.then(function () {
return field.decrypt(self.organizationId);
}).then(function (decField) {
fields.push(decField);
});
}, Q());
}
return;
}).then(function () {
model.fields = fields.length ? fields : null;
return model;
}, function (e) {
console.log(e);
});
};
Field.prototype.decrypt = function (orgId) {
var self = this;
var model = {
type: self.type
};
return Q().then(function () {
if (self.name) {
return self.name.decrypt(orgId);
}
return null;
}).then(function (val) {
model.name = val;
if (self.value) {
return self.value.decrypt(orgId);
}
return null;
}).then(function (val) {
model.value = val;
return model;
});
}; };
Attachment.prototype.decrypt = function (orgId) { Attachment.prototype.decrypt = function (orgId) {
@ -251,14 +309,10 @@ var Folder = function (obj, alreadyEncrypted) {
url: self.url url: self.url
}; };
var deferred = Q.defer(); return self.fileName.decrypt(orgId).then(function (val) {
self.fileName.decrypt(orgId).then(function (val) {
model.fileName = val; model.fileName = val;
deferred.resolve(model); return model;
}); });
return deferred.promise;
}; };
Folder.prototype.decrypt = function () { Folder.prototype.decrypt = function () {
@ -267,13 +321,9 @@ var Folder = function (obj, alreadyEncrypted) {
id: self.id id: self.id
}; };
var deferred = Q.defer(); return self.name.decrypt().then(function (val) {
self.name.decrypt().then(function (val) {
model.name = val; model.name = val;
deferred.resolve(model); return model;
}); });
return deferred.promise;
}; };
})(); })();

View File

@ -2,8 +2,9 @@ angular
.module('bit.vault') .module('bit.vault')
.controller('vaultEditLoginController', function ($scope, $state, $stateParams, loginService, folderService, .controller('vaultEditLoginController', function ($scope, $state, $stateParams, loginService, folderService,
cryptoService, $q, toastr, SweetAlert, utilsService, $analytics, i18nService) { cryptoService, $q, toastr, SweetAlert, utilsService, $analytics, i18nService, constantsService) {
$scope.i18n = i18nService; $scope.i18n = i18nService;
$scope.constants = constantsService;
$scope.showAttachments = !utilsService.isEdge(); $scope.showAttachments = !utilsService.isEdge();
var loginId = $stateParams.loginId; var loginId = $stateParams.loginId;
var fromView = $stateParams.fromView; var fromView = $stateParams.fromView;

View File

@ -2,7 +2,9 @@ angular
.module('bit.vault') .module('bit.vault')
.controller('vaultViewLoginController', function ($scope, $state, $stateParams, loginService, toastr, $q, .controller('vaultViewLoginController', function ($scope, $state, $stateParams, loginService, toastr, $q,
$analytics, i18nService, utilsService, totpService, $timeout, tokenService, $window, cryptoService, SweetAlert) { $analytics, i18nService, utilsService, totpService, $timeout, tokenService, $window, cryptoService, SweetAlert,
constantsService) {
$scope.constants = constantsService;
$scope.i18n = i18nService; $scope.i18n = i18nService;
$scope.showAttachments = !utilsService.isEdge(); $scope.showAttachments = !utilsService.isEdge();
var from = $stateParams.from, var from = $stateParams.from,
@ -19,12 +21,7 @@ angular
$scope.login = model; $scope.login = model;
if (model.password) { if (model.password) {
var maskedPassword = ''; $scope.login.maskedPassword = $scope.maskValue(model.password);
for (var i = 0; i < model.password.length; i++) {
maskedPassword += '•';
}
$scope.login.maskedPassword = maskedPassword;
} }
if (model.uri) { if (model.uri) {
@ -65,6 +62,10 @@ angular
}); });
}; };
$scope.toggleFieldValue = function (field) {
field.showValue = !field.showValue;
};
$scope.close = function () { $scope.close = function () {
if (from === 'current') { if (from === 'current') {
$state.go('tabs.current', { $state.go('tabs.current', {
@ -94,6 +95,18 @@ angular
toastr.info(i18n.browserNotSupportClipboard); toastr.info(i18n.browserNotSupportClipboard);
}; };
$scope.maskValue = function (value) {
if (!value) {
return value;
}
var masked = '';
for (var i = 0; i < value.length; i++) {
masked += '•';
}
return masked;
};
$scope.clipboardSuccess = function (e, type) { $scope.clipboardSuccess = function (e, type) {
e.clearSelection(); e.clearSelection();
$analytics.eventTrack('Copied ' + (type === i18nService.username ? 'Username' : 'Password')); $analytics.eventTrack('Copied ' + (type === i18nService.username ? 'Username' : 'Password'));

View File

@ -73,6 +73,24 @@
</div> </div>
</div> </div>
</div> </div>
<div class="list-section" ng-if="login.fields && login.fields.length">
<div class="list-section-header">
{{i18n.customFields}}
</div>
<div class="list-section-items">
<div class="list-section-item" ng-repeat="field in login.fields"
ng-class="{'list-section-item-checkbox' : field.type === constants.fieldType.boolean}">
<label for="field_value{{$index}}" class="item-label">{{field.name}}</label>
<input id="field_value{{$index}}" type="text" name="Field.Value{{$index}}"
ng-model="field.value" ng-if="field.type === constants.fieldType.text">
<input id="field_value{{$index}}" type="password" name="Field.Value{{$index}}"
ng-model="field.value" ng-if="field.type === constants.fieldType.hidden">
<input id="field_value{{$index}}" name="Field.Value{{$index}}" type="checkbox"
ng-model="field.value" data-ng-true-value="'true'"
ng-if="field.type === constants.fieldType.boolean">
</div>
</div>
</div>
<div class="list-section"> <div class="list-section">
<div class="list-section-items"> <div class="list-section-items">
<a href="" ng-click="delete()" class="list-section-item text-danger"> <a href="" ng-click="delete()" class="list-section-item text-danger">

View File

@ -57,7 +57,7 @@
<span class="totp-sec">{{totpSec}}</span> <span class="totp-sec">{{totpSec}}</span>
<svg> <svg>
<g> <g>
<circle class="totp-circle inner" r="12.6" cy="16" cx="16" <circle class="totp-circle inner" r="12.6" cy="16" cx="16"
style="stroke-dashoffset: {{totpDash}}px;"></circle> style="stroke-dashoffset: {{totpDash}}px;"></circle>
<circle class="totp-circle outer" r="14" cy="16" cx="16"></circle> <circle class="totp-circle outer" r="14" cy="16" cx="16"></circle>
</g> </g>
@ -76,6 +76,36 @@
<div class="list-section-item pre">{{login.notes}}</div> <div class="list-section-item pre">{{login.notes}}</div>
</div> </div>
</div> </div>
<div class="list-section" ng-if="login.fields && login.fields.length">
<div class="list-section-header">
{{i18n.customFields}}
</div>
<div class="list-section-items">
<div class="list-section-item" ng-repeat="field in login.fields">
<a class="btn-list" href="" title="{{i18n.copyValue}}" ngclipboard ngclipboard-error="clipboardError(e)"
ngclipboard-success="clipboardSuccess(e, i18n.value)" data-clipboard-text="{{field.value}}"
ng-if="field.type !== constants.fieldType.boolean && field.value">
<i class="fa fa-lg fa-clipboard"></i>
</a>
<a class="btn-list" href="" title="{{i18n.toggleValue}}" ng-click="toggleFieldValue(field)"
ng-if="field.type === constants.fieldType.hidden">
<i class="fa fa-lg" ng-class="[{'fa-eye': !field.showValue}, {'fa-eye-slash': field.showValue}]"></i>
</a>
<span class="item-label">{{field.name}}</span>
<div ng-if="field.type === constants.fieldType.text">
{{field.value || '&nbsp;'}}
</div>
<div ng-if="field.type === constants.fieldType.hidden">
<span ng-show="!field.showValue">{{maskValue(field.value)}}</span>
<span ng-show="field.showValue" class="monospaced">{{field.value}}</span>
</div>
<div ng-if="field.type === constants.fieldType.boolean">
<i class="fa fa-check-square-o" ng-if="field.value === 'true'"></i>
<i class="fa fa-square-o" ng-if="field.value !== 'true'"></i>
</div>
</div>
</div>
</div>
<div class="list-section" ng-if="showAttachments && isPremium && login.attachments && login.attachments.length"> <div class="list-section" ng-if="showAttachments && isPremium && login.attachments && login.attachments.length">
<div class="list-section-header"> <div class="list-section-header">
{{i18n.attachments}} {{i18n.attachments}}

View File

@ -30,8 +30,8 @@ function initApiService() {
} }
// Desktop // Desktop
//self.baseUrl = 'http://localhost:4000'; self.baseUrl = 'http://localhost:4000';
//self.identityBaseUrl = 'http://localhost:33656'; self.identityBaseUrl = 'http://localhost:33656';
// Desktop HTTPS // Desktop HTTPS
//self.baseUrl = 'https://localhost:44377'; //self.baseUrl = 'https://localhost:44377';
@ -46,8 +46,8 @@ function initApiService() {
//self.identityBaseUrl = 'https://preview-identity.bitwarden.com'; //self.identityBaseUrl = 'https://preview-identity.bitwarden.com';
// Production // Production
self.baseUrl = 'https://api.bitwarden.com'; //self.baseUrl = 'https://api.bitwarden.com';
self.identityBaseUrl = 'https://identity.bitwarden.com'; //self.identityBaseUrl = 'https://identity.bitwarden.com';
}; };
// Auth APIs // Auth APIs

View File

@ -17,6 +17,16 @@ function ConstantsService(i18nService) {
Rsa2048_OaepSha256_HmacSha256_B64: 5, Rsa2048_OaepSha256_HmacSha256_B64: 5,
Rsa2048_OaepSha1_HmacSha256_B64: 6 Rsa2048_OaepSha1_HmacSha256_B64: 6
}, },
cipherType: {
login: 1,
secureNote: 2,
card: 3
},
fieldType: {
text: 0,
hidden: 1,
boolean: 2
},
twoFactorProvider: { twoFactorProvider: {
u2f: 4, u2f: 4,
yubikey: 3, yubikey: 3,

View File

@ -44,6 +44,51 @@ function initLoginService() {
return self.cryptoService.encrypt(login.totp, orgKey); return self.cryptoService.encrypt(login.totp, orgKey);
}).then(function (cs) { }).then(function (cs) {
model.totp = cs; model.totp = cs;
return self.encryptFields(login.fields, orgKey);
}).then(function (fields) {
model.fields = fields;
return model;
});
};
LoginService.prototype.encryptFields = function (fields, key) {
var self = this;
if (!fields || !fields.length) {
return null;
}
var encFields = [];
return fields.reduce(function (promise, field) {
return promise.then(function () {
return self.encryptField(field, key);
}).then(function (encField) {
encFields.push(encField);
});
}, Q()).then(function () {
return encFields;
});
};
LoginService.prototype.encryptField = function (field, key) {
var self = this;
var model = {
type: field.type
};
return Q().then(function () {
if (!field.name || field.name === '') {
return null;
}
return self.cryptoService.encrypt(field.name, key);
}).then(function (cs) {
model.name = cs;
if (!field.value || field.value === '') {
return null;
}
return self.cryptoService.encrypt(field.value, key);
}).then(function (cs) {
model.value = cs;
return model; return model;
}); });
}; };
@ -533,7 +578,7 @@ function initLoginService() {
return 0; return 0;
}; };
function sortLoginsByLastUsed(a ,b) { function sortLoginsByLastUsed(a, b) {
var aLastUsed = a.localData && a.localData.lastUsedDate ? a.localData.lastUsedDate : null; var aLastUsed = a.localData && a.localData.lastUsedDate ? a.localData.lastUsedDate : null;
var bLastUsed = b.localData && b.localData.lastUsedDate ? b.localData.lastUsedDate : null; var bLastUsed = b.localData && b.localData.lastUsedDate ? b.localData.lastUsedDate : null;