@@ -7,27 +7,40 @@ use axum::{
77use std:: path:: Path ;
88use url:: Url ;
99
10- pub ( crate ) async fn response ( index : & Path , relay_url : & str ) -> Response {
10+ pub ( crate ) async fn response < R : crate :: tenant:: HostResolver > (
11+ index : & Path ,
12+ relay_url : & str ,
13+ resolver : & R ,
14+ raw_host : & str ,
15+ ) -> Response {
1116 match tokio:: fs:: read_to_string ( index) . await {
12- Ok ( html) => Html ( with_metadata ( html, relay_url) ) . into_response ( ) ,
17+ Ok ( html) => {
18+ let tenant = crate :: tenant:: bind_community ( resolver, raw_host) . await . ok ( ) ;
19+ Html ( with_metadata ( html, relay_url, tenant. as_ref ( ) ) ) . into_response ( )
20+ }
1321 Err ( _) => StatusCode :: INTERNAL_SERVER_ERROR . into_response ( ) ,
1422 }
1523}
1624
17- fn with_metadata ( html : String , relay_url : & str ) -> String {
18- let Ok ( mut origin) = Url :: parse ( relay_url) else {
25+ fn with_metadata (
26+ html : String ,
27+ relay_url : & str ,
28+ tenant : Option < & buzz_core:: tenant:: TenantContext > ,
29+ ) -> String {
30+ let Some ( tenant) = tenant else {
31+ return html;
32+ } ;
33+ let Ok ( relay) = Url :: parse ( relay_url) else {
1934 return html;
2035 } ;
21- let scheme = match origin . scheme ( ) {
36+ let scheme = match relay . scheme ( ) {
2237 "wss" | "https" => "https" ,
2338 "ws" | "http" => "http" ,
2439 _ => return html,
2540 } ;
26- if origin. set_scheme ( scheme) . is_err ( ) || origin. host_str ( ) . is_none ( ) {
27- return html;
28- }
29- // Use the operator's canonical public origin, never the request Host or token.
30- let origin = origin. origin ( ) . ascii_serialization ( ) ;
41+ // The deployment URL supplies TLS posture only. The resolved request host
42+ // is authoritative; never advertise a neighboring community's seed host.
43+ let origin = format ! ( "{scheme}://{}" , tenant. host( ) ) ;
3144 let origin = origin
3245 . replace ( '&' , "&" )
3346 . replace ( '"' , """ )
@@ -63,30 +76,68 @@ fn with_metadata(html: String, relay_url: &str) -> String {
6376mod tests {
6477 use super :: * ;
6578
66- #[ test]
67- fn canonical_public_media_without_credentials_or_paths ( ) {
79+ struct Resolver ;
80+ impl crate :: tenant:: HostResolver for Resolver {
81+ type Error = ( ) ;
82+ async fn resolve_host (
83+ & self ,
84+ host : & str ,
85+ ) -> Result < Option < buzz_core:: tenant:: CommunityId > , ( ) > {
86+ match host {
87+ "alpha.example" | "beta.example:8443" => {
88+ Ok ( Some ( buzz_core:: tenant:: CommunityId :: from_uuid (
89+ uuid:: Uuid :: from_u128 ( if host. starts_with ( "alpha" ) { 1 } else { 2 } ) ,
90+ ) ) )
91+ }
92+ "error.example" => Err ( ( ) ) ,
93+ _ => Ok ( None ) ,
94+ }
95+ }
96+ }
97+
98+ #[ tokio:: test]
99+ async fn media_uses_only_resolved_request_host_and_fails_closed ( ) {
68100 let document = "<html><head><title>Buzz</title></head><body>app</body></html>" ;
69- for ( relay, expected, secure) in [
70- ( "wss://example.org/relay" , "https://example.org" , true ) ,
71- (
72- "https://user:[email protected] :8443/path?secret=x#fragment" , 73- "https://example.org:8443" ,
74- true ,
75- ) ,
76- ( "ws://localhost:8080" , "http://localhost:8080" , false ) ,
101+ let dir = tempfile:: tempdir ( ) . unwrap ( ) ;
102+ let index = dir. path ( ) . join ( "index.html" ) ;
103+ std:: fs:: write ( & index, document) . unwrap ( ) ;
104+ for relay in [
105+ "wss://seed.example/relay" ,
106+ "https://user:[email protected] /path?secret=x" , 107+ "ws://localhost:3000" ,
77108 ] {
78- let html = with_metadata ( document. into ( ) , relay) ;
79- assert ! ( html. contains( & format!(
80- "content=\" {expected}/assets/invite-preview/buzz-invite-loop-v1.mp4\" "
81- ) ) ) ;
82- assert ! ( html. contains( "buzz-invite-poster-v1.png" ) ) ;
83- assert_eq ! ( html. contains( "og:video:secure_url" ) , secure) ;
84- assert ! ( !html. contains( "password" ) ) ;
85- assert ! ( !html. contains( "secret" ) ) ;
86- assert ! ( html. ends_with( "</head><body>app</body></html>" ) ) ;
87- }
88- for invalid in [ "invalid" , "file:///tmp/test" , "javascript:alert(1)" ] {
89- assert_eq ! ( with_metadata( document. into( ) , invalid) , document) ;
109+ for host in [
110+ "ALPHA.example" ,
111+ "beta.example:8443" ,
112+ "unknown.example" ,
113+ "error.example" ,
114+ "" ,
115+ ] {
116+ let response = response ( & index, relay, & Resolver , host) . await ;
117+ let bytes = axum:: body:: to_bytes ( response. into_body ( ) , usize:: MAX )
118+ . await
119+ . unwrap ( ) ;
120+ let html = std:: str:: from_utf8 ( & bytes) . unwrap ( ) ;
121+ if host == "ALPHA.example" || host == "beta.example:8443" {
122+ let scheme = if relay. starts_with ( "ws://" ) {
123+ "http"
124+ } else {
125+ "https"
126+ } ;
127+ let origin = format ! ( "{scheme}://{}" , host. to_lowercase( ) ) ;
128+ for file in [ "buzz-invite-loop-v1.mp4" , "buzz-invite-poster-v1.png" ] {
129+ assert ! ( html. contains( & format!(
130+ "content=\" {origin}/assets/invite-preview/{file}\" "
131+ ) ) ) ;
132+ }
133+ assert_eq ! ( html. contains( "og:video:secure_url" ) , scheme == "https" ) ;
134+ assert ! ( !html. contains( "seed.example" ) ) ;
135+ assert ! ( !html. contains( "password" ) ) ;
136+ assert ! ( !html. contains( "secret" ) ) ;
137+ } else {
138+ assert_eq ! ( html, document) ;
139+ }
140+ }
90141 }
91142 }
92143}
0 commit comments