aboutsummaryrefslogtreecommitdiffstats
path: root/packages/meshbay-hub
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meshbay-hub')
-rw-r--r--packages/meshbay-hub/src/meshbay_hub/api/webapp.py8
-rw-r--r--packages/meshbay-hub/tests/test_desktop_shell.py17
2 files changed, 17 insertions, 8 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/webapp.py b/packages/meshbay-hub/src/meshbay_hub/api/webapp.py
index 1d3bc7e..badbdda 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/webapp.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/webapp.py
@@ -90,7 +90,13 @@ CSP = "; ".join([
f"img-src 'self' data: blob: {_RECAPTCHA_SRC}",
"media-src 'self' blob:",
"font-src 'self'",
- "connect-src 'self' https: wss:",
+ # The page talks to its own origin and nothing else — the hub, the node
+ # arrives over WebRTC, which this directive does not govern. reCAPTCHA's
+ # two origins are the only others, kept so its script may call home from
+ # this page; the register and reset views were driven in Chrome and Firefox
+ # against Google's test keys with this line and reported no violation.
+ # `https: wss:` let an injected script post anything anywhere.
+ f"connect-src 'self' {_RECAPTCHA_SRC}",
"worker-src 'self'",
# `object-src` exists for one thing, and `frame-src`'s `blob:` for the same
# thing: previewing a PDF without writing it anywhere.
diff --git a/packages/meshbay-hub/tests/test_desktop_shell.py b/packages/meshbay-hub/tests/test_desktop_shell.py
index 732ba07..6e1c634 100644
--- a/packages/meshbay-hub/tests/test_desktop_shell.py
+++ b/packages/meshbay-hub/tests/test_desktop_shell.py
@@ -226,14 +226,17 @@ def _directive(name: str) -> str:
def test_the_hub_is_reachable_but_never_executable():
"""
- connect-src allows the hub's API and its signaling socket. script-src does
- not: nothing the hub returns is ever executed. The only script sources are
- 'self', the wasm eval token, and the two reCAPTCHA hosts (see the next
- test) — never a bare `https:` scheme, which would let the hub's own origin
- serve script.
+ The page connects to its own files and to reCAPTCHA, nothing else: every
+ hub call leaves from the main process (a page on `app://` is refused by
+ CORS anyway), and the node arrives over WebRTC, which connect-src does not
+ govern. A bare `https:` there let injected script post anything anywhere.
+ script-src never names the hub: nothing it returns is ever executed. The
+ only script sources are 'self', the wasm eval token, and the two reCAPTCHA
+ hosts (see the next test) — never a bare `https:` scheme, which would let
+ the hub's own origin serve script.
"""
- connect = _directive("connect-src")
- assert "https:" in connect and "wss:" in connect
+ connect = _directive("connect-src").split()[1:]
+ assert set(connect) == {"'self'", "https://www.google.com", "https://www.gstatic.com"}
script = _directive("script-src")
assert script, "no script-src directive"