pi-roundtable-web 0.25.0 → 0.26.0

package/src/auth/oidc-pages.ts

@@ -0,0 +1,60 @@
+import { type ConsolePresentation, message } from "../features.ts";
+import { escapeHtml } from "../http.ts";
+import { LOGIN_CSP } from "./login-page.ts";
+
+/** What a page of the sign-in flow tells, and the link it offers. */
+type Notice = "signed-out" | "failed" | "not-allowed";
+
+/**
+ * The static pages of the sign-in flow: logged out, a sign-in that did not complete, and a person
+ * the app does not admit. They carry no script and no detail of why: the reason goes to the log.
+ */
+export function oidcPage(
+	notice: Notice,
+	mount: string,
+	title: string,
+	presentation: ConsolePresentation | undefined,
+	status: number,
+): Response {
+	const say = (source: string) => escapeHtml(message(presentation, source));
+	const text =
+		notice === "signed-out"
+			? say("You are signed out.")
+			: notice === "not-allowed"
+				? say("This account is not allowed to use this app.")
+				: say("Sign-in did not complete.");
+	const link = notice === "signed-out" ? say("Sign in") : say("Try again");
+	const html = `<!doctype html>
+<html lang="${escapeHtml(presentation?.locale ?? "en")}">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="robots" content="noindex">
+<title>${escapeHtml(title)}</title>
+<style>
+body{font:16px/1.5 system-ui,sans-serif;margin:0;min-height:100vh;display:grid;place-items:center;background:#f6f6f4;color:#1c1c1a}
+@media(prefers-color-scheme:dark){body{background:#151514;color:#ecece8}}
+main{width:min(22rem,calc(100vw - 2rem));display:grid;gap:1rem}
+h1{font-size:1.25rem;margin:0}
+p{margin:0}
+a{font:inherit;padding:.6rem .75rem;border-radius:.5rem;background:#2d5be3;color:#fff;text-decoration:none;text-align:center}
+</style>
+</head>
+<body>
+<main>
+<h1>${escapeHtml(title)}</h1>
+<p role="${notice === "signed-out" ? "status" : "alert"}">${text}</p>
+<a href="${escapeHtml(mount)}/login">${link}</a>
+</main>
+</body>
+</html>
+`;
+	return new Response(html, {
+		status,
+		headers: {
+			"content-type": "text/html;charset=utf-8",
+			"cache-control": "no-store",
+			"content-security-policy": LOGIN_CSP,
+		},
+	});
+}

package/src/auth/oidc.ts

@@ -0,0 +1,611 @@
+import {
+	createHash,
+	createHmac,
+	randomBytes,
+	timingSafeEqual,
+} from "node:crypto";
+import { createRemoteJWKSet, type JWTVerifyGetKey, jwtVerify } from "jose";
+import type { ActorFacts, Logger } from "pi-roundtable";
+import { PluginError } from "pi-roundtable";
+import { oidcProvider } from "pi-roundtable/kit";
+import type { ConsolePresentation } from "../features.ts";
+import type { ResolvedOidc } from "../options.ts";
+import type { Identified } from "../visitors.ts";
+import type { Credential, Unauthenticated } from "./authenticator.ts";
+import { allowedNext, routeOfNext } from "./next.ts";
+import { oidcPage } from "./oidc-pages.ts";
+import type { SessionActor, WebSessions } from "./sessions.ts";
+
+/** How long a sign-in may take between the redirect to the provider and its callback. */
+const PENDING_MS = 600_000;
+/** How long the provider's answers may take. */
+const PROVIDER_TIMEOUT_MS = 10_000;
+/** The most roles one sign-in carries, and the longest role name. */
+const MAX_ROLES = 50;
+const MAX_ROLE_CHARS = 100;
+const MAX_NAME_CHARS = 100;
+const MAX_SUBJECT_CHARS = 256;
+/** The most characters of one stored claim, as JSON. */
+const MAX_CLAIM_CHARS = 2000;
+/** Answers to a silent request that mean "the person must be asked", not "something is wrong". */
+const INTERACTION_NEEDED = new Set([
+	"login_required",
+	"interaction_required",
+	"account_selection_required",
+	"consent_required",
+]);
+
+/** The provider's endpoints, from its discovery document. */
+export interface ProviderMetadata {
+	authorizationEndpoint: string;
+	tokenEndpoint: string;
+	jwksUri: string;
+	/** Where logout can also sign out at the provider; absent when it offers none. */
+	endSessionEndpoint?: string;
+}
+
+/** A URL the provider's discovery document named, already checked; throws if it somehow is none. */
+function urlOf(value: string): URL {
+	const url = URL.parse(value);
+	if (!url)
+		throw new PluginError("pi-roundtable-web: an oidc endpoint is no URL");
+	return url;
+}
+
+const endpoint = (value: unknown): string | undefined => {
+	const url = typeof value === "string" ? URL.parse(value) : null;
+	if (!url) return undefined;
+	const loopback =
+		url.protocol === "http:" &&
+		["127.0.0.1", "[::1]", "localhost"].includes(url.hostname);
+	return url.protocol === "https:" || loopback ? url.href : undefined;
+};
+
+/**
+ * Reads the provider's discovery document and checks it names this issuer. Throws a PluginError
+ * naming what is wrong, so a host with a wrong issuer or an unreachable provider stops at start.
+ */
+export async function discoverProvider(
+	settings: Pick<ResolvedOidc, "issuer" | "discoveryUrl">,
+	fetcher: typeof fetch = fetch,
+): Promise<ProviderMetadata> {
+	const fail = (what: string): never => {
+		throw new PluginError(
+			`pi-roundtable-web: the oidc discovery document at ${settings.discoveryUrl} ${what}`,
+		);
+	};
+	let body: Record<string, unknown>;
+	try {
+		const response = await fetcher(settings.discoveryUrl, {
+			signal: AbortSignal.timeout(PROVIDER_TIMEOUT_MS),
+		});
+		if (!response.ok) return fail(`answered ${response.status}`);
+		body = (await response.json()) as Record<string, unknown>;
+	} catch (error) {
+		if (error instanceof PluginError) throw error;
+		return fail("could not be read");
+	}
+	if (body.issuer !== settings.issuer)
+		fail(
+			`names the issuer ${JSON.stringify(body.issuer)}, not ${JSON.stringify(settings.issuer)}`,
+		);
+	const authorizationEndpoint = endpoint(body.authorization_endpoint);
+	const tokenEndpoint = endpoint(body.token_endpoint);
+	const jwksUri = endpoint(body.jwks_uri);
+	if (!authorizationEndpoint || !tokenEndpoint || !jwksUri)
+		fail("lacks an https authorization_endpoint, token_endpoint or jwks_uri");
+	const end = endpoint(body.end_session_endpoint);
+	return {
+		authorizationEndpoint: authorizationEndpoint as string,
+		tokenEndpoint: tokenEndpoint as string,
+		jwksUri: jwksUri as string,
+		...(end ? { endSessionEndpoint: end } : {}),
+	};
+}
+
+/** What a sign-in did, for the event and the people-naming hooks; never carries a token or a claim. */
+export interface SignedIn {
+	principalId: string;
+	/** `<provider>:<subject>`. */
+	speakerId: string;
+	provider: string;
+	name: string;
+}
+
+export interface OidcLoginOptions {
+	settings: ResolvedOidc;
+	metadata: ProviderMetadata;
+	/** The client secret, when the client is confidential. */
+	clientSecret?: string;
+	sessions: WebSessions;
+	/** The session key, which signs the pending-login cookie. */
+	key: Buffer;
+	origin: string;
+	mount: string;
+	/** The app's surface, such as `app`: the prefix of the roles a sign-in carries. */
+	surface: string;
+	routing: "hash" | "path";
+	title: string;
+	presentation?: ConsolePresentation | undefined;
+	/** Who the actor is and the tier they hold; the same admission every request passes. */
+	identify(actor: ActorFacts): Promise<Identified>;
+	/** A sign-in completed: the host's event and name hooks. Never throws into the flow. */
+	onSignIn?(info: SignedIn): void | Promise<void>;
+	/** A session ended (logout), so the sockets on it can close. */
+	onEnded?(sessionId: string): void;
+	logger: Logger;
+	/** The provider's signing keys; the published ones by default. */
+	keys?: JWTVerifyGetKey;
+	fetch?: typeof fetch;
+	/** The clock, in milliseconds; default `Date.now`. */
+	now?: () => number;
+}
+
+interface Pending {
+	/** state */
+	s: string;
+	/** nonce */
+	n: string;
+	/** PKCE verifier */
+	v: string;
+	/** where to go afterwards */
+	x?: string;
+	/** the request was silent (`prompt=none`) */
+	i: boolean;
+	/** expires, ms */
+	e: number;
+}
+
+/** A request with no usable session, which signing in would fix. */
+const needsSignIn = (why: string): Unauthenticated => ({
+	refusal: why,
+	status: 401,
+	login: true,
+});
+
+const sha256 = (value: string | Buffer) =>
+	createHash("sha256").update(value).digest();
+
+const same = (a: Buffer, b: Buffer) =>
+	a.length === b.length && timingSafeEqual(a, b);
+
+const cookieValue = (
+	header: string | null,
+	name: string,
+): string | undefined => {
+	for (const part of (header ?? "").split(";")) {
+		const at = part.indexOf("=");
+		if (at > 0 && part.slice(0, at).trim() === name)
+			return part.slice(at + 1).trim();
+	}
+	return undefined;
+};
+
+/** A claim's text, or undefined when it is not a usable string. */
+const textClaim = (value: unknown, limit: number): string | undefined => {
+	const text =
+		typeof value === "number" && Number.isFinite(value) ? String(value) : value;
+	return typeof text === "string" && text.trim() && text.length <= limit
+		? text.trim()
+		: undefined;
+};
+
+/**
+ * Sign-in with an OpenID Connect provider, and the app's session behind it.
+ *
+ * `login` sends the person to the provider with a state, a nonce and a PKCE challenge, kept in a
+ * signed cookie that lives ten minutes and works once. `auth/callback` exchanges the code, checks
+ * the id_token once (signature, issuer, audience, expiry, nonce), asks the host's `check`, and has
+ * `IDENTITY` admit the person; only then is a session made, in `web_sessions`, and its random id
+ * set in a cookie. Every later request is judged by that session and a fresh read of the tier;
+ * the provider is not asked again unless `reauthHours` says so. Nothing here logs a token, a
+ * claim, a code or a session id.
+ */
+export class OidcLogin {
+	readonly #options: OidcLoginOptions;
+	readonly #keys: JWTVerifyGetKey;
+	/** The names of the cookies: `__Secure-` because the mount is never the root. */
+	readonly #sessionCookie = "__Secure-rt_session";
+	readonly #pendingCookie = "__Secure-rt_login";
+	readonly #outCookie = "__Secure-rt_out";
+	/** States already used, until they would have lapsed. */
+	readonly #spent = new Map<string, number>();
+
+	constructor(options: OidcLoginOptions) {
+		this.#options = options;
+		this.#keys =
+			options.keys ??
+			createRemoteJWKSet(urlOf(options.metadata.jwksUri), {
+				timeoutDuration: PROVIDER_TIMEOUT_MS,
+			});
+	}
+
+	#now(): number {
+		return (this.#options.now ?? Date.now)();
+	}
+
+	#sign(value: Pending): string {
+		const payload = Buffer.from(JSON.stringify(value)).toString("base64url");
+		const mac = createHmac("sha256", this.#options.key)
+			.update(payload)
+			.digest("base64url");
+		return `${payload}.${mac}`;
+	}
+
+	/** The pending sign-in the cookie holds, if it is ours, unaltered and not lapsed. */
+	#pending(request: Request): Pending | undefined {
+		const value = cookieValue(
+			request.headers.get("cookie"),
+			this.#pendingCookie,
+		);
+		const [payload, mac, extra] = (value ?? "").split(".");
+		if (!payload || !mac || extra !== undefined) return undefined;
+		const want = createHmac("sha256", this.#options.key)
+			.update(payload)
+			.digest();
+		if (!same(want, Buffer.from(mac, "base64url"))) return undefined;
+		try {
+			const pending = JSON.parse(
+				Buffer.from(payload, "base64url").toString("utf8"),
+			) as Pending;
+			return typeof pending.s === "string" &&
+				typeof pending.n === "string" &&
+				typeof pending.v === "string" &&
+				typeof pending.e === "number" &&
+				pending.e > this.#now()
+				? pending
+				: undefined;
+		} catch {
+			return undefined;
+		}
+	}
+
+	#cookie(
+		name: string,
+		value: string,
+		path: string,
+		maxAge: number,
+		lax = true,
+	): string {
+		return `${name}=${value}; Path=${path}; Max-Age=${maxAge}; HttpOnly; Secure; SameSite=${lax ? "Lax" : "Strict"}`;
+	}
+
+	/** Cookie lines that clear the pending-login cookie. */
+	#clearPending(): string {
+		return this.#cookie(
+			this.#pendingCookie,
+			"",
+			`${this.#options.mount}/auth/`,
+			0,
+		);
+	}
+
+	#redirect(to: string, cookies: string[]): Response {
+		const headers = new Headers({ location: to, "cache-control": "no-store" });
+		for (const cookie of cookies) headers.append("set-cookie", cookie);
+		return new Response(null, { status: 303, headers });
+	}
+
+	#page(
+		notice: "signed-out" | "failed" | "not-allowed",
+		status: number,
+		cookies: string[] = [],
+	): Response {
+		const { mount, title, presentation } = this.#options;
+		const response = oidcPage(notice, mount, title, presentation, status);
+		for (const cookie of cookies) response.headers.append("set-cookie", cookie);
+		return response;
+	}
+
+	/** The paths below the mount this flow answers without a session; undefined for any other. */
+	async open(request: Request, rest: string): Promise<Response | undefined> {
+		const read = request.method === "GET" || request.method === "HEAD";
+		switch (rest) {
+			case "login":
+				return read
+					? this.#login(request)
+					: new Response("Method not allowed", { status: 405 });
+			case "auth/callback":
+				return read
+					? this.#callback(request)
+					: new Response("Method not allowed", { status: 405 });
+			case "auth/signed-out":
+				return read
+					? this.#page("signed-out", 200)
+					: new Response("Method not allowed", { status: 405 });
+			case "auth/logout":
+				return request.method === "POST"
+					? this.#logout(request)
+					: new Response("Method not allowed", { status: 405 });
+			default:
+				return undefined;
+		}
+	}
+
+	// ── Sign-in ──
+
+	#login(request: Request): Response {
+		const next = allowedNext(
+			URL.parse(request.url)?.searchParams.get("next"),
+			this.#options.surface,
+		);
+		// A person who just logged out is asked, not signed in again silently by a provider session that is still alive.
+		const silent =
+			cookieValue(request.headers.get("cookie"), this.#outCookie) === undefined;
+		return this.#authorize(next, silent, []);
+	}
+
+	#authorize(
+		next: string | undefined,
+		silent: boolean,
+		cookies: string[],
+	): Response {
+		const { settings, metadata, origin, mount } = this.#options;
+		const pending: Pending = {
+			s: randomBytes(32).toString("base64url"),
+			n: randomBytes(32).toString("base64url"),
+			v: randomBytes(48).toString("base64url"),
+			...(next ? { x: next } : {}),
+			i: silent,
+			e: this.#now() + PENDING_MS,
+		};
+		const url = urlOf(metadata.authorizationEndpoint);
+		const params = url.searchParams;
+		params.set("response_type", "code");
+		params.set("client_id", settings.clientId);
+		params.set("redirect_uri", `${origin}${mount}/auth/callback`);
+		params.set("scope", settings.scopes.join(" "));
+		params.set("state", pending.s);
+		params.set("nonce", pending.n);
+		params.set("code_challenge", sha256(pending.v).toString("base64url"));
+		params.set("code_challenge_method", "S256");
+		if (silent) params.set("prompt", "none");
+		return this.#redirect(url.href, [
+			...cookies,
+			this.#cookie(
+				this.#pendingCookie,
+				this.#sign(pending),
+				`${mount}/auth/`,
+				PENDING_MS / 1000,
+			),
+		]);
+	}
+
+	async #callback(request: Request): Promise<Response> {
+		const { logger, mount } = this.#options;
+		const clear = [this.#clearPending()];
+		const params =
+			URL.parse(request.url)?.searchParams ?? new URLSearchParams();
+		const pending = this.#pending(request);
+		const fail = (
+			reason: string,
+			notice: "failed" | "not-allowed" = "failed",
+		) => {
+			logger.warn({ reason }, "web-console: a sign-in did not complete");
+			return this.#page(notice, notice === "failed" ? 400 : 403, clear);
+		};
+		if (!pending) return fail("no pending sign-in");
+		const spent = this.#spent;
+		for (const [state, until] of spent)
+			if (until <= this.#now()) spent.delete(state);
+		const state = params.get("state");
+		if (!state || !same(Buffer.from(state), Buffer.from(pending.s)))
+			return fail("state mismatch");
+		if (spent.has(state)) return fail("state used twice");
+		spent.set(state, pending.e);
+		const error = params.get("error");
+		if (error) {
+			// A silent request the provider cannot answer alone becomes a normal sign-in, once.
+			if (pending.i && INTERACTION_NEEDED.has(error))
+				return this.#authorize(pending.x, false, clear);
+			return fail("the provider refused the sign-in");
+		}
+		const code = params.get("code");
+		if (!code || code.length > 4096) return fail("no code");
+		let claims: Record<string, unknown>;
+		try {
+			claims = await this.#claims(code, pending);
+		} catch (cause) {
+			return fail(
+				cause instanceof Error ? cause.message : "token not accepted",
+			);
+		}
+		const { settings } = this.#options;
+		try {
+			if (settings.check && !settings.check(claims))
+				return fail("the host's check refused the token", "not-allowed");
+		} catch {
+			return fail("the host's check failed", "not-allowed");
+		}
+		const actor = this.#actorOf(claims);
+		if (!actor) return fail("the token names no usable subject");
+		let identified: Identified;
+		try {
+			identified = await this.#options.identify(actor);
+		} catch {
+			return fail("identity failed");
+		}
+		if ("refusal" in identified)
+			return fail("the access rules refuse this person", "not-allowed");
+		const { principal } = identified.visitor;
+		const kept: Record<string, unknown> = {};
+		for (const name of settings.storeClaims) {
+			const value = claims[name];
+			if (
+				value !== undefined &&
+				JSON.stringify(value).length <= MAX_CLAIM_CHARS
+			)
+				kept[name] = value;
+		}
+		const stored: SessionActor =
+			settings.storeClaims.length > 0 ? { ...actor, claims: kept } : actor;
+		const made = await this.#options.sessions.create(stored, principal.id);
+		// The sign-in replaces whatever session the browser held.
+		const old = cookieValue(request.headers.get("cookie"), this.#sessionCookie);
+		if (old) await this.#options.sessions.end(old).catch(() => undefined);
+		try {
+			await this.#options.onSignIn?.({
+				principalId: principal.id,
+				speakerId: identified.visitor.speakerId,
+				provider: actor.provider,
+				name: actor.name,
+			});
+		} catch (cause) {
+			logger.warn({ err: cause }, "web-console: a sign-in hook failed");
+		}
+		const days = this.#options.settings.sessionDays;
+		const next = pending.x ? routeOfNext(pending.x) : "";
+		const base = `${mount}/`;
+		return this.#redirect(
+			this.#options.routing === "path"
+				? `${base}${next}`
+				: next
+					? `${base}#/${next}`
+					: base,
+			[
+				...clear,
+				this.#cookie(this.#sessionCookie, made.token, base, days * 86400),
+				// A later logout leaves its marker; a sign-in clears it.
+				this.#cookie(this.#outCookie, "", base, 0),
+			],
+		);
+	}
+
+	/** Exchanges the code and checks the id_token; throws a short reason, never a token. */
+	async #claims(
+		code: string,
+		pending: Pending,
+	): Promise<Record<string, unknown>> {
+		const { settings, metadata, origin, mount, clientSecret } = this.#options;
+		const form = new URLSearchParams({
+			grant_type: "authorization_code",
+			code,
+			redirect_uri: `${origin}${mount}/auth/callback`,
+			client_id: settings.clientId,
+			code_verifier: pending.v,
+		});
+		if (clientSecret) form.set("client_secret", clientSecret);
+		let idToken: unknown;
+		try {
+			const response = await (this.#options.fetch ?? fetch)(
+				metadata.tokenEndpoint,
+				{
+					method: "POST",
+					headers: { "content-type": "application/x-www-form-urlencoded" },
+					body: form,
+					signal: AbortSignal.timeout(PROVIDER_TIMEOUT_MS),
+				},
+			);
+			if (!response.ok) throw new Error("the token endpoint refused the code");
+			idToken = ((await response.json()) as { id_token?: unknown }).id_token;
+		} catch (cause) {
+			throw cause instanceof Error &&
+				cause.message === "the token endpoint refused the code"
+				? cause
+				: new Error("the token endpoint could not be reached");
+		}
+		if (typeof idToken !== "string" || idToken.length > 16_384)
+			throw new Error("the token response has no id_token");
+		let payload: Record<string, unknown>;
+		try {
+			({ payload } = await jwtVerify(idToken, this.#keys, {
+				issuer: settings.issuer,
+				audience: settings.clientId,
+				algorithms: ["RS256", "ES256"],
+			}));
+		} catch {
+			throw new Error("the id_token was not accepted");
+		}
+		if (typeof payload.nonce !== "string" || payload.nonce !== pending.n)
+			throw new Error("the id_token's nonce does not match");
+		return payload;
+	}
+
+	/** The actor facts a verified token stands for, without the surface or `partial`: admission adds those. */
+	#actorOf(claims: Record<string, unknown>): SessionActor | undefined {
+		const { settings, surface } = this.#options;
+		const subject = textClaim(claims[settings.subjectClaim], MAX_SUBJECT_CHARS);
+		if (!subject) return undefined;
+		const name =
+			textClaim(
+				settings.nameClaim
+					? claims[settings.nameClaim]
+					: (claims.name ?? claims.preferred_username),
+				MAX_NAME_CHARS,
+			) ??
+			textClaim(claims.preferred_username, MAX_NAME_CHARS) ??
+			subject.slice(0, MAX_NAME_CHARS);
+		const given =
+			settings.rolesClaim === false ? undefined : claims[settings.rolesClaim];
+		const names = (
+			Array.isArray(given) ? given : given === undefined ? [] : [given]
+		)
+			.map((role) => textClaim(role, MAX_ROLE_CHARS))
+			.filter((role): role is string => role !== undefined)
+			.slice(0, MAX_ROLES);
+		return {
+			provider: oidcProvider(settings.issuer),
+			subject,
+			name,
+			...(names.length > 0
+				? {
+						roles: [...new Set(names)].map((role) => `${surface}:role:${role}`),
+					}
+				: {}),
+		};
+	}
+
+	// ── The session ──
+
+	/** The credential of a request: the session its cookie names, or why there is none. */
+	readonly credential: Credential = async (request) => {
+		const token = cookieValue(
+			request.headers.get("cookie"),
+			this.#sessionCookie,
+		);
+		if (!token) return needsSignIn("no session");
+		const session = await this.#options.sessions.touch(token);
+		if (!session) return needsSignIn("session ended");
+		const { reauthHours } = this.#options.settings;
+		if (
+			reauthHours !== undefined &&
+			this.#now() - session.verifiedAt.getTime() > reauthHours * 3_600_000
+		)
+			return needsSignIn("the provider is due to vouch again");
+		const { claims: _kept, ...facts } = session.actor;
+		return { admitted: true, actor: facts, session: session.id };
+	};
+
+	async #logout(request: Request): Promise<Response> {
+		const { mount, origin, settings, metadata } = this.#options;
+		if (request.headers.get("origin") !== origin)
+			return new Response("Forbidden", {
+				status: 403,
+				headers: { "cache-control": "no-store" },
+			});
+		const token = cookieValue(
+			request.headers.get("cookie"),
+			this.#sessionCookie,
+		);
+		if (token) {
+			const id = await this.#options.sessions.end(token).catch(() => undefined);
+			if (id) this.#options.onEnded?.(id);
+		}
+		const base = `${mount}/`;
+		let to = `${mount}/auth/signed-out`;
+		if (settings.endSession && metadata.endSessionEndpoint) {
+			const url = urlOf(metadata.endSessionEndpoint);
+			url.searchParams.set("client_id", settings.clientId);
+			url.searchParams.set(
+				"post_logout_redirect_uri",
+				`${origin}${mount}/auth/signed-out`,
+			);
+			to = url.href;
+		}
+		return this.#redirect(to, [
+			this.#cookie(this.#sessionCookie, "", base, 0),
+			// Marks the next sign-in as a deliberate one: no silent round trip until it completes.
+			this.#cookie(this.#outCookie, "1", base, 86400),
+		]);
+	}
+}