Skip to content

Commit e421ad2

Browse files
tlongwell-blocknpub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757Tyler Longwell
authored
feat(media): require auth for relay media reads (#1926)
Signed-off-by: Tyler Longwell <[email protected]> Signed-off-by: npub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757 <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@sprout-oss.stage.blox.sqprod.co> Co-authored-by: npub12gtutshhh76rx0jx697f32f9tffd4hhp3hx58fp4x6u4uemkm7sqf8f757 <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@sprout-oss.stage.blox.sqprod.co> Co-authored-by: Tyler Longwell <[email protected]>
1 parent c339212 commit e421ad2

29 files changed

Lines changed: 1299 additions & 68 deletions

File tree

‎.env.example‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ RELAY_URL=ws://localhost:3000
6868
# BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS=8
6969
# BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS_PER_PUBKEY=2
7070
# BUZZ_MEDIA_UPLOADS_PER_MINUTE=30
71+
# Require Blossom t=get auth and relay membership for GET/HEAD /media/*.
72+
# Keep off until desktop/mobile/CLI clients that attach media read auth are deployed.
73+
# BUZZ_REQUIRE_MEDIA_GET_AUTH=false
74+
# Legacy alias accepted by the relay while rollout docs catch up:
75+
# BUZZ_REQUIRE_MEDIA_READ_AUTH=false
7176

7277
# -----------------------------------------------------------------------------
7378
# Ephemeral Channels (TTL testing)

‎Cargo.lock‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TESTING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ out of the box with `just setup` or `just relay`. Common overrides:
269269
| `REDIS_URL` | `redis://localhost:6379` | |
270270
| `BUZZ_REQUIRE_AUTH_TOKEN` | `false` | When true, REST requires NIP-98 (no `X-Pubkey` fallback) |
271271
| `BUZZ_REQUIRE_RELAY_MEMBERSHIP` | `false` | When true, only pubkeys in `relay_members` can connect |
272+
| `BUZZ_REQUIRE_MEDIA_GET_AUTH` | `false` | When true, `GET`/`HEAD /media/*` require Blossom kind 24242 `t=get` auth plus relay membership. |
272273
| `BUZZ_AUTO_MIGRATE` | `false` | Opt in with `true`/`1`/`yes`/`on` to run embedded SQLx migrations on relay startup |
273274
| `RELAY_OWNER_PUBKEY` | unset | Bootstrapped as `owner` in `relay_members` at first start |
274275
| `BUZZ_ALLOW_NIP_OA_AUTH` | `false` | Enable NIP-OA owner attestation for membership |

‎crates/buzz-cli/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ diffy = "0.5"
5757
# Hex encoding — SHA-256 hash output for Blossom uploads
5858
hex = { workspace = true }
5959

60+
# Byte buffers returned by authenticated media downloads
61+
bytes = "1"
62+
6063
# MIME type detection via magic bytes — file upload validation
6164
infer = "0.19"
6265

‎crates/buzz-cli/src/client.rs‎

Lines changed: 231 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,212 @@ fn sign_nip98(
108108
Ok(format!("Nostr {}", B64.encode(json.as_bytes())))
109109
}
110110

111+
fn relay_server_tag(relay_url: &str) -> Option<String> {
112+
let authority = buzz_core::tenant::relay_url_authority(relay_url);
113+
if authority.is_empty() {
114+
None
115+
} else {
116+
Some(authority)
117+
}
118+
}
119+
120+
fn is_safe_media_path_segment(sha256_ext: &str) -> bool {
121+
let segments: Vec<&str> = sha256_ext.split('.').collect();
122+
match segments.as_slice() {
123+
[hash] => is_lower_hex_sha256(hash),
124+
[hash, ext] => is_lower_hex_sha256(hash) && is_safe_media_ext(ext),
125+
[hash, "thumb", "jpg"] => is_lower_hex_sha256(hash),
126+
_ => false,
127+
}
128+
}
129+
130+
fn is_lower_hex_sha256(value: &str) -> bool {
131+
value.len() == 64 && value.chars().all(|c| matches!(c, '0'..='9' | 'a'..='f'))
132+
}
133+
134+
fn is_safe_media_ext(value: &str) -> bool {
135+
!value.is_empty()
136+
&& value.len() <= 8
137+
&& value.chars().all(|c| matches!(c, 'a'..='z' | '0'..='9'))
138+
}
139+
140+
fn media_url_from_input(relay_url: &str, input: &str) -> Result<String, CliError> {
141+
let input = input.trim();
142+
if input.starts_with("http://") || input.starts_with("https://") {
143+
let parsed = url::Url::parse(input)
144+
.map_err(|e| CliError::Usage(format!("invalid media URL: {e}")))?;
145+
if !parsed.path().starts_with("/media/") {
146+
return Err(CliError::Usage(
147+
"media URL must point at a /media/ path".to_string(),
148+
));
149+
}
150+
let Some(sha256_ext) = parsed.path().strip_prefix("/media/") else {
151+
return Err(CliError::Usage(
152+
"media URL must point at a /media/ path".to_string(),
153+
));
154+
};
155+
if !is_safe_media_path_segment(sha256_ext) {
156+
return Err(CliError::Usage(
157+
"media path must be sha256, sha256.ext, or sha256.thumb.jpg".to_string(),
158+
));
159+
}
160+
let relay = url::Url::parse(relay_url)
161+
.map_err(|e| CliError::Usage(format!("invalid relay URL: {e}")))?;
162+
if parsed.scheme() != relay.scheme()
163+
|| parsed.host_str() != relay.host_str()
164+
|| parsed.port_or_known_default() != relay.port_or_known_default()
165+
{
166+
return Err(CliError::Usage(
167+
"refusing to sign media GET for a non-relay origin".to_string(),
168+
));
169+
}
170+
return Ok(input.to_string());
171+
}
172+
if input.contains("://") {
173+
return Err(CliError::Usage(
174+
"media URL must use http:// or https://".to_string(),
175+
));
176+
}
177+
178+
let sha256_ext = input.trim_start_matches("/media/");
179+
if sha256_ext.is_empty() {
180+
return Err(CliError::Usage(
181+
"media input must be a URL or sha256[.ext]".to_string(),
182+
));
183+
}
184+
if !is_safe_media_path_segment(sha256_ext) {
185+
return Err(CliError::Usage(
186+
"media input must be sha256, sha256.ext, or sha256.thumb.jpg".to_string(),
187+
));
188+
}
189+
Ok(format!(
190+
"{}/media/{sha256_ext}",
191+
relay_url.trim_end_matches('/')
192+
))
193+
}
194+
195+
fn sign_blossom_get(keys: &Keys, media_url: &str) -> Result<String, CliError> {
196+
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
197+
use nostr::Timestamp;
198+
199+
let now = Timestamp::now().as_secs();
200+
let exp_str = (now + 600).to_string();
201+
let domain = relay_server_tag(media_url)
202+
.ok_or_else(|| CliError::Usage(format!("invalid media URL: {media_url}")))?;
203+
let tags = vec![
204+
Tag::parse(["t", "get"]).map_err(|e| CliError::Other(e.to_string()))?,
205+
Tag::parse(["expiration", &exp_str]).map_err(|e| CliError::Other(e.to_string()))?,
206+
Tag::parse(["server", &domain]).map_err(|e| CliError::Other(e.to_string()))?,
207+
];
208+
209+
let auth_event = EventBuilder::new(Kind::from(24242), "Get media")
210+
.tags(tags)
211+
.sign_with_keys(keys)
212+
.map_err(|e| CliError::Other(format!("signing failed: {e}")))?;
213+
214+
Ok(format!(
215+
"Nostr {}",
216+
URL_SAFE_NO_PAD.encode(auth_event.as_json().as_bytes())
217+
))
218+
}
219+
220+
#[cfg(test)]
221+
mod media_download_tests {
222+
use super::*;
223+
224+
#[test]
225+
fn media_url_from_sha_uses_relay_media_path() {
226+
let hash = "a".repeat(64);
227+
assert_eq!(
228+
media_url_from_input("https://relay.example", &format!("{hash}.jpg")).unwrap(),
229+
format!("https://relay.example/media/{hash}.jpg")
230+
);
231+
assert_eq!(
232+
media_url_from_input("https://relay.example/", &format!("/media/{hash}.jpg")).unwrap(),
233+
format!("https://relay.example/media/{hash}.jpg")
234+
);
235+
}
236+
237+
#[test]
238+
fn media_url_accepts_only_same_relay_media_urls() {
239+
let hash = "a".repeat(64);
240+
assert!(media_url_from_input(
241+
"https://relay.example:443",
242+
&format!("https://relay.example/media/{hash}.jpg")
243+
)
244+
.is_ok());
245+
assert!(media_url_from_input(
246+
"https://relay.example",
247+
&format!("http://relay.example/media/{hash}.jpg")
248+
)
249+
.is_err());
250+
assert!(media_url_from_input(
251+
"https://relay.example",
252+
&format!("https://evil.example/media/{hash}.jpg")
253+
)
254+
.is_err());
255+
assert!(media_url_from_input(
256+
"https://relay.example",
257+
&format!("https://relay.example/media-evil/{hash}.jpg")
258+
)
259+
.is_err());
260+
assert!(media_url_from_input(
261+
"https://relay.example",
262+
&format!("ftp://relay.example/media/{hash}.jpg")
263+
)
264+
.is_err());
265+
}
266+
267+
#[test]
268+
fn media_url_rejects_path_confusion_and_non_hash_inputs() {
269+
for input in [
270+
"abc123.jpg",
271+
"../evil",
272+
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/evil.jpg",
273+
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.JPG",
274+
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.eviltoolong",
275+
"https://relay.example/media/abc123.jpg",
276+
"https://relay.example/media/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.JPG",
277+
] {
278+
assert!(
279+
media_url_from_input("https://relay.example", input).is_err(),
280+
"input should be rejected: {input}"
281+
);
282+
}
283+
}
284+
285+
#[test]
286+
fn media_get_auth_header_is_server_scoped() {
287+
let keys = Keys::generate();
288+
let hash = "a".repeat(64);
289+
let header = sign_blossom_get(
290+
&keys,
291+
&format!("https://relay.example:443/media/{hash}.jpg"),
292+
)
293+
.unwrap();
294+
let encoded = header.strip_prefix("Nostr ").unwrap();
295+
let json = base64::engine::general_purpose::URL_SAFE_NO_PAD
296+
.decode(encoded)
297+
.unwrap();
298+
let event = nostr::Event::from_json(std::str::from_utf8(&json).unwrap()).unwrap();
299+
event.verify().unwrap();
300+
assert_eq!(event.kind, Kind::from(24242));
301+
302+
let tags: Vec<Vec<String>> = event
303+
.tags
304+
.iter()
305+
.map(|tag| tag.as_slice().to_vec())
306+
.collect();
307+
assert!(tags.iter().any(|tag| tag.as_slice() == ["t", "get"]));
308+
assert!(tags
309+
.iter()
310+
.any(|tag| tag.as_slice() == ["server", "relay.example"]));
311+
assert!(!tags
312+
.iter()
313+
.any(|tag| tag.first().map(String::as_str) == Some("x")));
314+
}
315+
}
316+
111317
pub struct BuzzClient {
112318
http: reqwest::Client,
113319
relay_url: String, // base URL, no trailing slash, e.g. "https://relay.buzz.place"
@@ -358,16 +564,9 @@ impl BuzzClient {
358564
Tag::parse(["expiration", &exp_str]).map_err(|e| CliError::Other(e.to_string()))?,
359565
];
360566
// Extract server domain from relay URL for BUD-11 server tag
361-
if let Ok(parsed) = url::Url::parse(&self.relay_url) {
362-
if let Some(host) = parsed.host_str() {
363-
let domain = match parsed.port() {
364-
Some(port) => format!("{host}:{port}"),
365-
None => host.to_string(),
366-
};
367-
blossom_tags.push(
368-
Tag::parse(["server", &domain]).map_err(|e| CliError::Other(e.to_string()))?,
369-
);
370-
}
567+
if let Some(domain) = relay_server_tag(&self.relay_url) {
568+
blossom_tags
569+
.push(Tag::parse(["server", &domain]).map_err(|e| CliError::Other(e.to_string()))?);
371570
}
372571

373572
let auth_event = EventBuilder::new(Kind::from(24242), "Upload file")
@@ -409,6 +608,28 @@ impl BuzzClient {
409608
.map_err(|e| CliError::Other(format!("invalid upload response: {e}")))
410609
}
411610

611+
/// Download a Blossom media blob using BUD-01 `t=get` auth.
612+
pub async fn download_media(&self, input: &str) -> Result<bytes::Bytes, CliError> {
613+
let url = media_url_from_input(&self.relay_url, input)?;
614+
let auth_header = sign_blossom_get(&self.keys, &url)?;
615+
let client = reqwest::Client::builder()
616+
.timeout(Duration::from_secs(120))
617+
// Do not forward Authorization or x-auth-tag to redirect targets.
618+
.redirect(reqwest::redirect::Policy::none())
619+
.build()
620+
.map_err(|e| CliError::Other(format!("http client init failed: {e}")))?;
621+
let req = client.get(&url).header("Authorization", auth_header);
622+
623+
let resp = self.with_auth_tag(req).send().await?;
624+
if !resp.status().is_success() {
625+
let status = resp.status().as_u16();
626+
let body = resp.text().await.unwrap_or_default();
627+
return Err(CliError::Relay { status, body });
628+
}
629+
630+
resp.bytes().await.map_err(CliError::Network)
631+
}
632+
412633
async fn handle_response(&self, resp: reqwest::Response) -> Result<String, CliError> {
413634
if !resp.status().is_success() {
414635
let status = resp.status().as_u16();

‎crates/buzz-cli/src/commands/upload.rs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,24 @@ pub async fn dispatch(cmd: crate::UploadCmd, client: &BuzzClient) -> Result<(),
1313
}
1414
}
1515
}
16+
17+
pub async fn dispatch_media(cmd: crate::MediaCmd, client: &BuzzClient) -> Result<(), CliError> {
18+
match cmd {
19+
crate::MediaCmd::Get { input, output } => {
20+
let bytes = client.download_media(&input).await?;
21+
match output.as_deref() {
22+
Some(path) if path != "-" => {
23+
std::fs::write(path, &bytes)
24+
.map_err(|e| CliError::Other(format!("could not write {path}: {e}")))?;
25+
}
26+
_ => {
27+
use std::io::Write;
28+
std::io::stdout()
29+
.write_all(&bytes)
30+
.map_err(|e| CliError::Other(format!("could not write stdout: {e}")))?;
31+
}
32+
}
33+
Ok(())
34+
}
35+
}
36+
}

‎crates/buzz-cli/src/lib.rs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ enum Cmd {
209209
/// Open, update, list, and set status on git pull requests (NIP-34)
210210
#[command(subcommand)]
211211
Pr(PrCmd),
212+
/// Upload and download relay Blossom media
213+
#[command(subcommand)]
214+
Media(MediaCmd),
212215
/// Upload files to the relay's Blossom store
213216
#[command(subcommand)]
214217
Upload(UploadCmd),
@@ -1392,6 +1395,18 @@ pub enum UploadCmd {
13921395
},
13931396
}
13941397

1398+
#[derive(Subcommand)]
1399+
pub enum MediaCmd {
1400+
/// Download relay media with Blossom get auth
1401+
Get {
1402+
/// Relay media URL or sha256[.ext] path segment
1403+
input: String,
1404+
/// Output path. Omit or use '-' to write raw bytes to stdout.
1405+
#[arg(short, long)]
1406+
output: Option<String>,
1407+
},
1408+
}
1409+
13951410
/// Subcommands for `buzz mem`.
13961411
#[derive(Subcommand)]
13971412
pub enum MemCmd {
@@ -1640,6 +1655,7 @@ async fn run(cli: Cli) -> Result<(), CliError> {
16401655
Cmd::Patches(sub) => commands::patches::dispatch(sub, &client).await,
16411656
Cmd::Issues(sub) => commands::issues::dispatch(sub, &client).await,
16421657
Cmd::Pr(sub) => commands::pr::dispatch(sub, &client).await,
1658+
Cmd::Media(sub) => commands::upload::dispatch_media(sub, &client).await,
16431659
Cmd::Upload(sub) => commands::upload::dispatch(sub, &client).await,
16441660
Cmd::Mem(sub) => commands::mem::dispatch(sub, &client).await,
16451661
Cmd::Moderation(sub) => commands::moderation::dispatch(sub, &client, &cli.format).await,
@@ -1668,6 +1684,7 @@ mod tests {
16681684
"emoji",
16691685
"feed",
16701686
"issues",
1687+
"media",
16711688
"mem",
16721689
"messages",
16731690
"moderation",
@@ -1801,6 +1818,7 @@ mod tests {
18011818
names(&cmd, "issues"),
18021819
vec!["create", "get", "list", "status"]
18031820
);
1821+
assert_eq!(names(&cmd, "media"), vec!["get"]);
18041822
assert_eq!(names(&cmd, "upload"), vec!["file"]);
18051823
assert_eq!(names(&cmd, "pack"), vec!["inspect", "validate"]);
18061824
assert_eq!(
@@ -1828,6 +1846,7 @@ mod tests {
18281846
("emoji", 5),
18291847
("feed", 1),
18301848
("issues", 4),
1849+
("media", 1),
18311850
("messages", 8),
18321851
("pack", 2),
18331852
("patches", 4),

0 commit comments

Comments
 (0)