Send the server token from the web proxy and limit peer relay addresses
The proxy adds the shared token to every upstream request and drops any client copy. The peer relay accepts only tailnet, LAN, ts.net and discovered hosts, resolves each name once and pins the checked address, and flags ws:// endpoints with insecure_transport.
This commit is contained in:
+111
-86
@@ -6,6 +6,8 @@ import {
|
||||
json,
|
||||
} from "./peerTransport.js";
|
||||
import { PeerRegistry } from "./peerRegistry.js";
|
||||
import { withServerToken } from "./serverToken.js";
|
||||
import { rememberDiscovered } from "./peerAddress.js";
|
||||
|
||||
// Peer files are untrusted content, never privileged control-UI documents.
|
||||
// Apply this even for older peers whose /files endpoint has no sandbox header.
|
||||
@@ -39,6 +41,22 @@ export class PeerRelay extends PeerRegistry {
|
||||
throw new Error("Remote origin changed");
|
||||
return { url, cookie: peer.cookies.get(selected), peer };
|
||||
}
|
||||
// Resolve the peer once for this request, check the answer against the
|
||||
// address policy (peerAddress.js) and connect only to that address.
|
||||
pinned(target, reply, send) {
|
||||
this.policy
|
||||
.pin(target.url)
|
||||
.then((pin) => {
|
||||
if (!reply.destroyed) send(pin.lookup);
|
||||
})
|
||||
.catch(() => {
|
||||
if (typeof reply.writeHead !== "function")
|
||||
reply.end("HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\n\r\n");
|
||||
else if (!reply.headersSent)
|
||||
json(reply, 403, { error: "Server address is not allowed" });
|
||||
else reply.destroy();
|
||||
});
|
||||
}
|
||||
http(req, res) {
|
||||
if (!req.url.startsWith("/peers/")) return false;
|
||||
try {
|
||||
@@ -52,59 +70,62 @@ export class PeerRelay extends PeerRegistry {
|
||||
json(res, 404, { error: "Unsupported remote resource" });
|
||||
return true;
|
||||
}
|
||||
const headers = { ...(target.cookie ? { cookie: target.cookie } : {}) };
|
||||
for (const name of [
|
||||
"content-type",
|
||||
"content-length",
|
||||
"range",
|
||||
"x-file-name",
|
||||
"x-upload-name",
|
||||
"x-chat-file-name",
|
||||
"x-pipelines-upload-name",
|
||||
])
|
||||
if (req.headers[name]) headers[name] = req.headers[name];
|
||||
const upstream = remoteRequest(target.url, {
|
||||
method: req.method,
|
||||
headers,
|
||||
});
|
||||
upstream.setTimeout(30000, () => upstream.destroy());
|
||||
upstream.on("response", (response) => {
|
||||
const safe = {};
|
||||
this.pinned(target, res, (lookup) => {
|
||||
const headers = { ...(target.cookie ? { cookie: target.cookie } : {}) };
|
||||
for (const name of [
|
||||
"content-type",
|
||||
"content-length",
|
||||
"content-range",
|
||||
"accept-ranges",
|
||||
"content-disposition",
|
||||
"range",
|
||||
"x-file-name",
|
||||
"x-upload-name",
|
||||
"x-chat-file-name",
|
||||
"x-pipelines-upload-name",
|
||||
])
|
||||
if (response.headers[name]) safe[name] = response.headers[name];
|
||||
res.writeHead(
|
||||
response.statusCode >= 300 && response.statusCode < 400
|
||||
? 502
|
||||
: response.statusCode,
|
||||
{
|
||||
...safe,
|
||||
"Cache-Control": "private, no-store",
|
||||
// Multiple CSP policies intersect: preserve a peer's stricter
|
||||
// restrictions while always imposing the local sandbox boundary.
|
||||
"Content-Security-Policy": response.headers[
|
||||
"content-security-policy"
|
||||
]
|
||||
? [response.headers["content-security-policy"], contentPolicy]
|
||||
: contentPolicy,
|
||||
"X-Content-Type-Options": "nosniff",
|
||||
},
|
||||
);
|
||||
response.pipe(res);
|
||||
if (req.headers[name]) headers[name] = req.headers[name];
|
||||
const upstream = remoteRequest(target.url, {
|
||||
method: req.method,
|
||||
lookup,
|
||||
headers,
|
||||
});
|
||||
upstream.setTimeout(30000, () => upstream.destroy());
|
||||
upstream.on("response", (response) => {
|
||||
const safe = {};
|
||||
for (const name of [
|
||||
"content-type",
|
||||
"content-length",
|
||||
"content-range",
|
||||
"accept-ranges",
|
||||
"content-disposition",
|
||||
])
|
||||
if (response.headers[name]) safe[name] = response.headers[name];
|
||||
res.writeHead(
|
||||
response.statusCode >= 300 && response.statusCode < 400
|
||||
? 502
|
||||
: response.statusCode,
|
||||
{
|
||||
...safe,
|
||||
"Cache-Control": "private, no-store",
|
||||
// Multiple CSP policies intersect: preserve a peer's stricter
|
||||
// restrictions while always imposing the local sandbox boundary.
|
||||
"Content-Security-Policy": response.headers[
|
||||
"content-security-policy"
|
||||
]
|
||||
? [response.headers["content-security-policy"], contentPolicy]
|
||||
: contentPolicy,
|
||||
"X-Content-Type-Options": "nosniff",
|
||||
},
|
||||
);
|
||||
response.pipe(res);
|
||||
});
|
||||
upstream.on("error", () => {
|
||||
if (!res.headersSent)
|
||||
json(res, 502, { error: "Remote server unavailable" });
|
||||
else res.destroy();
|
||||
});
|
||||
req.on("aborted", () => upstream.destroy());
|
||||
res.on("close", () => upstream.destroy());
|
||||
req.pipe(upstream);
|
||||
});
|
||||
upstream.on("error", () => {
|
||||
if (!res.headersSent)
|
||||
json(res, 502, { error: "Remote server unavailable" });
|
||||
else res.destroy();
|
||||
});
|
||||
req.on("aborted", () => upstream.destroy());
|
||||
res.on("close", () => upstream.destroy());
|
||||
req.pipe(upstream);
|
||||
} catch {
|
||||
json(res, 401, { error: "Sign in to the remote server again" });
|
||||
}
|
||||
@@ -122,47 +143,49 @@ export class PeerRelay extends PeerRegistry {
|
||||
"sec-websocket-version": "13",
|
||||
...(target.cookie ? { cookie: target.cookie } : {}),
|
||||
};
|
||||
const upstream = remoteRequest(target.url, { headers });
|
||||
upstream.setTimeout(10000, () => upstream.destroy());
|
||||
upstream.on("upgrade", (response, remote, remoteHead) => {
|
||||
socket.write(
|
||||
`HTTP/1.1 101 Switching Protocols\r\n${Object.entries(
|
||||
response.headers,
|
||||
)
|
||||
.filter(([k]) =>
|
||||
[
|
||||
"upgrade",
|
||||
"connection",
|
||||
"sec-websocket-accept",
|
||||
"sec-websocket-protocol",
|
||||
].includes(k),
|
||||
this.pinned(target, socket, (lookup) => {
|
||||
const upstream = remoteRequest(target.url, { headers, lookup });
|
||||
upstream.setTimeout(10000, () => upstream.destroy());
|
||||
upstream.on("upgrade", (response, remote, remoteHead) => {
|
||||
socket.write(
|
||||
`HTTP/1.1 101 Switching Protocols\r\n${Object.entries(
|
||||
response.headers,
|
||||
)
|
||||
.map(([k, v]) => `${k}: ${v}`)
|
||||
.join("\r\n")}\r\n\r\n`,
|
||||
);
|
||||
target.peer.sockets.add(socket);
|
||||
remote.setTimeout(0);
|
||||
socket.once("close", () => {
|
||||
target.peer.sockets.delete(socket);
|
||||
remote.destroy();
|
||||
.filter(([k]) =>
|
||||
[
|
||||
"upgrade",
|
||||
"connection",
|
||||
"sec-websocket-accept",
|
||||
"sec-websocket-protocol",
|
||||
].includes(k),
|
||||
)
|
||||
.map(([k, v]) => `${k}: ${v}`)
|
||||
.join("\r\n")}\r\n\r\n`,
|
||||
);
|
||||
target.peer.sockets.add(socket);
|
||||
remote.setTimeout(0);
|
||||
socket.once("close", () => {
|
||||
target.peer.sockets.delete(socket);
|
||||
remote.destroy();
|
||||
});
|
||||
remote.once("close", () => socket.destroy());
|
||||
socket.on("error", () => remote.destroy());
|
||||
remote.on("error", () => socket.destroy());
|
||||
if (head?.length) remote.write(head);
|
||||
if (remoteHead?.length) socket.write(remoteHead);
|
||||
remote.pipe(socket);
|
||||
socket.pipe(remote);
|
||||
});
|
||||
remote.once("close", () => socket.destroy());
|
||||
socket.on("error", () => remote.destroy());
|
||||
remote.on("error", () => socket.destroy());
|
||||
if (head?.length) remote.write(head);
|
||||
if (remoteHead?.length) socket.write(remoteHead);
|
||||
remote.pipe(socket);
|
||||
socket.pipe(remote);
|
||||
upstream.on("response", (response) => {
|
||||
response.resume();
|
||||
socket.end(
|
||||
`HTTP/1.1 ${response.statusCode === 401 ? 401 : 502} Remote Unavailable\r\nContent-Length: 0\r\n\r\n`,
|
||||
);
|
||||
});
|
||||
upstream.on("error", () => socket.destroy());
|
||||
socket.once("close", () => upstream.destroy());
|
||||
upstream.end();
|
||||
});
|
||||
upstream.on("response", (response) => {
|
||||
response.resume();
|
||||
socket.end(
|
||||
`HTTP/1.1 ${response.statusCode === 401 ? 401 : 502} Remote Unavailable\r\nContent-Length: 0\r\n\r\n`,
|
||||
);
|
||||
});
|
||||
upstream.on("error", () => socket.destroy());
|
||||
socket.once("close", () => upstream.destroy());
|
||||
upstream.end();
|
||||
} catch {
|
||||
socket.end("HTTP/1.1 401 Unauthorized\r\nContent-Length: 0\r\n\r\n");
|
||||
}
|
||||
@@ -176,7 +199,9 @@ export async function proxyDiscovery(req, res, host, port) {
|
||||
new URL(
|
||||
`http://${host.includes(":") ? `[${host}]` : host}:${port}/discovery`,
|
||||
),
|
||||
{ headers: withServerToken({}) },
|
||||
);
|
||||
if (response.status === 200) rememberDiscovered(response.body);
|
||||
res
|
||||
.writeHead(response.status, {
|
||||
"Content-Type": "application/json",
|
||||
|
||||
Reference in New Issue
Block a user