rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't reuse encryption keys, change order of sync status

Browse Source
This commit is contained in:
Mo Bitar
2017-02-10 13:22:39 -06:00
parent 88372e3f02
commit 26808cc57d
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/app/services/helpers/encryptionHelper.js
View File

@@ -1,14 +1,8 @@
class EncryptionHelper { class EncryptionHelper {
static encryptItem(item, key) { static encryptItem(item, key) {
var item_key = null; var item_key = Neeto.crypto.generateRandomEncryptionKey();
// if(item.enc_item_key) { item.enc_item_key = Neeto.crypto.encryptText(item_key, key);
// // we reuse the key, but this is optional
// item_key = Neeto.crypto.decryptText(item.enc_item_key, key);
// } else {
item_key = Neeto.crypto.generateRandomEncryptionKey();
item.enc_item_key = Neeto.crypto.encryptText(item_key, key);
// }
var ek = Neeto.crypto.firstHalfOfKey(item_key); var ek = Neeto.crypto.firstHalfOfKey(item_key);
var ak = Neeto.crypto.secondHalfOfKey(item_key); var ak = Neeto.crypto.secondHalfOfKey(item_key);

14
app/assets/templates/frontend/directives/account-menu.html.haml
View File

@@ -28,7 +28,13 @@
%div{"ng-if" => "user"} %div{"ng-if" => "user"}
%h2 {{user.email}} %h2 {{user.email}}
%p {{server}} %p {{server}}
%a.block.mt-10{"href" => "{{dashboardURL()}}", "target" => "_blank"} → Standard File Dashboard %div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
.spinner.inline.mr-5.blue
{{"Syncing" + (syncStatus.total > 0 ? ":" : "")}}
%span{"ng-if" => "syncStatus.total > 0"} {{syncStatus.current}}/{{syncStatus.total}}
%p.bold.mt-10.red.block{"ng-if" => "syncStatus.error"} Error syncing: {{syncStatus.error.message}}
%a.block.mt-15{"href" => "{{dashboardURL()}}", "target" => "_blank"} → Standard File Dashboard
%a.block.mt-5{"ng-click" => "showCredentials = !showCredentials"} Show Credentials %a.block.mt-5{"ng-click" => "showCredentials = !showCredentials"} Show Credentials
%section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"} %section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"}
%label.block %label.block
@@ -55,12 +61,6 @@
%button.btn.dark-button.btn-block{"ng-click" => "submitPasswordChange()"} Submit %button.btn.dark-button.btn-block{"ng-click" => "submitPasswordChange()"} Submit
%p.italic.mt-10{"ng-if" => "newPasswordData.status"} {{newPasswordData.status}} %p.italic.mt-10{"ng-if" => "newPasswordData.status"} {{newPasswordData.status}}
%div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
.spinner.inline.mr-5.blue
{{"Syncing" + (syncStatus.total > 0 ? ":" : "")}}
%span{"ng-if" => "syncStatus.total > 0"} {{syncStatus.current}}/{{syncStatus.total}}
%p.bold.mt-10.red.block{"ng-if" => "syncStatus.error"} Error syncing: {{syncStatus.error.message}}
.medium-v-space .medium-v-space
%h4 Local Encryption %h4 Local Encryption