mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-26 11:43:59 -05:00
fix(auth): use sha-512 for auth tokens
Bcrypt hashes are too slow to be validated on every request. As our tokens are random and have a fixed length, it is reasonable to use SHA-512 instead. SHA-512 is recommended as cryptographically strong by the BSI: https://www.bsi.bund.de/SharedDocs/Downloads/EN/BSI/Publications/TechGuidelines/TG02102/BSI-TR-02102-1.pdf?__blob=publicationFile Fixes https://github.com/hedgedoc/hedgedoc/issues/1881 Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
parent
b3688e6486
commit
3e074d1879
3 changed files with 37 additions and 23 deletions
|
@ -7,6 +7,7 @@ import { ConfigModule } from '@nestjs/config';
|
||||||
import { PassportModule } from '@nestjs/passport';
|
import { PassportModule } from '@nestjs/passport';
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
|
import crypto from 'crypto';
|
||||||
import { Repository } from 'typeorm';
|
import { Repository } from 'typeorm';
|
||||||
|
|
||||||
import appConfigMock from '../config/mock/app.config.mock';
|
import appConfigMock from '../config/mock/app.config.mock';
|
||||||
|
@ -86,7 +87,10 @@ describe('AuthService', () => {
|
||||||
describe('getAuthToken', () => {
|
describe('getAuthToken', () => {
|
||||||
const token = 'testToken';
|
const token = 'testToken';
|
||||||
it('works', async () => {
|
it('works', async () => {
|
||||||
const accessTokenHash = await hashPassword(token);
|
const accessTokenHash = crypto
|
||||||
|
.createHash('sha512')
|
||||||
|
.update(token)
|
||||||
|
.digest('hex');
|
||||||
jest.spyOn(authTokenRepo, 'findOne').mockResolvedValueOnce({
|
jest.spyOn(authTokenRepo, 'findOne').mockResolvedValueOnce({
|
||||||
...authToken,
|
...authToken,
|
||||||
user: user,
|
user: user,
|
||||||
|
@ -162,8 +166,12 @@ describe('AuthService', () => {
|
||||||
|
|
||||||
describe('validateToken', () => {
|
describe('validateToken', () => {
|
||||||
it('works', async () => {
|
it('works', async () => {
|
||||||
const token = 'testToken';
|
const testSecret =
|
||||||
const accessTokenHash = await hashPassword(token);
|
'gNrv_NJ4FHZ0UFZJQu_q_3i3-GP_d6tELVtkYiMFLkLWNl_dxEmPVAsCNKxP3N3DB9aGBVFYE1iptvw7hFMJvA';
|
||||||
|
const accessTokenHash = crypto
|
||||||
|
.createHash('sha512')
|
||||||
|
.update(testSecret)
|
||||||
|
.digest('hex');
|
||||||
jest.spyOn(userRepo, 'findOne').mockResolvedValueOnce({
|
jest.spyOn(userRepo, 'findOne').mockResolvedValueOnce({
|
||||||
...user,
|
...user,
|
||||||
authTokens: [authToken],
|
authTokens: [authToken],
|
||||||
|
@ -179,7 +187,7 @@ describe('AuthService', () => {
|
||||||
return authToken;
|
return authToken;
|
||||||
});
|
});
|
||||||
const userByToken = await service.validateToken(
|
const userByToken = await service.validateToken(
|
||||||
`${authToken.keyId}.${token}`,
|
`${authToken.keyId}.${testSecret}`,
|
||||||
);
|
);
|
||||||
expect(userByToken).toEqual({
|
expect(userByToken).toEqual({
|
||||||
...user,
|
...user,
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { Cron, Timeout } from '@nestjs/schedule';
|
import { Cron, Timeout } from '@nestjs/schedule';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { randomBytes } from 'crypto';
|
import crypto, { randomBytes } from 'crypto';
|
||||||
import { Repository } from 'typeorm';
|
import { Repository } from 'typeorm';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
@ -17,11 +17,7 @@ import {
|
||||||
import { ConsoleLoggerService } from '../logger/console-logger.service';
|
import { ConsoleLoggerService } from '../logger/console-logger.service';
|
||||||
import { User } from '../users/user.entity';
|
import { User } from '../users/user.entity';
|
||||||
import { UsersService } from '../users/users.service';
|
import { UsersService } from '../users/users.service';
|
||||||
import {
|
import { bufferToBase64Url } from '../utils/password';
|
||||||
bufferToBase64Url,
|
|
||||||
checkPassword,
|
|
||||||
hashPassword,
|
|
||||||
} from '../utils/password';
|
|
||||||
import { TimestampMillis } from '../utils/timestamp';
|
import { TimestampMillis } from '../utils/timestamp';
|
||||||
import { AuthTokenWithSecretDto } from './auth-token-with-secret.dto';
|
import { AuthTokenWithSecretDto } from './auth-token-with-secret.dto';
|
||||||
import { AuthTokenDto } from './auth-token.dto';
|
import { AuthTokenDto } from './auth-token.dto';
|
||||||
|
@ -43,13 +39,10 @@ export class AuthService {
|
||||||
if (!secret) {
|
if (!secret) {
|
||||||
throw new TokenNotValidError('Invalid AuthToken format');
|
throw new TokenNotValidError('Invalid AuthToken format');
|
||||||
}
|
}
|
||||||
if (secret.length > 72) {
|
if (secret.length != 86) {
|
||||||
// Only the first 72 characters of the tokens are considered by bcrypt
|
// We always expect 86 characters, as the secret is generated with 64 bytes
|
||||||
// This should prevent strange corner cases
|
// and then converted to a base64url string
|
||||||
// At the very least it won't hurt us
|
throw new TokenNotValidError(`AuthToken '${token}' has incorrect length`);
|
||||||
throw new TokenNotValidError(
|
|
||||||
`AuthToken '${secret}' is too long the be a proper token`,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
const accessToken = await this.getAuthTokenAndValidate(keyId, secret);
|
const accessToken = await this.getAuthTokenAndValidate(keyId, secret);
|
||||||
await this.setLastUsedToken(keyId);
|
await this.setLastUsedToken(keyId);
|
||||||
|
@ -70,9 +63,12 @@ export class AuthService {
|
||||||
`User '${user.username}' has already 200 tokens and can't have anymore`,
|
`User '${user.username}' has already 200 tokens and can't have anymore`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
const secret = bufferToBase64Url(randomBytes(54));
|
const secret = bufferToBase64Url(randomBytes(64));
|
||||||
const keyId = bufferToBase64Url(randomBytes(8));
|
const keyId = bufferToBase64Url(randomBytes(8));
|
||||||
const accessToken = await hashPassword(secret);
|
const accessTokenHash = crypto
|
||||||
|
.createHash('sha512')
|
||||||
|
.update(secret)
|
||||||
|
.digest('hex');
|
||||||
let token;
|
let token;
|
||||||
// Tokens can only be valid for a maximum of 2 years
|
// Tokens can only be valid for a maximum of 2 years
|
||||||
const maximumTokenValidity =
|
const maximumTokenValidity =
|
||||||
|
@ -82,7 +78,7 @@ export class AuthService {
|
||||||
keyId,
|
keyId,
|
||||||
user,
|
user,
|
||||||
identifier,
|
identifier,
|
||||||
accessToken,
|
accessTokenHash,
|
||||||
new Date(maximumTokenValidity),
|
new Date(maximumTokenValidity),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
@ -90,7 +86,7 @@ export class AuthService {
|
||||||
keyId,
|
keyId,
|
||||||
user,
|
user,
|
||||||
identifier,
|
identifier,
|
||||||
accessToken,
|
accessTokenHash,
|
||||||
new Date(validUntil),
|
new Date(validUntil),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -122,7 +118,17 @@ export class AuthService {
|
||||||
if (accessToken === undefined) {
|
if (accessToken === undefined) {
|
||||||
throw new NotInDBError(`AuthToken '${token}' not found`);
|
throw new NotInDBError(`AuthToken '${token}' not found`);
|
||||||
}
|
}
|
||||||
if (!(await checkPassword(token, accessToken.accessTokenHash))) {
|
// Hash the user-provided token
|
||||||
|
const userHash = Buffer.from(
|
||||||
|
crypto.createHash('sha512').update(token).digest('hex'),
|
||||||
|
);
|
||||||
|
const dbHash = Buffer.from(accessToken.accessTokenHash);
|
||||||
|
if (
|
||||||
|
// Normally, both hashes have the same length, as they are both SHA512
|
||||||
|
// This is only defense-in-depth, as timingSafeEqual throws if the buffers are not of the same length
|
||||||
|
userHash.length !== dbHash.length ||
|
||||||
|
!crypto.timingSafeEqual(userHash, dbHash)
|
||||||
|
) {
|
||||||
// hashes are not the same
|
// hashes are not the same
|
||||||
throw new TokenNotValidError(`AuthToken '${token}' is not valid.`);
|
throw new TokenNotValidError(`AuthToken '${token}' is not valid.`);
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ describe('Tokens', () => {
|
||||||
expect(response.body.label).toBe(tokenName);
|
expect(response.body.label).toBe(tokenName);
|
||||||
expect(response.body.validUntil).toBe(null);
|
expect(response.body.validUntil).toBe(null);
|
||||||
expect(response.body.lastUsed).toBe(null);
|
expect(response.body.lastUsed).toBe(null);
|
||||||
expect(response.body.secret.length).toBe(84);
|
expect(response.body.secret.length).toBe(98);
|
||||||
});
|
});
|
||||||
|
|
||||||
it(`GET /tokens`, async () => {
|
it(`GET /tokens`, async () => {
|
||||||
|
|
Loading…
Reference in a new issue