@@ -255,6 +255,13 @@ pub(crate) fn terminal_text(s: &str) -> String {
255255 . collect ( )
256256}
257257
258+ pub ( crate ) fn terminal_purl ( purl : & str ) -> String {
259+ socket_patch_core:: utils:: purl:: normalize_purl ( purl)
260+ . chars ( )
261+ . filter ( |c| !c. is_control ( ) )
262+ . collect ( )
263+ }
264+
258265#[ derive( Clone , Copy ) ]
259266pub ( crate ) struct OptInEntry < ' a > {
260267 pub purl : & ' a str ,
@@ -274,6 +281,50 @@ impl<'a> OptInEntry<'a> {
274281 }
275282}
276283
284+ #[ derive( Clone , Debug , Default , PartialEq , Eq ) ]
285+ pub struct ShownOptIn {
286+ uuid : String ,
287+ requires_opt_in : Option < bool > ,
288+ opt_in_note : Option < String > ,
289+ }
290+
291+ impl ShownOptIn {
292+ fn new ( uuid : & str , requires_opt_in : Option < bool > , opt_in_note : Option < & str > ) -> Self {
293+ Self {
294+ uuid : uuid. to_string ( ) ,
295+ requires_opt_in,
296+ opt_in_note : opt_in_note. map ( str:: to_string) ,
297+ }
298+ }
299+
300+ pub fn from_search ( patch : & socket_patch_core:: api:: types:: PatchSearchResult ) -> Self {
301+ Self :: new (
302+ & patch. uuid ,
303+ patch. requires_opt_in ,
304+ patch. opt_in_note . as_deref ( ) ,
305+ )
306+ }
307+
308+ pub fn from_response ( patch : & socket_patch_core:: api:: types:: PatchResponse ) -> Self {
309+ Self :: new (
310+ & patch. uuid ,
311+ patch. requires_opt_in ,
312+ patch. opt_in_note . as_deref ( ) ,
313+ )
314+ }
315+
316+ pub ( crate ) fn matches (
317+ & self ,
318+ uuid : & str ,
319+ requires_opt_in : Option < bool > ,
320+ opt_in_note : Option < & str > ,
321+ ) -> bool {
322+ self . uuid == uuid
323+ && self . requires_opt_in == requires_opt_in
324+ && self . opt_in_note . as_deref ( ) == opt_in_note
325+ }
326+ }
327+
277328pub ( crate ) fn opt_in_note_block < ' a > (
278329 entries : impl IntoIterator < Item = OptInEntry < ' a > > ,
279330) -> Option < String > {
@@ -293,7 +344,7 @@ pub(crate) fn opt_in_note_block<'a>(
293344 continue ;
294345 }
295346 let note = note. replace ( '\n' , "\n " ) ;
296- let purl = socket_patch_core :: utils :: purl :: normalize_purl ( entry. purl ) ;
347+ let purl = terminal_purl ( entry. purl ) ;
297348 let block = block. get_or_insert_with ( || "Opt-in required:" . to_string ( ) ) ;
298349 block. push_str ( & format ! ( "\n {purl}: {note}" ) ) ;
299350 }
@@ -335,6 +386,30 @@ mod tests {
335386 assert_eq ! ( plural( 7 , "patch" , "patches" ) , "7 patches" ) ;
336387 }
337388
389+ #[ test]
390+ fn opt_in_block_sanitizes_purls_and_dedups_uuids ( ) {
391+ let block = opt_in_note_block ( [
392+ OptInEntry {
393+ purl : "pkg:npm/bad%1Bname%09more\r \n next@1.0.0" ,
394+ uuid : "uuid-a" ,
395+ requires_opt_in : Some ( true ) ,
396+ opt_in_note : Some ( "Enable safe mode." ) ,
397+ } ,
398+ OptInEntry {
399+ purl : "pkg:npm/other@1.0.0" ,
400+ uuid : "uuid-a" ,
401+ requires_opt_in : Some ( true ) ,
402+ opt_in_note : Some ( "Enable safe mode." ) ,
403+ } ,
404+ ] )
405+ . unwrap ( ) ;
406+ assert_eq ! (
407+ block,
408+ "Opt-in required:\n pkg:npm/badnamemorenext@1.0.0: Enable safe mode."
409+ ) ;
410+ assert ! ( !block. contains( '\x1b' ) && !block. contains( '\r' ) && !block. contains( '\t' ) ) ;
411+ }
412+
338413 #[ test]
339414 fn truncate_short_input_is_untouched ( ) {
340415 assert_eq ! ( truncate( "hello" , 60 ) , "hello" ) ;
0 commit comments