diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index db8169db1..626ff9705 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -55,89 +55,6 @@ const isLanguage = (language: string): boolean => { return LANGUAGES.includes(language) } -const PHRASE_WORD_COUNT = 24 -const WORDS = fs - .readFileSync('src/config/mnemonic.uncompressed_buffer13116.txt') - .toString() - .split(',') -const PassphraseGenerate = (): string[] => { - logger.trace('PassphraseGenerate...') - const result = [] - for (let i = 0; i < PHRASE_WORD_COUNT; i++) { - result.push(WORDS[sodium.randombytes_random() % 2048]) - } - return result -} - -const KeyPairEd25519Create = (passphrase: string[]): Buffer[] => { - logger.trace('KeyPairEd25519Create...') - if (!passphrase.length || passphrase.length < PHRASE_WORD_COUNT) { - logger.error('passphrase empty or to short') - throw new Error('passphrase empty or to short') - } - - const state = Buffer.alloc(sodium.crypto_hash_sha512_STATEBYTES) - sodium.crypto_hash_sha512_init(state) - - // To prevent breaking existing passphrase-hash combinations word indices will be put into 64 Bit Variable to mimic first implementation of algorithms - for (let i = 0; i < PHRASE_WORD_COUNT; i++) { - const value = Buffer.alloc(8) - const wordIndex = WORDS.indexOf(passphrase[i]) - value.writeBigInt64LE(BigInt(wordIndex)) - sodium.crypto_hash_sha512_update(state, value) - } - // trailing space is part of the login_server implementation - const clearPassphrase = passphrase.join(' ') + ' ' - sodium.crypto_hash_sha512_update(state, Buffer.from(clearPassphrase)) - const outputHashBuffer = Buffer.alloc(sodium.crypto_hash_sha512_BYTES) - sodium.crypto_hash_sha512_final(state, outputHashBuffer) - - const pubKey = Buffer.alloc(sodium.crypto_sign_PUBLICKEYBYTES) - const privKey = Buffer.alloc(sodium.crypto_sign_SECRETKEYBYTES) - - sodium.crypto_sign_seed_keypair( - pubKey, - privKey, - outputHashBuffer.slice(0, sodium.crypto_sign_SEEDBYTES), - ) - logger.debug(`KeyPair creation ready. pubKey=${pubKey}`) - - return [pubKey, privKey] -} - -/* -const getEmailHash = (email: string): Buffer => { - logger.trace('getEmailHash...') - const emailHash = Buffer.alloc(sodium.crypto_generichash_BYTES) - sodium.crypto_generichash(emailHash, Buffer.from(email)) - logger.debug(`getEmailHash...successful: ${emailHash}`) - return emailHash -} -*/ - -const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): Buffer => { - logger.trace('SecretKeyCryptographyEncrypt...') - const encrypted = Buffer.alloc(message.length + sodium.crypto_secretbox_MACBYTES) - const nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES) - nonce.fill(31) // static nonce - - sodium.crypto_secretbox_easy(encrypted, message, nonce, encryptionKey) - logger.debug(`SecretKeyCryptographyEncrypt...successful: ${encrypted}`) - return encrypted -} - -const SecretKeyCryptographyDecrypt = (encryptedMessage: Buffer, encryptionKey: Buffer): Buffer => { - logger.trace('SecretKeyCryptographyDecrypt...') - const message = Buffer.alloc(encryptedMessage.length - sodium.crypto_secretbox_MACBYTES) - const nonce = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES) - nonce.fill(31) // static nonce - - sodium.crypto_secretbox_open_easy(message, encryptedMessage, nonce, encryptionKey) - - logger.debug(`SecretKeyCryptographyDecrypt...successful: ${message}`) - return message -} - const newEmailContact = (email: string, userId: number): DbUserContact => { logger.trace(`newEmailContact...`) const emailContact = new DbUserContact() @@ -265,7 +182,6 @@ export class UserResolver { const clientTimezoneOffset = getClientTimezoneOffset(context) const userEntity = getUser(context) const user = new User(userEntity, await getUserCreation(userEntity.id, clientTimezoneOffset)) - // user.pubkey = userEntity.pubKey.toString('hex') // Elopage Status & Stored PublisherId user.hasElopage = await this.hasElopage(context) @@ -420,11 +336,6 @@ export class UserResolver { } } - const passphrase = PassphraseGenerate() - // const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key - // const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash - // const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1]) - // const emailHash = getEmailHash(email) const gradidoID = await newGradidoID() const eventRegister = new EventRegister() @@ -458,12 +369,6 @@ export class UserResolver { } } } - // TODO this field has no null allowed unlike the loginServer table - // dbUser.pubKey = Buffer.from(randomBytes(32)) // Buffer.alloc(32, 0) default to 0000... - // dbUser.pubkey = keyPair[0] - // loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash - // loginUser.pubKey = keyPair[0] - // loginUser.privKey = encryptedPrivkey const queryRunner = getConnection().createQueryRunner() await queryRunner.connect()