mirror of
https://github.com/CommunitySolidServer/CommunitySolidServer.git
synced 2024-10-03 14:55:10 +00:00

* Add identity provider handler as a dependency * Temp Identity * Figured out how to get koa to work * Hooked up idp to networking * Feat/idp architecture refactor (#430) * Logs in with solid oidc * Refactored Provider * Attempt to hook up dependencies * Partial wiring of oidc provider components * IdP networking now works with architecture * Interaction Handlers Set Up * fix: Rename & adapt to CSS * Included Login Interaction * Refactored architecture to bind Interaction Policy to HttpHandlers Co-authored-by: Matthieu Bosquet <matthieubosquet@gmail.com> * fix: Rebase on master * fix: DI after rebase * Reimplemented Routing * Renamed modules and removed ProviderFactory (#450) * refactor: Solid IdP DI * refactor: IdP interaction handler DI * refactor: IdP interaction waterfall * refactor: Remove unnecessary legacy URL parse * fix: Add legacy parse back in * feat: adapter & fix: handlers * Removed adapter factory * fix: refactor IdP * fix: refactor IdP * fix: refactor IdP * feat: Add IdP to file storage config * fix: Unintended commit * fix: Components ignore * feat: Basic resource store adapter * Partially complete idp routing * Set up initial routing injection graph * Clean up ResourceStorageAdapter * Refactored configuration architecture * Hooked up Login UIs (#518) * feat: Use template path & run fileserver * feat: Use util function to read resource * Fixed DI JSON-LD context * fixed rendering * WebId validator * Set up persistent storage for loing and register * Fixed ejs template routing * Refactored StorageAdapters * NSS login successful * Forgot password infrastructure * Can send email (#557) * Can send email * fix: IdP crashes if interaction ID doesn't exist (#587) * feat: Require an issuer registration token * fix: Issuer registration token typo in error * fix: Remove dummy IdP storage adapter * fix: Remove unused library lodash * fix: Remove unused library lru-cache * Production ready keystore * Ruben comments before clownface removal * Removed clownface * Change key value store * Completed Ruben's comments * Added comments to each class * Fixed errors on login * Ruben feedback * Refactored out getPostRenderHandler * Identity provider tests (#622) * corrected tests lacking <void> on promises * Added files for all idp tests * Added unfinished tests for all added files * ErrorHandlingWaterfallHandler * RenderEjsHandler and RouterHandler tests * GetPostRouterHandler and BasicOnErrorHandler tests * Corrected tests for updates to Idp * fix: missing export * fix: audience claim * Client Id Support (#630) * Added client_id for the auth challenge * Update src/identity/storage/ClientWebIdFetchingStorageAdapterFactory.ts Co-authored-by: Matthieu Bosquet <matthieubosquet@gmail.com> Co-authored-by: Matthieu Bosquet <matthieubosquet@gmail.com> * fix: Rebase fixes * Several minor Idp changes/refactors (#656) * fix: Minor changes * refactor: Split EmailPasswordInteractionPolicy * refactor: Remove ErrorHandlingWaterfallHandler * refactor: Clean up dependencies * fix: Add dummy IdentityProviderHandler to fix integration tests * Replace KeyValueStore with KeyValueStorage (#663) * feat: Create WrappedExpiringStorage * refactor: Update ResourceStoreEmailPasswordStore to use KeyValueStorage * refactor: Update KeyGeneratingIdpConfigurationGenerator to use KeyValueStorage * refactor: Update ResourceStoreStorageAdapterFactory to use ExpiringStorage * refactor: Removed KeyValueStore * refactor: Simplify EmailPassword handlers (#664) * refactor: Order index.ts * test: Add EmailPasswordForgotPasswordHandler unit tests * test: Add EmailPasswordGetResetPasswordHandler unit tests * test: Add EmailPasswordLoginHandler unit tests * test: Add EmailPasswordRegistrationHandler unit tests * test: Add EmailPasswordResetPasswordHandler unit tests * test: Remove unnecessary test file * feat: Basic instructions for using the IdP * fix: IdP instructions and add example WebID * fix: IdP registration copy * fix: IdP instruction editorial * Update README.md Co-authored-by: Joachim Van Herwegen <joachimvh@gmail.com> * Update README.md Co-authored-by: Joachim Van Herwegen <joachimvh@gmail.com> * test: Add KeyGeneratingIdpConfigurationGenerator unit tests * test: Add KeyValueEmailPasswordStore unit tests * test: Create IdP integration test * test: Add EmailPasswordInteractionPolicy unit tests * test: Add BasicIssuerReferenceWebIdOwnershipValidator unit tests * test: Add ChooseInitialInteractionHandler unit tests Also fixes the config warning. * test: Add EjsTemplateRenderer unit tests * test: Add EmailSender unit tests * test: Add FormDataUtil unit tests * test: Add IdpRouteController unit tests * test: Add OidcInteractionCompleter unit tests * refactor: Simplify ClientWebIdFetchingStorageAdapterFactory * test: Add ClientWebIdFetchingStorageAdapterFactory unit tests * refactor: Fix ejs html warnings * test: Add step to test logging in again Included are updates to handle cookies more correctly. * feat: Add IdpConfirmHttpHandler This way there's a handler for the confirm page. * test: Add ExpiringStorageAdapterFactory unit tests * test: Add IdentityProviderFactory unit tests * test: Add IdentityProviderHttpHandler unit tests * refactor: Minor refactors * refactor: Use jose instead of node-jose * refactor: Use jose instead of node-jose Reduces the number of dependencies since other libraries also depend on jose. * Update src/identity/configuration/KeyGeneratingIdpConfigurationGenerator.ts Co-authored-by: Matthieu Bosquet <matthieubosquet@gmail.com> * refactor: Use interfaces instead of abstract classes * refactor: Make WebIdOwnershipValidator an AsyncHandler * refactor: Make TemplateRenderer an AsyncHandler * fix: Fix typing issue * fix: Convert JWK to plain object for node 15 * feat: Update CI configuration --ignore-scripts was removed because it also stopped dependency scripts, which was a requirement for bcrypt. 15.0 was removed since that version doesn't run the required scripts after install. 14.0 was removed since the somehow it caused the solid-authn client to do the wrong calls. * test: Run integration tests on Node 14.2 This is the lowest 14.x version where the IdP integration tests succeed. * feat: Use ErrorResponseWriter for handling oidc errors * test: Mock Date in OidcInteractionCompleter tests * fix: Correctly generate new identifiers Previously there could be double slashes if the base URL ended in slash. * fix: Correctly handle storagePathName in ExpiringStorageAdapterFactory * fix: Fix issue with new CliRunner test in rebase * fix: Handle unknown errors more consistently * feat: Make idp parameter dynamic * feat: Add more logging * refactor: Link css instead of injecting * fix: Fix redis integration tests with idp * refactor: Shorten idp class names * refactor: Remove e-mail configuration from default config * feat: Store JsonResourceStorage data in a single container * feat: Make sure expired data gets removed at some point * feat: Only accept strings as keys in KeyValueStorage * fix: Various minor fixes based on review Co-authored-by: Matthieu Bosquet <matthieubosquet@gmail.com> Co-authored-by: Joachim Van Herwegen <joachimvh@gmail.com>
209 lines
8.4 KiB
TypeScript
209 lines
8.4 KiB
TypeScript
import { EventEmitter } from 'events';
|
|
// eslint-disable-next-line import/default
|
|
import redis from 'redis';
|
|
import Redlock from 'redlock';
|
|
import type { Lock } from 'redlock';
|
|
import * as LogUtil from '../../../../src/logging/LogUtil';
|
|
import { InternalServerError } from '../../../../src/util/errors/InternalServerError';
|
|
import { RedisResourceLocker } from '../../../../src/util/locking/RedisResourceLocker';
|
|
|
|
const redlock: jest.Mocked<Redlock> = Object.assign(new EventEmitter(), {
|
|
lock: jest.fn().mockImplementation(async(resource: string, ttl: number): Promise<Lock> =>
|
|
({ resource, expiration: Date.now() + ttl } as Lock)),
|
|
unlock: jest.fn(),
|
|
extend: jest.fn().mockImplementation(
|
|
async(lock: Lock, ttl: number): Promise<Lock> => {
|
|
lock.expiration += ttl;
|
|
return lock;
|
|
},
|
|
),
|
|
quit: jest.fn(),
|
|
}) as any;
|
|
|
|
jest.mock('redlock', (): any => jest.fn().mockImplementation((): Redlock => redlock));
|
|
|
|
jest.useFakeTimers();
|
|
|
|
describe('A RedisResourceLocker', (): void => {
|
|
let locker: RedisResourceLocker;
|
|
const identifier = { path: 'http://test.com/foo' };
|
|
let createClient: jest.SpyInstance;
|
|
|
|
beforeEach(async(): Promise<void> => {
|
|
jest.clearAllMocks();
|
|
redlock.removeAllListeners();
|
|
|
|
createClient = jest.spyOn(redis, 'createClient').mockImplementation(jest.fn());
|
|
|
|
locker = new RedisResourceLocker([ '6379' ]);
|
|
});
|
|
|
|
afterEach(async(): Promise<void> => {
|
|
// In case some locks are not released by a test the timers will still be running
|
|
jest.clearAllTimers();
|
|
});
|
|
|
|
afterAll(async(): Promise<void> => {
|
|
jest.restoreAllMocks();
|
|
});
|
|
|
|
it('can lock and unlock a resource.', async(): Promise<void> => {
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
expect(redlock.lock).toHaveBeenCalledTimes(1);
|
|
expect(redlock.unlock).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('can lock a resource again after it was unlocked.', async(): Promise<void> => {
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
expect(redlock.lock).toHaveBeenCalledTimes(2);
|
|
expect(redlock.unlock).toHaveBeenCalledTimes(1);
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
});
|
|
|
|
it('errors when unlocking a resource that was not locked.', async(): Promise<void> => {
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
await expect(locker.release(identifier)).rejects.toThrow(InternalServerError);
|
|
expect(redlock.lock).toHaveBeenCalledTimes(1);
|
|
expect(redlock.unlock).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('errors when redlock.lock throws an error.', async(): Promise<void> => {
|
|
redlock.lock.mockRejectedValueOnce(new Error('random Error'));
|
|
const prom = locker.acquire(identifier);
|
|
await expect(prom).rejects.toThrow(InternalServerError);
|
|
await expect(prom).rejects.toThrow('Unable to acquire lock for ');
|
|
await expect(prom).rejects.toThrow('Error: random Error');
|
|
expect(redlock.lock).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('errors if redlock.lock resolves but a lock is already stored.', async(): Promise<void> => {
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
// Works since redlock.lock is mocked to always succeed
|
|
const prom = locker.acquire(identifier);
|
|
await expect(prom).rejects.toThrow(InternalServerError);
|
|
await expect(prom).rejects.toThrow(`Acquired duplicate lock on ${identifier.path}`);
|
|
});
|
|
|
|
it('errors when redlock.unlock throws an error.', async(): Promise<void> => {
|
|
await locker.acquire(identifier);
|
|
redlock.unlock.mockRejectedValueOnce(new Error('random Error'));
|
|
const prom = locker.release(identifier);
|
|
await expect(prom).rejects.toThrow(InternalServerError);
|
|
await expect(prom).rejects.toThrow('Unable to release lock for: ');
|
|
await expect(prom).rejects.toThrow('Error: random Error');
|
|
expect(redlock.unlock).toHaveBeenCalledTimes(1);
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
});
|
|
|
|
it('does not extend when there are no locks to extend.', async(): Promise<void> => {
|
|
await locker.acquire(identifier);
|
|
await locker.release(identifier);
|
|
jest.advanceTimersByTime(20000);
|
|
expect(redlock.extend).toHaveBeenCalledTimes(0);
|
|
});
|
|
|
|
it('cleans up if lock extension failed.', async(): Promise<void> => {
|
|
// This should never happen though
|
|
redlock.extend.mockImplementationOnce((): any => {
|
|
throw new Error('random error');
|
|
});
|
|
await locker.acquire(identifier);
|
|
jest.advanceTimersByTime(20000);
|
|
expect(redlock.extend).toHaveBeenCalledTimes(1);
|
|
// Will throw since we removed the lock entry
|
|
await expect(locker.release(identifier)).rejects.toThrow(InternalServerError);
|
|
});
|
|
|
|
it('can acquire different keys simultaneously.', async(): Promise<void> => {
|
|
const lock1 = locker.acquire({ path: 'path1' });
|
|
const lock2 = locker.acquire({ path: 'path2' });
|
|
const lock3 = locker.acquire({ path: 'path3' });
|
|
|
|
await expect(Promise.all([ lock1, lock2, lock3 ])).resolves.toBeDefined();
|
|
|
|
await locker.release({ path: 'path1' });
|
|
await locker.release({ path: 'path2' });
|
|
await locker.release({ path: 'path3' });
|
|
});
|
|
|
|
it('extends a lock indefinitely.', async(): Promise<void> => {
|
|
await locker.acquire(identifier);
|
|
jest.advanceTimersByTime(20000);
|
|
await expect(locker.release(identifier)).resolves.toBeUndefined();
|
|
});
|
|
|
|
it('uses users redlockOptions if passed to constructor.', async(): Promise<void> => {
|
|
// Reset calls done in `beforeEach`
|
|
jest.clearAllMocks();
|
|
const clients = [ '6379' ];
|
|
const options = {
|
|
driftFactor: 0.2,
|
|
retryCount: 20,
|
|
retryDelay: 2000,
|
|
retryJitter: 2000,
|
|
};
|
|
locker = new RedisResourceLocker(clients, options);
|
|
expect(Redlock).toHaveBeenCalledTimes(1);
|
|
expect(Redlock).toHaveBeenLastCalledWith(expect.any(Array), options);
|
|
});
|
|
|
|
it('errors on creation when no redis servers are passed to the constructor.', async(): Promise<void> => {
|
|
expect((): any => new RedisResourceLocker([])).toThrow('At least 1 client should be provided');
|
|
});
|
|
|
|
it('errors if there is an issue creating the Redlock.', async(): Promise<void> => {
|
|
(Redlock as unknown as jest.Mock).mockImplementationOnce((): never => {
|
|
throw new Error('redlock error!');
|
|
});
|
|
expect((): any => new RedisResourceLocker([ '1234' ]))
|
|
.toThrow('Error initializing Redlock: Error: redlock error!');
|
|
});
|
|
|
|
it('logs redis client errors.', async(): Promise<void> => {
|
|
const logger = { error: jest.fn() };
|
|
const mock = jest.spyOn(LogUtil, 'getLoggerFor');
|
|
mock.mockReturnValueOnce(logger as any);
|
|
locker = new RedisResourceLocker([ '6379' ]);
|
|
expect(logger.error).toHaveBeenCalledTimes(0);
|
|
redlock.emit('clientError', 'problem!');
|
|
expect(logger.error).toHaveBeenCalledTimes(1);
|
|
expect(logger.error).toHaveBeenLastCalledWith('Redis/Redlock error: problem!');
|
|
});
|
|
|
|
describe('createRedisClients', (): void => {
|
|
it('should create and return the right amount of redisClients.', async(): Promise<void> => {
|
|
// Reset calls done in `beforeEach`
|
|
jest.clearAllMocks();
|
|
const clientStrings = [ '6379', '127.0.0.1:6378' ];
|
|
locker = new RedisResourceLocker(clientStrings);
|
|
expect(createClient).toHaveBeenCalledTimes(2);
|
|
expect(createClient).toHaveBeenCalledWith(6379, undefined);
|
|
expect(createClient).toHaveBeenCalledWith(6378, '127.0.0.1');
|
|
});
|
|
|
|
it('errors when invalid string is passed.', async(): Promise<void> => {
|
|
// Reset calls done in `beforeEach`
|
|
jest.clearAllMocks();
|
|
const clientStrings = [ 'noHostOrPort' ];
|
|
expect((): any => new RedisResourceLocker(clientStrings))
|
|
.toThrow('Invalid data provided to create a Redis client: noHostOrPort');
|
|
expect(createClient).toHaveBeenCalledTimes(0);
|
|
});
|
|
});
|
|
|
|
describe('finalize()', (): void => {
|
|
it('should clear all locks and intervals when finalize() is called.', async(): Promise<void> => {
|
|
await locker.acquire(identifier);
|
|
await locker.finalize();
|
|
expect(redlock.quit).toHaveBeenCalledTimes(1);
|
|
|
|
// This works since the Redlock is simply a mock and quit should have cleared the lockMap
|
|
await expect(locker.acquire(identifier)).resolves.toBeUndefined();
|
|
});
|
|
});
|
|
});
|