sachaaaaa
6 years ago
committed by
GitHub
commit
a1255dd31e
@ -0,0 +1,35 @@
|
||||
const { sha512 } = require('js-sha512');
|
||||
|
||||
const ERRORS = {
|
||||
TYPE: 'Password must be a string',
|
||||
LENGTH: 'Password must be between 6 and 50 characters long',
|
||||
CHARACTER: 'Password must only contain letters, numbers and symbols',
|
||||
};
|
||||
|
||||
const generateHash = (phrase) => phrase && sha512(phrase.trim());
|
||||
const matchesHash = (phrase, hash) => phrase && sha512(phrase.trim()) === hash.trim();
|
||||
|
||||
const validatePassword = (phrase, i18n) => {
|
||||
if (!phrase || typeof phrase !== 'string') {
|
||||
return i18n ? i18n('passwordTypeError') : ERRORS.TYPE;
|
||||
}
|
||||
|
||||
const trimmed = phrase.trim();
|
||||
if (trimmed.length < 6 || trimmed.length > 50) {
|
||||
return i18n ? i18n('passwordLengthError') : ERRORS.LENGTH;
|
||||
}
|
||||
|
||||
// Restrict characters to letters, numbers and symbols
|
||||
const characterRegex = /^[a-zA-Z0-9-!()._`~@#$%^&*+=[\]{}|<>,;:]+$/
|
||||
if (!characterRegex.test(trimmed)) {
|
||||
return i18n ? i18n('passwordCharacterError') : ERRORS.CHARACTER;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
generateHash,
|
||||
matchesHash,
|
||||
validatePassword,
|
||||
};
|
||||
@ -0,0 +1,7 @@
|
||||
/* global $, Whisper */
|
||||
const $body = $(document.body);
|
||||
|
||||
// eslint-disable-next-line strict
|
||||
window.view = new Whisper.PasswordView();
|
||||
$body.html('');
|
||||
window.view.$el.prependTo($body);
|
||||
@ -0,0 +1,214 @@
|
||||
/* global Whisper, i18n, _, Signal, passwordUtil */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
const PasswordDialogView = Whisper.View.extend({
|
||||
className: 'loki-dialog password-dialog modal',
|
||||
templateName: 'password-dialog',
|
||||
initialize(options) {
|
||||
this.type = options.type;
|
||||
this.resolve = options.resolve;
|
||||
this.okText = options.okText || i18n('ok');
|
||||
|
||||
this.reject = options.reject;
|
||||
this.cancelText = options.cancelText || i18n('cancel');
|
||||
|
||||
this.title = options.title;
|
||||
|
||||
this.render();
|
||||
this.updateUI();
|
||||
},
|
||||
events: {
|
||||
keyup: 'onKeyup',
|
||||
'click .ok': 'ok',
|
||||
'click .cancel': 'cancel',
|
||||
},
|
||||
render_attributes() {
|
||||
return {
|
||||
showCancel: !this.hideCancel,
|
||||
cancel: this.cancelText,
|
||||
ok: this.okText,
|
||||
title: this.title,
|
||||
};
|
||||
},
|
||||
async updateUI() {
|
||||
if (this.disableOkButton()) {
|
||||
this.$('.ok').prop('disabled', true);
|
||||
} else {
|
||||
this.$('.ok').prop('disabled', false);
|
||||
}
|
||||
},
|
||||
disableOkButton() {
|
||||
const password = this.$('#password').val();
|
||||
return _.isEmpty(password);
|
||||
},
|
||||
async validate() {
|
||||
const password = this.$('#password').val();
|
||||
const passwordConfirmation = this.$('#password-confirmation').val();
|
||||
|
||||
const pairValidation = this.validatePasswordPair(password, passwordConfirmation);
|
||||
const hashValidation = await this.validatePasswordHash(password);
|
||||
|
||||
return (pairValidation || hashValidation);
|
||||
},
|
||||
async validatePasswordHash(password) {
|
||||
// Check if the password matches the hash we have stored
|
||||
const hash = await Signal.Data.getPasswordHash();
|
||||
if (hash && !passwordUtil.matchesHash(password, hash)) {
|
||||
return i18n('invalidPassword');
|
||||
}
|
||||
return null;
|
||||
},
|
||||
validatePasswordPair(password, passwordConfirmation) {
|
||||
if (!_.isEmpty(password)) {
|
||||
|
||||
// Check if the password is first valid
|
||||
const passwordValidation = passwordUtil.validatePassword(password, i18n);
|
||||
if (passwordValidation) {
|
||||
return passwordValidation;
|
||||
}
|
||||
|
||||
// Check if the confirmation password is the same
|
||||
if (!passwordConfirmation || password.trim() !== passwordConfirmation.trim()) {
|
||||
return i18n('passwordsDoNotMatch');
|
||||
}
|
||||
}
|
||||
return null;
|
||||
},
|
||||
okPressed() {
|
||||
const password = this.$('#password').val();
|
||||
if (this.type === 'set') {
|
||||
window.setPassword(password.trim());
|
||||
} else if (this.type === 'remove') {
|
||||
window.setPassword(null, password.trim());
|
||||
}
|
||||
},
|
||||
okErrored() {
|
||||
if (this.type === 'set') {
|
||||
this.showError(i18n('setPasswordFail'));
|
||||
} else if (this.type === 'remove') {
|
||||
this.showError(i18n('removePasswordFail'));
|
||||
}
|
||||
},
|
||||
async ok() {
|
||||
const error = await this.validate();
|
||||
if (error) {
|
||||
this.showError(error);
|
||||
return;
|
||||
}
|
||||
|
||||
// Clear any errors
|
||||
this.showError(null);
|
||||
|
||||
try {
|
||||
this.okPressed();
|
||||
|
||||
this.remove();
|
||||
if (this.resolve) {
|
||||
this.resolve();
|
||||
}
|
||||
} catch (e) {
|
||||
this.okErrored();
|
||||
}
|
||||
},
|
||||
cancel() {
|
||||
this.remove();
|
||||
if (this.reject) {
|
||||
this.reject();
|
||||
}
|
||||
},
|
||||
onKeyup(event) {
|
||||
this.updateUI();
|
||||
switch (event.key) {
|
||||
case 'Enter':
|
||||
this.ok();
|
||||
break;
|
||||
case 'Escape':
|
||||
case 'Esc':
|
||||
this.cancel();
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
},
|
||||
focusCancel() {
|
||||
this.$('.cancel').focus();
|
||||
},
|
||||
showError(message) {
|
||||
if (_.isEmpty(message)) {
|
||||
this.$('.error').text('');
|
||||
this.$('.error').hide();
|
||||
} else {
|
||||
this.$('.error').text(`Error: ${message}`);
|
||||
this.$('.error').show();
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
const ChangePasswordDialogView = PasswordDialogView.extend({
|
||||
templateName: 'password-change-dialog',
|
||||
disableOkButton() {
|
||||
const oldPassword = this.$('#old-password').val();
|
||||
const newPassword = this.$('#new-password').val();
|
||||
return _.isEmpty(oldPassword) || _.isEmpty(newPassword);
|
||||
},
|
||||
async validate() {
|
||||
const oldPassword = this.$('#old-password').val();
|
||||
|
||||
// Validate the old password
|
||||
if (!_.isEmpty(oldPassword) ) {
|
||||
const oldPasswordValidation = passwordUtil.validatePassword(oldPassword, i18n);
|
||||
if (oldPasswordValidation) {
|
||||
return oldPasswordValidation;
|
||||
}
|
||||
} else {
|
||||
return i18n('typeInOldPassword');
|
||||
}
|
||||
|
||||
const password = this.$('#new-password').val();
|
||||
const passwordConfirmation = this.$('#new-password-confirmation').val();
|
||||
|
||||
const pairValidation = this.validatePasswordPair(password, passwordConfirmation);
|
||||
const hashValidation = await this.validatePasswordHash(oldPassword);
|
||||
|
||||
return pairValidation || hashValidation;
|
||||
},
|
||||
okPressed() {
|
||||
const oldPassword = this.$('#old-password').val();
|
||||
const newPassword = this.$('#new-password').val();
|
||||
window.setPassword(newPassword.trim(), oldPassword.trim());
|
||||
},
|
||||
okErrored() {
|
||||
this.showError(i18n('changePasswordFail'));
|
||||
},
|
||||
});
|
||||
|
||||
Whisper.getPasswordDialogView = (type, resolve, reject) => {
|
||||
|
||||
// This is a differently styled dialog
|
||||
if (type === 'change') {
|
||||
return new ChangePasswordDialogView({
|
||||
title: i18n('changePassword'),
|
||||
okTitle: i18n('change'),
|
||||
resolve,
|
||||
reject,
|
||||
});
|
||||
}
|
||||
|
||||
// Set and Remove is basically the same UI
|
||||
const title = type === 'remove' ? i18n('removePassword') : i18n('setPassword');
|
||||
const okTitle = type === 'remove' ? i18n('remove') : i18n('set');
|
||||
return new PasswordDialogView({
|
||||
title,
|
||||
okTitle,
|
||||
type,
|
||||
resolve,
|
||||
reject,
|
||||
});
|
||||
};
|
||||
})();
|
||||
@ -0,0 +1,42 @@
|
||||
/* global i18n: false */
|
||||
/* global Whisper: false */
|
||||
|
||||
/* eslint-disable no-new */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
Whisper.PasswordView = Whisper.View.extend({
|
||||
className: 'password full-screen-flow standalone-fullscreen',
|
||||
templateName: 'password',
|
||||
events: {
|
||||
'click #unlock-button': 'onLogin',
|
||||
},
|
||||
initialize() {
|
||||
this.render();
|
||||
},
|
||||
render_attributes() {
|
||||
return {
|
||||
title: i18n('passwordViewTitle'),
|
||||
buttonText: i18n('unlock'),
|
||||
};
|
||||
},
|
||||
async onLogin() {
|
||||
const passPhrase = this.$('#passPhrase').val();
|
||||
const trimmed = passPhrase ? passPhrase.trim() : passPhrase;
|
||||
this.setError('');
|
||||
try {
|
||||
await window.onLogin(trimmed);
|
||||
} catch (e) {
|
||||
this.setError(`Error: ${e}`);
|
||||
}
|
||||
},
|
||||
setError(string) {
|
||||
this.$('.error').text(string);
|
||||
},
|
||||
});
|
||||
|
||||
})();
|
||||
@ -0,0 +1,50 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Security-Policy"
|
||||
content="default-src 'none';
|
||||
child-src 'self';
|
||||
connect-src 'self' https: wss:;
|
||||
font-src 'self';
|
||||
form-action 'self';
|
||||
frame-src 'none';
|
||||
img-src 'self' blob: data:;
|
||||
media-src 'self' blob:;
|
||||
object-src 'none';
|
||||
script-src 'self';
|
||||
style-src 'self' 'unsafe-inline';"
|
||||
>
|
||||
<link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
|
||||
<style>
|
||||
</style>
|
||||
<script type='text/x-tmpl-mustache' id='password'>
|
||||
<div class='content-wrapper standalone'>
|
||||
<div class='content'>
|
||||
<h2>{{ title }}</h2>
|
||||
<div class='inputs'>
|
||||
<input class='form-control' type='password' id='passPhrase' placeholder='Password' autocomplete='off' spellcheck='false' />
|
||||
<a class='button' id='unlock-button'>{{ buttonText }}</a>
|
||||
<div class='error'></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type='text/javascript' src='js/components.js'></script>
|
||||
<script type='text/javascript' src='js/views/whisper_view.js'></script>
|
||||
<script type='text/javascript' src='js/views/password_view.js'></script>
|
||||
</head>
|
||||
<body>
|
||||
<div class='app-loading-screen'>
|
||||
<div class='content'>
|
||||
<img src='images/loki/loki_icon_128.png'>
|
||||
<div class='container'>
|
||||
<span class='dot'></span>
|
||||
<span class='dot'></span>
|
||||
<span class='dot'></span>
|
||||
</div>
|
||||
<div class='message'></div>
|
||||
</div>
|
||||
</div>
|
||||
<script type='text/javascript' src='js/password_start.js'></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,39 @@
|
||||
/* global window */
|
||||
|
||||
const { ipcRenderer } = require('electron');
|
||||
const url = require('url');
|
||||
const i18n = require('./js/modules/i18n');
|
||||
|
||||
const config = url.parse(window.location.toString(), true).query;
|
||||
const { locale } = config;
|
||||
const localeMessages = ipcRenderer.sendSync('locale-data');
|
||||
|
||||
window.theme = config.theme;
|
||||
window.i18n = i18n.setup(locale, localeMessages);
|
||||
|
||||
// So far we're only using this for Signal.Types
|
||||
const Signal = require('./js/modules/signal');
|
||||
|
||||
window.Signal = Signal.setup({
|
||||
Attachments: null,
|
||||
userDataPath: null,
|
||||
getRegionCode: () => null,
|
||||
});
|
||||
|
||||
window.getEnvironment = () => config.environment;
|
||||
window.getVersion = () => config.version;
|
||||
window.getAppInstance = () => config.appInstance;
|
||||
|
||||
window.passwordUtil = require('./app/password_util');
|
||||
|
||||
window.onLogin = (passPhrase) => new Promise((resolve, reject) => {
|
||||
ipcRenderer.once('password-window-login-response', (event, error) => {
|
||||
if (error) {
|
||||
return reject(error);
|
||||
}
|
||||
return resolve();
|
||||
});
|
||||
ipcRenderer.send('password-window-login', passPhrase);
|
||||
});
|
||||
|
||||
require('./js/logging');
|
||||
@ -0,0 +1,29 @@
|
||||
.password {
|
||||
.content-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: $color-dark-05;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin: 3em;
|
||||
}
|
||||
|
||||
.inputs {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
input {
|
||||
width: 30em;
|
||||
}
|
||||
|
||||
.error {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
margin-top: 1em;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue