@@ -571,13 +571,32 @@ fn validate_jpeg_metadata_free(bytes: &[u8]) -> Result<(), MediaError> {
571571 Err ( MediaError :: InvalidImage )
572572}
573573
574+ /// tEXt keywords that carry Buzz snapshot manifests (`.agent.png` /
575+ /// `.team.png`). These are deliberate product payloads — agent/team sharing
576+ /// embeds a manifest in a single tEXt chunk — so they are exempt from the
577+ /// metadata ban. Exactly one snapshot chunk is permitted per file; every
578+ /// other textual/metadata chunk remains forbidden.
579+ const PNG_SNAPSHOT_KEYWORDS : [ & [ u8 ] ; 2 ] = [ b"buzz_agent_snapshot" , b"buzz_team_snapshot" ] ;
580+
581+ /// Returns true when a raw tEXt chunk payload is a Buzz snapshot manifest:
582+ /// the payload must start with an allowlisted keyword followed by the
583+ /// keyword/text NUL separator.
584+ fn is_snapshot_text_chunk ( payload : & [ u8 ] ) -> bool {
585+ PNG_SNAPSHOT_KEYWORDS . iter ( ) . any ( |keyword| {
586+ payload. len ( ) > keyword. len ( )
587+ && & payload[ ..keyword. len ( ) ] == * keyword
588+ && payload[ keyword. len ( ) ] == 0
589+ } )
590+ }
591+
574592fn validate_png_metadata_free ( bytes : & [ u8 ] ) -> Result < ( ) , MediaError > {
575593 const SIG : & [ u8 ] = b"\x89 PNG\r \n \x1a \n " ;
576594 if !bytes. starts_with ( SIG ) {
577595 return Err ( MediaError :: InvalidImage ) ;
578596 }
579597 let mut i = SIG . len ( ) ;
580598 let mut saw_iend = false ;
599+ let mut saw_snapshot_chunk = false ;
581600 while i < bytes. len ( ) {
582601 if i + 12 > bytes. len ( ) {
583602 return Err ( MediaError :: InvalidImage ) ;
@@ -589,7 +608,19 @@ fn validate_png_metadata_free(bytes: &[u8]) -> Result<(), MediaError> {
589608 . and_then ( |v| v. checked_add ( len) )
590609 . filter ( |& v| v <= bytes. len ( ) )
591610 . ok_or ( MediaError :: InvalidImage ) ?;
592- if matches ! ( & kind, b"eXIf" | b"tEXt" | b"zTXt" | b"iTXt" | b"iCCP" ) {
611+ if & kind == b"tEXt" {
612+ // Buzz agent/team snapshot manifests ride in a single tEXt chunk
613+ // with an allowlisted keyword. Anything else — other keywords, or
614+ // a second snapshot chunk — is a forbidden metadata channel.
615+ let payload = & bytes[ i + 8 ..end - 4 ] ;
616+ if saw_snapshot_chunk || !is_snapshot_text_chunk ( payload) {
617+ return Err ( MediaError :: MetadataForbidden ) ;
618+ }
619+ saw_snapshot_chunk = true ;
620+ i = end;
621+ continue ;
622+ }
623+ if matches ! ( & kind, b"eXIf" | b"zTXt" | b"iTXt" | b"iCCP" ) {
593624 return Err ( MediaError :: MetadataForbidden ) ;
594625 }
595626 // Unknown ancillary chunks are private metadata channels. Keep only
@@ -1272,6 +1303,67 @@ mod tests {
12721303 ) ) ;
12731304 }
12741305
1306+ #[ test]
1307+ fn test_png_snapshot_text_chunks_are_allowed ( ) {
1308+ // Agent/team snapshot manifests ride in an allowlisted tEXt chunk;
1309+ // the relay must accept exactly one such chunk per file.
1310+ let config = test_config ( ) ;
1311+ for keyword in [ b"buzz_agent_snapshot" . as_slice ( ) , b"buzz_team_snapshot" ] {
1312+ let mut payload = keyword. to_vec ( ) ;
1313+ payload. push ( 0 ) ;
1314+ payload. extend_from_slice ( b"eyJmb3JtYXQiOiJidXp6In0=" ) ;
1315+ let mut png = TINY_PNG [ ..TINY_PNG . len ( ) - 12 ] . to_vec ( ) ;
1316+ png. extend_from_slice ( & png_chunk ( b"tEXt" , & payload) ) ;
1317+ png. extend_from_slice ( & TINY_PNG [ TINY_PNG . len ( ) - 12 ..] ) ;
1318+ assert_eq ! (
1319+ validate_content( & png, & config) . unwrap_or_else( |error| panic!(
1320+ "rejected snapshot tEXt keyword {}: {error}" ,
1321+ String :: from_utf8_lossy( keyword)
1322+ ) ) ,
1323+ "image/png"
1324+ ) ;
1325+ }
1326+ }
1327+
1328+ #[ test]
1329+ fn test_png_snapshot_text_chunk_rejected_when_duplicated_or_spoofed ( ) {
1330+ let config = test_config ( ) ;
1331+
1332+ // Two snapshot chunks: the second is a covert channel.
1333+ let mut payload = b"buzz_agent_snapshot" . to_vec ( ) ;
1334+ payload. push ( 0 ) ;
1335+ payload. extend_from_slice ( b"data" ) ;
1336+ let mut png = TINY_PNG [ ..TINY_PNG . len ( ) - 12 ] . to_vec ( ) ;
1337+ png. extend_from_slice ( & png_chunk ( b"tEXt" , & payload) ) ;
1338+ png. extend_from_slice ( & png_chunk ( b"tEXt" , & payload) ) ;
1339+ png. extend_from_slice ( & TINY_PNG [ TINY_PNG . len ( ) - 12 ..] ) ;
1340+ assert ! ( matches!(
1341+ validate_content( & png, & config) ,
1342+ Err ( MediaError :: MetadataForbidden )
1343+ ) ) ;
1344+
1345+ // Keyword prefix without the NUL separator, and near-miss keywords,
1346+ // stay forbidden.
1347+ for payload in [
1348+ b"buzz_agent_snapshotX\0 data" . as_slice ( ) ,
1349+ b"buzz_agent_snapshot_extra\0 data" ,
1350+ b"buzz_agent_snapshot" , // no separator at all
1351+ b"Comment\0 GPS=37.7,-122.4" ,
1352+ ] {
1353+ let mut png = TINY_PNG [ ..TINY_PNG . len ( ) - 12 ] . to_vec ( ) ;
1354+ png. extend_from_slice ( & png_chunk ( b"tEXt" , payload) ) ;
1355+ png. extend_from_slice ( & TINY_PNG [ TINY_PNG . len ( ) - 12 ..] ) ;
1356+ assert ! (
1357+ matches!(
1358+ validate_content( & png, & config) ,
1359+ Err ( MediaError :: MetadataForbidden )
1360+ ) ,
1361+ "accepted non-snapshot tEXt payload {:?}" ,
1362+ String :: from_utf8_lossy( payload)
1363+ ) ;
1364+ }
1365+ }
1366+
12751367 #[ test]
12761368 fn test_rejects_jpeg_app_metadata_comments_and_trailing_payload ( ) {
12771369 let config = test_config ( ) ;
0 commit comments