@@ -52,6 +52,7 @@ fn tarball_url(base: &str, name: &str, version: &str) -> String {
5252fn records_url (
5353 era : DepIdEra ,
5454 segment : & str ,
55+ name : & str ,
5556 siblings : & [ ( DepIdEra , bool ) ] ,
5657 options : Option < & Map < String , Value > > ,
5758) -> bool {
@@ -69,22 +70,26 @@ fn records_url(
6970 . and_then ( |o| o. get ( "registries" ) )
7071 . is_some_and ( Value :: is_object)
7172 && ( segment. is_empty ( ) || default_registry_alias ( options) == Some ( segment) )
72- && !under_configured_registry ( segment, options)
73+ && !under_configured_registry ( segment, name , options)
7374}
7475
7576/// Would a default-registry node on `segment` resolve under the lock's
7677/// recorded `options.registry`? vlt omits slot [3] for such a node
7778/// (`lockfile/save.ts`: `customRegistry = resolved && (!registry ||
7879/// !resolved.startsWith(registry))`).
79- fn under_configured_registry ( segment : & str , options : Option < & Map < String , Value > > ) -> bool {
80+ fn under_configured_registry (
81+ segment : & str ,
82+ name : & str ,
83+ options : Option < & Map < String , Value > > ,
84+ ) -> bool {
8085 let Some ( registry) = options
8186 . and_then ( |o| o. get ( "registry" ) )
8287 . and_then ( Value :: as_str)
8388 . filter ( |r| !r. is_empty ( ) )
8489 else {
8590 return false ;
8691 } ;
87- registry_base ( segment, options) . is_some_and ( |base| base. starts_with ( registry) )
92+ registry_base ( segment, name , options) . is_some_and ( |base| base. starts_with ( registry) )
8893}
8994
9095pub ( crate ) async fn restore (
@@ -246,8 +251,8 @@ pub(crate) async fn restore(
246251 } ;
247252 let line = parse_node_line ( lines[ hit. line ] ) . expect ( "the hit line parsed above" ) ;
248253 let json = |s : & str | serde_json:: to_string ( s) . expect ( "a str serializes to JSON" ) ;
249- let slot3 = if records_url ( hit. era , & hit. segment , & siblings, options) {
250- let Some ( base) = registry_base ( & hit. segment , options) else {
254+ let slot3 = if records_url ( hit. era , & hit. segment , & hit . name , & siblings, options) {
255+ let Some ( base) = registry_base ( & hit. segment , & hit . name , options) else {
251256 result. refuse (
252257 & hit. uuid ,
253258 format ! ( "{rel} maps no registry for the `{}` segment" , hit. segment) ,
@@ -323,49 +328,54 @@ mod tests {
323328 assert ! ( !records_url(
324329 DepIdEra :: Tilde ,
325330 "npm" ,
331+ "left-pad" ,
326332 & [ ( DepIdEra :: Tilde , false ) ] ,
327333 Some ( & with_registries)
328334 ) ) ;
329335 assert ! ( records_url(
330336 DepIdEra :: Tilde ,
331337 "npm" ,
338+ "left-pad" ,
332339 & [ ( DepIdEra :: Tilde , true ) ] ,
333340 None
334341 ) ) ;
335342 // Another era's siblings do not.
336343 assert ! ( !records_url(
337344 DepIdEra :: Legacy ,
338345 "npm" ,
346+ "left-pad" ,
339347 & [ ( DepIdEra :: Tilde , true ) ] ,
340348 Some ( & with_registries)
341349 ) ) ;
342350 // No siblings: the rc.33+ writer records `registries`.
343351 assert ! ( records_url(
344352 DepIdEra :: Tilde ,
345353 "npm" ,
354+ "left-pad" ,
346355 & [ ] ,
347356 Some ( & with_registries)
348357 ) ) ;
349- assert ! ( !records_url( DepIdEra :: Tilde , "npm" , & [ ] , None ) ) ;
358+ assert ! ( !records_url( DepIdEra :: Tilde , "npm" , "left-pad" , & [ ] , None ) ) ;
350359 assert ! ( !records_url(
351360 DepIdEra :: Tilde ,
352361 "https://registry.example.com/" ,
362+ "left-pad" ,
353363 & [ ] ,
354364 Some ( & with_registries)
355365 ) ) ;
356366 let alias = opts ( r#"{"default-registry-alias":"corp","registries":{"corp":"https://c/"}}"# ) ;
357- assert ! ( records_url( DepIdEra :: Tilde , "corp" , & [ ] , Some ( & alias) ) ) ;
367+ assert ! ( records_url( DepIdEra :: Tilde , "corp" , "left-pad" , & [ ] , Some ( & alias) ) ) ;
358368 // A recorded `registry` the node resolves under: vlt (rc.33 … 1.2.0
359369 // with `config.registry`) writes no slot [3].
360370 let configured = opts (
361371 r#"{"registry":"http://127.0.0.1:4873/","registries":{"npm":"http://127.0.0.1:4873/"}}"# ,
362372 ) ;
363- assert ! ( !records_url( DepIdEra :: Tilde , "npm" , & [ ] , Some ( & configured) ) ) ;
373+ assert ! ( !records_url( DepIdEra :: Tilde , "npm" , "left-pad" , & [ ] , Some ( & configured) ) ) ;
364374 // ...but a node on another registry than the configured one does.
365375 let elsewhere = opts (
366376 r#"{"registry":"https://registry.npmjs.org/","registries":{"npm":"http://127.0.0.1:4873/"}}"# ,
367377 ) ;
368- assert ! ( records_url( DepIdEra :: Tilde , "npm" , & [ ] , Some ( & elsewhere) ) ) ;
378+ assert ! ( records_url( DepIdEra :: Tilde , "npm" , "left-pad" , & [ ] , Some ( & elsewhere) ) ) ;
369379 }
370380
371381 use super :: super :: { restore_upstream, RestoreOptions , RestoreOutcome } ;
@@ -412,7 +422,7 @@ mod tests {
412422 dist[ "integrity" ] = ( * i) . into ( ) ;
413423 }
414424 Mock :: given ( method ( "GET" ) )
415- . and ( path ( format ! ( "/{name }/{version}" ) ) )
425+ . and ( path ( format ! ( "/{}/{version}" , name . replace ( '/' , "%2f" ) ) ) )
416426 . respond_with (
417427 ResponseTemplate :: new ( 200 ) . set_body_json ( serde_json:: json!( { "dist" : dist } ) ) ,
418428 )
@@ -530,6 +540,38 @@ mod tests {
530540 std:: env:: remove_var ( "SOCKET_NPM_REGISTRY" ) ;
531541 }
532542
543+ #[ tokio:: test]
544+ #[ serial_test:: serial]
545+ async fn restore_honors_scope_for_slot3_and_configured_registry_omission ( ) {
546+ use crate :: vendor:: vlt_lock_text:: SCOPED_REGISTRY_OPTIONS ;
547+ let server = registry ( & [ ( "@s/a" , "1.0.0" , Some ( LP_UPSTREAM ) ) ] ) . await ;
548+ std:: env:: set_var ( "SOCKET_NPM_REGISTRY" , server. uri ( ) ) ;
549+ let url = hosted ( LP_UUID , "a-1.0.0.tgz" ) ;
550+ for records_url in [ false , true ] {
551+ let sibling = if records_url {
552+ ",\n \" ~npm~ms@2.1.3\" : [0,\" ms\" ,\" sha512-M==\" ,\" https://b.example/ms/-/ms-2.1.3.tgz\" ]"
553+ } else {
554+ ""
555+ } ;
556+ let text = format ! (
557+ "{{\n \" lockfileVersion\" : 1,\n \" options\" : {SCOPED_REGISTRY_OPTIONS},\n \" nodes\" : {{\n \" ~npm~@s+a@1.0.0\" : [0,\" @s/a\" ,\" sha512-AA==\" ,\" {url}\" ]{sibling}\n }},\n \" edges\" : {{}}\n }}\n "
558+ ) ;
559+ let ( outcome, after) =
560+ run ( & text, & [ pin ( "pkg:npm/@s/a@1.0.0" , LP_UUID ) ] , false ) . await ;
561+ assert ! ( refused( & outcome) . is_empty( ) , "{:?}" , refused( & outcome) ) ;
562+ let after: Value = serde_json:: from_str ( & after) . unwrap ( ) ;
563+ let expected = if records_url {
564+ serde_json:: json!( [ 0 , "@s/a" , LP_UPSTREAM , "https://a.example/@s/a/-/a-1.0.0.tgz" ] )
565+ } else {
566+ // The scoped URL is under options.registry, even though
567+ // registries.npm names a different base: vlt omits slot 3.
568+ serde_json:: json!( [ 0 , "@s/a" , LP_UPSTREAM ] )
569+ } ;
570+ assert_eq ! ( after[ "nodes" ] [ "~npm~@s+a@1.0.0" ] , expected) ;
571+ }
572+ std:: env:: remove_var ( "SOCKET_NPM_REGISTRY" ) ;
573+ }
574+
533575 #[ tokio:: test]
534576 #[ serial_test:: serial]
535577 async fn missing_registry_integrity_refuses ( ) {
0 commit comments