Server hardening: finite numbers, open servers, unkickable host, no URL leaks

- Reject non-finite numerics at protocol parse and in the engine
  (a 1e400 seek became Infinity and broke every broadcast).
- Reject empty swaps; sanitize URL-looking media names.
- Blank password = open server; defaults no longer 'change-me'.
- Loopback peers (the in-process host) can't be kicked.
- /health no longer exposes media/transport; file URLs use the
  host the client dialled instead of 127.0.0.1.
- Count served bytes as streamed, not as requested.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
foxyzandClaude Opus 5.5 committed 2026-10-07 00:30:12 +03:00
1 parent 32848aaf71
commit e2301aa4ec
12 files changed
+370 -45

No files matched your search

+6 -2
View File
@@ -191,7 +191,6 @@ void mountSessionMediaRoute(
}
final end = res.end ?? size - 1;
final byteCount = end - res.start + 1;
session.addBytes(token, byteCount);
final shortToken = token.length > 4 ? '…${token.substring(token.length - 4)}' : token;
onLog?.call(token, MediaLog(
method: req.method.name,
@@ -201,7 +200,12 @@ void mountSessionMediaRoute(
bytesWritten: byteCount,
durationMs: stopwatch.elapsedMilliseconds,
));
final stream = file.openRead(res.start, end + 1).map((c) => Uint8List.fromList(c));
// Count bytes as they are actually sent: mpv often asks for `bytes=N-`
// and drops the connection early, so the requested range overcounts.
final stream = file.openRead(res.start, end + 1).map((c) {
session.addBytes(token, c.length);
return Uint8List.fromList(c);
});
return Response(
res.status,
body: Body.fromDataStream(stream, contentLength: byteCount),
+53 -7
View File
@@ -96,10 +96,29 @@ class RoomHub {
Future<void> kickById(String targetId, String reason) async {
final member = engine.byId(targetId);
if (member == null) throw const AuthException('unknown kick target');
if (session.tokens[member.token]?.isHost ?? false) {
throw const AuthException("can't kick the host");
}
await session.kick(member.token, reason: reason);
}
}
/// Media names are shown to everyone and must never carry a URL (api_key etc.).
/// A URL-looking name is reduced to its last path segment, no query/fragment.
String sanitizeMediaName(String name) {
final trimmed = name.trim();
if (!RegExp(r'^[a-zA-Z][a-zA-Z0-9+.-]*://').hasMatch(trimmed)) return name;
final uri = Uri.tryParse(trimmed);
final segments = uri?.pathSegments.where((s) => s.isNotEmpty).toList() ?? const [];
if (segments.isNotEmpty) return segments.last;
return 'media';
}
bool _isLoopback(String address) =>
address == '::1' ||
address.startsWith('127.') ||
address.startsWith('::ffff:127.');
void wsErr(RelicWebSocket ws, String message) {
ws.trySendText(jsonEncode({'t': 'err', 'message': message}));
}
@@ -107,9 +126,15 @@ void wsErr(RelicWebSocket ws, String message) {
void mountSyncRoute(
RelicApp app,
RoomHub hub,
String Function(String sid, String token, SessionMedia? media) urlBuilder,
String Function(String sid, String token, SessionMedia? media, String host)
urlBuilder,
) {
app.get('/sync', (final req) {
// Host the client dialled (Host header), so file URLs work for remote joiners.
final dialledHost = req.url.hasPort
? '${req.url.host.contains(':') ? '[${req.url.host}]' : req.url.host}:${req.url.port}'
: (req.url.host.contains(':') ? '[${req.url.host}]' : req.url.host);
final fromLoopback = _isLoopback(req.connectionInfo.remote.address.toString());
return WebSocketUpgrade((final ws) async {
ws.pingInterval = Duration(seconds: RelayConstants.pingIntervalSecs);
final firstText = Completer<String>();
@@ -155,12 +180,26 @@ void mountSyncRoute(
hub.changed();
case 'swap':
if (token == null) return;
final intent = SwapIntent.fromJson(decoded);
hub.engine.applySwap(token, intent.media);
final parsed = SwapIntent.fromJson(decoded).media;
final intent = SwapIntent(
media: HelloMedia(
name: sanitizeMediaName(parsed.name),
size: parsed.size,
duration: parsed.duration,
url: parsed.url));
final current = session.media;
if (current?.file != null &&
final matchesFile = current?.file != null &&
current!.name == intent.media.name &&
current.size == intent.media.size) {
current.size == intent.media.size;
if (!matchesFile && (intent.media.url ?? '').isEmpty) {
wsErr(ws, 'swap needs a url or the hosted file');
return;
}
if (!hub.engine.applySwap(token, intent.media)) {
wsErr(ws, 'bad swap media');
return;
}
if (matchesFile) {
session.media = SessionMedia(
name: current.name,
size: current.size,
@@ -193,12 +232,18 @@ void mountSyncRoute(
wsErr(ws, 'unknown kick target');
return;
}
if (session.tokens[member.token]?.isHost ?? false) {
wsErr(ws, "can't kick the host");
return;
}
final by = viewer?.name ?? '?';
unawaited(hub.session.kick(member.token,
reason: kickReq.reason.isEmpty
? 'kicked by $by'
: kickReq.reason));
}
} on ProtocolException catch (e) {
wsErr(ws, 'bad message: ${e.message}');
} catch (_) {
return;
}
@@ -250,7 +295,7 @@ void mountSyncRoute(
return;
}
final session = hub.session;
if (hello.secret != session.secret) {
if (session.secret.isNotEmpty && hello.secret != session.secret) {
_hubLog.warning('reject ${hello.user.name}: wrong secret');
wsErr(ws, 'wrong secret');
await close();
@@ -264,6 +309,7 @@ void mountSyncRoute(
await close();
return;
}
session.tokens[token]!.isHost = fromLoopback;
final memberId = hub.engine.applyJoin(token, hello.user.name, hello.user.avatar);
final activeToken = token;
hub.sockets[activeToken] = ws;
@@ -277,7 +323,7 @@ void mountSyncRoute(
final welcome = WelcomeMessage(
token: activeToken,
memberId: memberId,
mediaUrl: media?.file != null ? urlBuilder('default', activeToken, media) : media?.url,
mediaUrl: media?.file != null ? urlBuilder('default', activeToken, media, dialledHost) : media?.url,
state: hub.engine.broadcast().toJson(),
);
try {
+9 -5
View File
@@ -55,16 +55,17 @@ class RoomServer {
'viewers': viewers,
'bytesServed': bytes,
'uptimeSecs': uptime,
'media': s?.media?.name,
'transport': hub.engine.transport.name,
'eventId': hub.engine.eventId,
})),
);
});
mountSessionMediaRoute(_app, sessions);
mountSyncRoute(_app, hub, (sid, token, media) {
mountSyncRoute(_app, hub, (sid, token, media, dialledHost) {
final name = Uri.encodeComponent(media?.name ?? 'file');
return 'http://${config.advertiseHost}:$boundPort/m/$sid/$token/$name';
// advertiseHost is only an explicit override; otherwise echo what the client dialled.
final authority = config.advertiseHost.isNotEmpty
? '${config.advertiseHost}:$boundPort'
: dialledHost;
return 'http://$authority/m/$sid/$token/$name';
});
_app.fallback = (final req) => Response.notFound(
body: Body.fromString('not found'),
@@ -85,6 +86,9 @@ class RoomServer {
_log.warning('media file not found: ${config.mediaPath}');
}
}
if (config.secret.isEmpty) {
_log.warning('no password set: open server, anyone who can reach it can join');
}
_mountRoutes();
_server = await _app.serve(
address: InternetAddress.anyIPv4,
+2
View File
@@ -10,6 +10,8 @@ class ViewerToken {
final String name;
final String avatar;
bool kicked = false;
/// Connected from a loopback address: the host's own in-process client.
bool isHost = false;
int bytesServed = 0;
DateTime lastSeen;
Future<void> Function(String reason)? onKick;