- }
+ * @private
+ */
+ async _executeRequest(url, options) {
+ try {
+ const request = new Request(url, options)
+ this._api.emit('request.before', request)
+ return await fetch(request, options)
+ } catch (e) {
+ this._api.emit('request.error', e)
+ throw e
+ }
+ }
+
+}
diff --git a/src/passwords/ClientService.js b/src/passwords/ClientService.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ec4b8ff699a12707cadb39bb182136d51577eca
--- /dev/null
+++ b/src/passwords/ClientService.js
@@ -0,0 +1,40 @@
+/* eslint-disable new-parens */
+/* eslint-disable padded-blocks */
+import EnhancedClassLoader from 'passwords-client/enhanced-class-loader'
+import PasswordsClient from 'passwords-client'
+import LegacyPasswordsApi from './LegacyPasswordsApi.js'
+import ApiRequest from './ApiRequest.js'
+import PWDv1Challenge from './PWDv1Challenge.js'
+
+export default new class ClientService {
+ constructor() {
+ this._client = null
+ }
+
+ initialize(baseUrl, user, token, legacyConfig = {}) {
+ const server = { baseUrl, user, token }
+ const config = { baseUrl, user, token }
+
+ const classes = {
+ legacy: () => {
+ const client = new LegacyPasswordsApi()
+ client.initialize(this.getClient(), legacyConfig)
+ return client
+ },
+ // Need to over-ride the challenge class to set accepted password length to 8-32 characters
+ 'challenge.pwdv1': PWDv1Challenge,
+ 'network.request': ApiRequest,
+ }
+
+ const classLoader = new EnhancedClassLoader(classes)
+ this._client = new PasswordsClient(server, config, classLoader)
+ }
+
+ getClient() {
+ return this._client
+ }
+
+ getLegacyClient() {
+ return this.getClient().getInstance('legacy')
+ }
+}
diff --git a/src/passwords/LegacyPasswordsApi.js b/src/passwords/LegacyPasswordsApi.js
new file mode 100644
index 0000000000000000000000000000000000000000..aed85dbf9d0ed15e88ec1f9f404e2fb47e7591c9
--- /dev/null
+++ b/src/passwords/LegacyPasswordsApi.js
@@ -0,0 +1,17 @@
+import { EnhancedApi } from 'passwords-client/legacy'
+
+export default class LegacyPasswordsApi extends EnhancedApi {
+
+ async _executeRequest(url, options) {
+ try {
+ const request = new Request(url, options)
+ this._config.events.emit('api.request.before', request)
+ return await fetch(request, options)
+ } catch (e) {
+ if (e.status === 401 && this._enabled) this._enabled = false
+ this._config.events.emit('api.request.error', e)
+ throw e
+ }
+ }
+
+}
diff --git a/src/passwords/PWDv1Challenge.js b/src/passwords/PWDv1Challenge.js
new file mode 100644
index 0000000000000000000000000000000000000000..939fa832f57190154ffd8a2a5314cdbf8d748a10
--- /dev/null
+++ b/src/passwords/PWDv1Challenge.js
@@ -0,0 +1,72 @@
+import sodium from 'libsodium-wrappers'
+import DefaultClassLoader from 'passwords-client/default-class-loader'
+
+const classLoader = new DefaultClassLoader()
+const BasePWDv1Challenge = classLoader._classes['challenge.pwdv1']
+
+export default class PWDv1Challenge extends BasePWDv1Challenge {
+ constructor(data = {}) {
+ super(data)
+ }
+
+ _validatePasswordLength() {
+ if (this._password.length < 8) throw new Error('Password is too short')
+ if (this._password.length > 128) throw new Error('Password is too long')
+ }
+
+ solve() {
+ this._validatePasswordLength()
+ const salts = this._salts
+
+ const passwordSalt = sodium.from_hex(salts[0])
+ const genericHashKey = sodium.from_hex(salts[1])
+ const passwordHashSalt = sodium.from_hex(salts[2])
+ const genericHash = sodium.crypto_generichash(
+ sodium.crypto_generichash_BYTES_MAX,
+ new Uint8Array([...sodium.from_string(this._password), ...passwordSalt]),
+ genericHashKey
+ )
+
+ const passwordHash = sodium.crypto_pwhash(
+ sodium.crypto_box_SEEDBYTES,
+ genericHash,
+ passwordHashSalt,
+ sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE,
+ sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE,
+ sodium.crypto_pwhash_ALG_DEFAULT
+ )
+
+ return sodium.to_hex(passwordHash)
+ }
+
+ create() {
+ this._validatePasswordLength()
+
+ const passwordSalt = sodium.randombytes_buf(256)
+ const genericHashKey = sodium.randombytes_buf(sodium.crypto_generichash_KEYBYTES_MAX)
+ const genericHash = sodium.crypto_generichash(
+ sodium.crypto_generichash_BYTES_MAX,
+ new Uint8Array([...sodium.from_string(this._password), ...passwordSalt]),
+ genericHashKey
+ )
+
+ const passwordHashSalt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES)
+ const passwordHash = sodium.crypto_pwhash(
+ sodium.crypto_box_SEEDBYTES,
+ genericHash,
+ passwordHashSalt,
+ sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE,
+ sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE,
+ sodium.crypto_pwhash_ALG_DEFAULT
+ )
+
+ return {
+ salts: [
+ sodium.to_hex(passwordSalt),
+ sodium.to_hex(genericHashKey),
+ sodium.to_hex(passwordHashSalt),
+ ],
+ secret: sodium.to_hex(passwordHash),
+ }
+ }
+}
diff --git a/src/settings-user-security.js b/src/settings-user-security.js
index 809e9cdac4227a5ba864a182119a7f19ac77e398..3160d192fd8f70c7b3b2a7f6d9556cebea5e8a1f 100644
--- a/src/settings-user-security.js
+++ b/src/settings-user-security.js
@@ -1,6 +1,9 @@
(function() {
const OriginalXhr = window.XMLHttpRequest
+ /**
+ *
+ */
function PatchedXhr() {
const xhr = new OriginalXhr()
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index 15fad12dc264593fc503bcde6257abf7a8035907..51db07a1ff7b94ea8ae7a46055d5ae066ec1bde3 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -1,7 +1,9 @@
@@ -158,7 +167,8 @@
+ class="checkbox action-checkbox__checkbox focusable"
+ :disabled="disabled">
@@ -169,7 +179,7 @@
-
@@ -144,7 +152,8 @@
+ class="checkbox action-checkbox__checkbox focusable"
+ :disabled="disabled">