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:
+32
-1
@@ -1,6 +1,12 @@
|
||||
import { createHash } from "node:crypto";
|
||||
import { authenticate, endpoint, json } from "./peerTransport.js";
|
||||
import { sameOriginUpgrade } from "./proxySecurity.js";
|
||||
import { PeerAddressError, PeerAddressPolicy } from "./peerAddress.js";
|
||||
|
||||
// A password or session cookie sent to a ws:// endpoint crosses the network
|
||||
// unencrypted (unless the path is a tailnet's WireGuard tunnel); the response
|
||||
// says so, so the app can warn before the operator types a password.
|
||||
const plaintext = (urls) => urls.some((url) => url.startsWith("ws:"));
|
||||
|
||||
async function body(req) {
|
||||
const chunks = [];
|
||||
@@ -14,8 +20,9 @@ async function body(req) {
|
||||
}
|
||||
|
||||
export class PeerRegistry {
|
||||
constructor(scopeFor) {
|
||||
constructor(scopeFor, policy = new PeerAddressPolicy()) {
|
||||
this.scopeFor = scopeFor;
|
||||
this.policy = policy;
|
||||
this.sessions = new Map();
|
||||
}
|
||||
owner(req) {
|
||||
@@ -82,6 +89,7 @@ export class PeerRegistry {
|
||||
json(res, 200, {
|
||||
connected: Boolean(peer?.connected),
|
||||
needs_password: !peer?.connected,
|
||||
...(peer && plaintext([peer.active]) ? { insecure_transport: true } : {}),
|
||||
});
|
||||
return true;
|
||||
}
|
||||
@@ -113,6 +121,24 @@ export class PeerRegistry {
|
||||
urls.every((url) => previous.endpoints.includes(url));
|
||||
const version = (owner.versions.get(id) ?? 0) + 1;
|
||||
owner.versions.set(id, version);
|
||||
// Every address is checked (and its DNS answer pinned) before any
|
||||
// request leaves this machine; a refused address is never contacted.
|
||||
const pins = new Map();
|
||||
const refused = [];
|
||||
await Promise.all(
|
||||
urls.map(async (value) => {
|
||||
try {
|
||||
pins.set(value, await this.policy.pin(new URL(value)));
|
||||
} catch (error) {
|
||||
if (error instanceof PeerAddressError)
|
||||
refused.push({ endpoint: value, error: error.message });
|
||||
}
|
||||
}),
|
||||
);
|
||||
if (refused.length === urls.length) {
|
||||
json(res, 400, { error: refused[0].error, refused_endpoints: refused });
|
||||
return true;
|
||||
}
|
||||
if (previous && !sameEndpoints) {
|
||||
for (const socket of previous.sockets) socket.destroy();
|
||||
owner.peers.delete(id);
|
||||
@@ -127,6 +153,8 @@ export class PeerRegistry {
|
||||
const results = await Promise.all(
|
||||
urls.map(async (value) => {
|
||||
try {
|
||||
const pin = pins.get(value);
|
||||
if (!pin) return { connected: false, needs_password: false };
|
||||
const old = previous?.endpoints.includes(value)
|
||||
? (previous.cookies.get(value) ?? "")
|
||||
: "";
|
||||
@@ -134,6 +162,7 @@ export class PeerRegistry {
|
||||
new URL(value),
|
||||
old,
|
||||
data.password,
|
||||
pin.lookup,
|
||||
);
|
||||
if (status.connected) {
|
||||
peer.cookies.set(value, status.cookie);
|
||||
@@ -163,6 +192,8 @@ export class PeerRegistry {
|
||||
owner.peers.set(id, peer);
|
||||
json(res, 200, {
|
||||
connected_endpoints: [...peer.cookies.keys()],
|
||||
...(plaintext(urls) ? { insecure_transport: true } : {}),
|
||||
...(refused.length ? { refused_endpoints: refused } : {}),
|
||||
connected: peer.connected,
|
||||
needs_password:
|
||||
!peer.connected && results.some((r) => r.needs_password),
|
||||
|
||||
Reference in New Issue
Block a user