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>
104 lines
3.4 KiB
TypeScript
104 lines
3.4 KiB
TypeScript
import type { Server } from 'http';
|
|
import fetch from 'cross-fetch';
|
|
import WebSocket from 'ws';
|
|
import type { HttpServerFactory } from '../../src/server/HttpServerFactory';
|
|
import { getPort } from '../util/Util';
|
|
import { instantiateFromConfig } from './Config';
|
|
|
|
const port = getPort('WebSocketsProtocol');
|
|
const serverUrl = `http://localhost:${port}/`;
|
|
const headers = { forwarded: 'host=example.pod;proto=https' };
|
|
|
|
describe('A server with the Solid WebSockets API behind a proxy', (): void => {
|
|
let server: Server;
|
|
|
|
beforeAll(async(): Promise<void> => {
|
|
const factory = await instantiateFromConfig(
|
|
'urn:solid-server:default:ServerFactory', 'server-without-auth.json', {
|
|
'urn:solid-server:default:variable:port': port,
|
|
'urn:solid-server:default:variable:baseUrl': 'https://example.pod/',
|
|
},
|
|
) as HttpServerFactory;
|
|
server = factory.startServer(port);
|
|
});
|
|
|
|
afterAll(async(): Promise<void> => {
|
|
await new Promise<void>((resolve, reject): void => {
|
|
server.close((error): void => error ? reject(error) : resolve());
|
|
});
|
|
});
|
|
|
|
it('returns a 404 if no data was initialized.', async(): Promise<void> => {
|
|
const response = await fetch(serverUrl, { headers });
|
|
expect(response.status).toBe(404);
|
|
});
|
|
|
|
it('sets the Updates-Via header.', async(): Promise<void> => {
|
|
const response = await fetch(serverUrl, { headers });
|
|
expect(response.headers.get('Updates-Via')).toBe('wss://example.pod/');
|
|
});
|
|
|
|
it('exposes the Updates-Via header via CORS.', async(): Promise<void> => {
|
|
const response = await fetch(serverUrl, { headers });
|
|
expect(response.headers.get('Access-Control-Expose-Headers')!.split(','))
|
|
.toContain('Updates-Via');
|
|
});
|
|
|
|
describe('when a WebSocket client connects', (): void => {
|
|
let client: WebSocket;
|
|
const messages = new Array<string>();
|
|
|
|
beforeAll(async(): Promise<void> => {
|
|
client = new WebSocket(`ws://localhost:${port}`, [ 'solid-0.1' ], { headers });
|
|
client.on('message', (message: string): any => messages.push(message));
|
|
await new Promise((resolve): any => client.on('open', resolve));
|
|
});
|
|
|
|
afterAll((): void => {
|
|
client.close();
|
|
});
|
|
|
|
afterEach((): void => {
|
|
messages.length = 0;
|
|
});
|
|
|
|
it('sends the protocol version.', (): void => {
|
|
expect(messages).toEqual([
|
|
'protocol solid-0.1',
|
|
]);
|
|
});
|
|
|
|
describe('when the client subscribes to resources', (): void => {
|
|
beforeAll(async(): Promise<void> => {
|
|
client.send('sub https://example.pod/my-resource');
|
|
client.send('sub https://example.pod/other-resource');
|
|
client.send('sub https://example.pod/');
|
|
await new Promise((resolve): any => client.once('message', resolve));
|
|
});
|
|
|
|
it('acknowledges the subscription.', async(): Promise<void> => {
|
|
expect(messages).toEqual([
|
|
'ack https://example.pod/my-resource',
|
|
'ack https://example.pod/other-resource',
|
|
'ack https://example.pod/',
|
|
]);
|
|
});
|
|
|
|
it('notifies the client of resource updates.', async(): Promise<void> => {
|
|
await fetch(`${serverUrl}my-resource`, {
|
|
method: 'PUT',
|
|
headers: {
|
|
...headers,
|
|
'content-type': 'application/json',
|
|
},
|
|
body: '{}',
|
|
});
|
|
expect(messages).toEqual([
|
|
'pub https://example.pod/',
|
|
'pub https://example.pod/my-resource',
|
|
]);
|
|
});
|
|
});
|
|
});
|
|
});
|