@@ -144,6 +144,70 @@ impl DappmanagerPackageManager {
144144 }
145145 unreachable ! ( "mutation attempts are validated to be non-zero" )
146146 }
147+
148+ async fn install_package_with_options (
149+ & self ,
150+ dnp_name : & DnpName ,
151+ version : Option < & PackageRef > ,
152+ bypass_signature : bool ,
153+ ) -> Result < ( ) , PackageManagerError > {
154+ let options = install_options ( version, bypass_signature) ;
155+ let user_settings = serde_json:: Map :: new ( ) ;
156+ match self
157+ . retry_mutation (
158+ "dappnode_install_package" ,
159+ dnp_name,
160+ version. map ( PackageRef :: as_str) ,
161+ || {
162+ self . mutation_client
163+ . install_package ( dnp_name, version, & user_settings, options)
164+ } ,
165+ || async { self . client . get_package_details ( dnp_name) . await . is_ok ( ) } ,
166+ )
167+ . await
168+ {
169+ Ok ( ( ) ) => Ok ( ( ) ) ,
170+ Err ( error) if required_setup_error ( & error. to_string ( ) ) => {
171+ Err ( PackageManagerError :: RequiredSetup )
172+ }
173+ Err ( error) if operation_in_progress_error ( & error. to_string ( ) ) => Ok ( ( ) ) ,
174+ Err ( error) => Err ( package_error ( error) ) ,
175+ }
176+ }
177+
178+ async fn update_package_with_options (
179+ & self ,
180+ dnp_name : & DnpName ,
181+ version : & PackageRef ,
182+ bypass_signature : bool ,
183+ ) -> Result < ( ) , PackageManagerError > {
184+ let options = install_options ( Some ( version) , bypass_signature) ;
185+ self . retry_mutation (
186+ "dappnode_update_package" ,
187+ dnp_name,
188+ Some ( version. as_str ( ) ) ,
189+ || {
190+ self . mutation_client
191+ . update_package ( dnp_name, Some ( version) , options)
192+ } ,
193+ || async {
194+ self . client
195+ . get_package_details ( dnp_name)
196+ . await
197+ . ok ( )
198+ . and_then ( |details| details. version )
199+ . is_some_and ( |installed| installed. to_string ( ) == version. as_str ( ) )
200+ } ,
201+ )
202+ . await
203+ . or_else ( |error| {
204+ if operation_in_progress_error ( & error. to_string ( ) ) {
205+ Ok ( ( ) )
206+ } else {
207+ Err ( package_error ( error) )
208+ }
209+ } )
210+ }
147211}
148212
149213#[ async_trait]
@@ -269,61 +333,35 @@ impl PackageManager for DappmanagerPackageManager {
269333 dnp_name : & DnpName ,
270334 version : Option < & PackageRef > ,
271335 ) -> Result < ( ) , PackageManagerError > {
272- let options = install_options ( version) ;
273- let user_settings = serde_json:: Map :: new ( ) ;
274- match self
275- . retry_mutation (
276- "dappnode_install_package" ,
277- dnp_name,
278- version. map ( PackageRef :: as_str) ,
279- || {
280- self . mutation_client
281- . install_package ( dnp_name, version, & user_settings, options)
282- } ,
283- || async { self . client . get_package_details ( dnp_name) . await . is_ok ( ) } ,
284- )
336+ self . install_package_with_options ( dnp_name, version, false )
337+ . await
338+ }
339+
340+ async fn install_package_bypassing_signature (
341+ & self ,
342+ dnp_name : & DnpName ,
343+ version : Option < & PackageRef > ,
344+ ) -> Result < ( ) , PackageManagerError > {
345+ self . install_package_with_options ( dnp_name, version, true )
285346 . await
286- {
287- Ok ( ( ) ) => Ok ( ( ) ) ,
288- Err ( error) if required_setup_error ( & error. to_string ( ) ) => {
289- Err ( PackageManagerError :: RequiredSetup )
290- }
291- Err ( error) if operation_in_progress_error ( & error. to_string ( ) ) => Ok ( ( ) ) ,
292- Err ( error) => Err ( package_error ( error) ) ,
293- }
294347 }
295348
296349 async fn update_package (
297350 & self ,
298351 dnp_name : & DnpName ,
299352 version : & PackageRef ,
300353 ) -> Result < ( ) , PackageManagerError > {
301- let options = install_options ( Some ( version) ) ;
302- self . retry_mutation (
303- "dappnode_update_package" ,
304- dnp_name,
305- Some ( version. as_str ( ) ) ,
306- || {
307- self . mutation_client
308- . update_package ( dnp_name, Some ( version) , options)
309- } ,
310- || async {
311- self . client
312- . get_package_details ( dnp_name)
313- . await
314- . ok ( )
315- . and_then ( |details| details. version )
316- . is_some_and ( |installed| installed. to_string ( ) == version. as_str ( ) )
317- } ,
318- )
319- . await
320- . or_else ( |error| {
321- if operation_in_progress_error ( & error. to_string ( ) ) {
322- Ok ( ( ) )
323- } else {
324- Err ( package_error ( error) )
325- }
326- } )
354+ self . update_package_with_options ( dnp_name, version, false )
355+ . await
356+ }
357+
358+ async fn update_package_bypassing_signature (
359+ & self ,
360+ dnp_name : & DnpName ,
361+ version : & PackageRef ,
362+ ) -> Result < ( ) , PackageManagerError > {
363+ self . update_package_with_options ( dnp_name, version, true )
364+ . await
327365 }
328366
329367 async fn remove_package (
@@ -390,12 +428,17 @@ fn container_state(state: ContainerState) -> String {
390428 . to_owned ( )
391429}
392430
393- fn install_options ( version : Option < & PackageRef > ) -> InstallOptions {
394- match version {
431+ fn install_options ( version : Option < & PackageRef > , bypass_signature : bool ) -> InstallOptions {
432+ let options = match version {
395433 Some ( version) if version. is_ipfs ( ) => {
396434 InstallOptions :: default ( ) . with_bypass_signed_restriction ( )
397435 }
398436 _ => InstallOptions :: default ( ) ,
437+ } ;
438+ if bypass_signature {
439+ options. with_bypass_signed_restriction ( )
440+ } else {
441+ options
399442 }
400443}
401444
@@ -506,7 +549,7 @@ mod tests {
506549 #[ test]
507550 fn ipfs_update_bypasses_signed_restriction ( ) -> Result < ( ) , Box < dyn Error > > {
508551 let request = request_with_candidate ( "/ipfs/QmCandidate" ) ?;
509- let options = install_options ( Some ( & request. package . candidate_ref ) ) ;
552+ let options = install_options ( Some ( & request. package . candidate_ref ) , false ) ;
510553 assert ! ( options. bypass_signed_restriction) ;
511554 assert ! ( !options. bypass_core_restriction) ;
512555 assert ! ( !options. bypass_resolver) ;
@@ -516,20 +559,32 @@ mod tests {
516559 #[ test]
517560 fn registry_update_does_not_bypass_signed_restriction ( ) -> Result < ( ) , Box < dyn Error > > {
518561 let request = request_with_candidate ( "0.1.56" ) ?;
519- assert ! ( install_options( Some ( & request. package. candidate_ref) ) . is_empty( ) ) ;
562+ assert ! ( install_options( Some ( & request. package. candidate_ref) , false ) . is_empty( ) ) ;
563+ Ok ( ( ) )
564+ }
565+
566+ #[ test]
567+ fn signature_retry_explicitly_bypasses_registry_restriction ( ) -> Result < ( ) , Box < dyn Error > > {
568+ let request = request_with_candidate ( "0.1.56" ) ?;
569+ let options = install_options ( Some ( & request. package . candidate_ref ) , true ) ;
570+ assert ! ( options. bypass_signed_restriction) ;
571+ assert ! ( !options. bypass_core_restriction) ;
572+ assert ! ( !options. bypass_resolver) ;
520573 Ok ( ( ) )
521574 }
522575
523576 #[ test]
524577 fn ipfs_install_bypasses_signed_restriction ( ) -> Result < ( ) , Box < dyn Error > > {
525578 let request = request_with_candidate ( "ipfs://QmCandidate" ) ?;
526- assert ! ( install_options( Some ( & request. package. candidate_ref) ) . bypass_signed_restriction) ;
579+ assert ! (
580+ install_options( Some ( & request. package. candidate_ref) , false ) . bypass_signed_restriction
581+ ) ;
527582 Ok ( ( ) )
528583 }
529584
530585 #[ test]
531586 fn latest_install_does_not_bypass_signed_restriction ( ) {
532- assert ! ( install_options( None ) . is_empty( ) ) ;
587+ assert ! ( install_options( None , false ) . is_empty( ) ) ;
533588 }
534589
535590 fn request_with_candidate ( candidate_ref : & str ) -> Result < RunRequest , Box < dyn Error > > {
0 commit comments