Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
69817ca
Typescriptify & use service worker for MSC3916 authentication
turt2live Apr 11, 2024
296c82c
appease the linter
turt2live Apr 11, 2024
8542ce2
appease jest
turt2live Apr 11, 2024
b333b29
appease linter
turt2live Apr 11, 2024
6cf7dca
Merge branch 'develop' into travis/msc3916
turt2live Apr 18, 2024
af1ba39
Get the access token directly
turt2live Apr 18, 2024
9494257
Add a bit of jitter
turt2live Apr 18, 2024
7d63b90
Merge remote-tracking branch 'origin/develop' into travis/msc3916
turt2live Apr 22, 2024
8067197
Improve legibility, use factored-out functions for pickling
turt2live Apr 22, 2024
ea7e8fb
Add docs
turt2live Apr 22, 2024
d0dcf89
Appease the linter
turt2live Apr 22, 2024
3fa2a42
Merge remote-tracking branch 'origin/develop' into travis/msc3916
turt2live Apr 23, 2024
80dd415
Document risks of postMessage
turt2live Apr 23, 2024
0395ee4
Split service worker post message handling out to function
turt2live Apr 23, 2024
2ad00c0
Move registration to async function
turt2live Apr 23, 2024
0951fe7
Use more early returns
turt2live Apr 23, 2024
c20d5f1
Thanks(?), WebStorm
turt2live Apr 23, 2024
3947d90
Handle case of no access token for /versions
turt2live Apr 23, 2024
7d9e7d6
Appease linter
turt2live Apr 23, 2024
d4efdf2
Merge branch 'develop' into travis/msc3916
turt2live May 1, 2024
37e3dfd
Apply suggestions from code review
turt2live May 1, 2024
0d5e2a9
Remove spurious try/catch
turt2live May 1, 2024
ec159a3
Factor out fetch config stuff
turt2live May 1, 2024
310284b
Merge branch 'develop' into travis/msc3916
turt2live May 13, 2024
b80adc5
Apply suggestions from code review
turt2live May 14, 2024
cdbfd80
Merge branch 'develop' into travis/msc3916
turt2live May 14, 2024
a57c111
Finish applying code review suggestions
turt2live May 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion res/sw.js

This file was deleted.

81 changes: 81 additions & 0 deletions src/serviceworker/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
const serverSupportMap: {
[serverUrl: string]: {
supportsMSC3916: boolean;
cacheExpires: number;
Comment thread
turt2live marked this conversation as resolved.
Outdated
};
} = {};

const credentialStore: {
[serverUrl: string]: string;
} = {};

// We skipWaiting() to update the service worker more frequently, particularly in development environments.
// @ts-expect-error - service worker types are not available. See 'fetch' event handler.
skipWaiting();

self.addEventListener("message", (event) => {

Check failure

Code scanning / SonarCloud

Origins should be verified during cross-origin communications

<!--SONAR_ISSUE_KEY:AY7PWlWeuP8G6MXDcCy--->Verify the origin of the received message. <p>See more on <a href="https://sonarcloud.io/project/issues?id=element-web&issues=AY7PWlWeuP8G6MXDcCy-&open=AY7PWlWeuP8G6MXDcCy-&pullRequest=27326">SonarCloud</a></p>
if (event.data?.type !== "credentials") return; // ignore
credentialStore[event.data.homeserverUrl] = event.data.accessToken;
console.log(
`[Service Worker] Updated access token for ${event.data.homeserverUrl} (accessToken? ${Boolean(event.data.accessToken)})`,
);
});

// @ts-expect-error - getting types to work for this is difficult, so we anticipate that "addEventListener" doesn't
// have a valid signature.
self.addEventListener("fetch", (event: FetchEvent) => {
// This is the authenticated media (MSC3916) check, proxying what was unauthenticated to the authenticated variants.

if (event.request.method !== "GET") {
return; // not important to us
}

// Note: ideally we'd keep the request headers and etc, but in practice we can't even see those details.
Comment thread
turt2live marked this conversation as resolved.
Outdated
// See https://stackoverflow.com/a/59152482
let url = event.request.url;

// We only intercept v3 download and thumbnail requests as presumably everything else is deliberate.
// For example, `/_matrix/media/unstable` or `/_matrix/media/v3/preview_url` are something well within
// the control of the application, and appear to be choices made at a higher level than us.
if (url.includes("/_matrix/media/v3/download") || url.includes("/_matrix/media/v3/thumbnail")) {
Comment thread
turt2live marked this conversation as resolved.
Outdated
// We need to call respondWith synchronously, otherwise we may never execute properly. This means
// later on we need to proxy the request through if it turns out the server doesn't support authentication.
event.respondWith(
(async (): Promise<Response> => {
// Figure out which homeserver we're communicating with
const csApi = url.substring(0, url.indexOf("/_matrix/media/v3"));

// Locate our access token, and populate the fetchConfig with the authentication header.
const accessToken = credentialStore[csApi];
let fetchConfig: { headers?: { [key: string]: string } } = {};
if (accessToken) {
fetchConfig = {
headers: {
Authorization: `Bearer ${accessToken}`,
},
};
}

// Update or populate the server support map using a (usually) authenticated `/versions` call.
if (!serverSupportMap[csApi] || serverSupportMap[csApi].cacheExpires <= new Date().getTime()) {
const versions = await (await fetch(`${csApi}/_matrix/client/versions`, fetchConfig)).json();
serverSupportMap[csApi] = {
supportsMSC3916: Boolean(versions?.unstable_features?.["org.matrix.msc3916"]),
cacheExpires: new Date().getTime() + 2 * 60 * 60 * 1000, // 2 hours from now
};
}

// If we have server support (and a means of authentication), rewrite the URL to use MSC3916 endpoints.
if (serverSupportMap[csApi].supportsMSC3916 && accessToken) {
// Currently unstable only.
url = url.replace(/\/media\/v3\/(.*)\//, "/client/unstable/org.matrix.msc3916/media/$1/");
} // else by default we make no changes

// Add authentication and send the request. We add authentication even if MSC3916 endpoints aren't
// being used to ensure patches like this work:
// https://github.com/matrix-org/synapse/commit/2390b66bf0ec3ff5ffb0c7333f3c9b239eeb92bb
return fetch(url, fetchConfig);
})(),
);
}
});
9 changes: 8 additions & 1 deletion src/vector/platform/WebPlatform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,14 @@ export default class WebPlatform extends VectorBasePlatform {
super();
// Register service worker if available on this platform
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("sw.js");
// sw.js is exported by webpack, sourced from `/src/serviceworker/index.ts`
const swPromise = navigator.serviceWorker.register("sw.js");

// Jest causes `register()` to return undefined, so swallow that case.
if (swPromise) {
swPromise.then((r) => r.update())
.catch((e) => console.error("Error registering/updating service worker:", e));
}
}
}

Expand Down
7 changes: 5 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ module.exports = (env, argv) => {
mobileguide: "./src/vector/mobile_guide/index.ts",
jitsi: "./src/vector/jitsi/index.ts",
usercontent: "./node_modules/matrix-react-sdk/src/usercontent/index.ts",
serviceworker: {
import: "./src/serviceworker/index.ts",
filename: "sw.js", // update WebPlatform if this changes
},
...(useHMR ? {} : cssThemes),
},

Expand Down Expand Up @@ -666,7 +670,7 @@ module.exports = (env, argv) => {
// HtmlWebpackPlugin will screw up our formatting like the names
// of the themes and which chunks we actually care about.
inject: false,
excludeChunks: ["mobileguide", "usercontent", "jitsi"],
excludeChunks: ["mobileguide", "usercontent", "jitsi", "serviceworker"],
minify: false,
templateParameters: {
og_image_url: ogImageUrl,
Expand Down Expand Up @@ -739,7 +743,6 @@ module.exports = (env, argv) => {
"res/jitsi_external_api.min.js",
"res/jitsi_external_api.min.js.LICENSE.txt",
"res/manifest.json",
"res/sw.js",
"res/welcome.html",
{ from: "welcome/**", context: path.resolve(__dirname, "res") },
{ from: "themes/**", context: path.resolve(__dirname, "res") },
Expand Down