Revert "Secure upgrade"

setup.py

@@ -154,8 +154,6 @@
         'scripts/memory_threshold_check_handler.py',
         'scripts/techsupport_cleanup.py',
         'scripts/storm_control.py',
-        'scripts/verify_image_sign.sh',
-        'scripts/verify_image_sign_common.sh',
         'scripts/check_db_integrity.py',
         'scripts/sysreadyshow'
     ],

sonic_installer/bootloader/grub.py

@@ -153,17 +153,6 @@ def verify_image_platform(self, image_path):
         # Check if platform is inside image's target platforms
         return self.platform_in_platforms_asic(platform, image_path)
 
-    def verify_image_sign(self, image_path):
-        click.echo('Verifying image signature')
-        verification_script_name = 'verify_image_sign.sh'
-        script_path = os.path.join('/usr', 'local', 'bin', verification_script_name)
-        if not os.path.exists(script_path):
-            click.echo("Unable to find verification script in path " + script_path)
-            return False
-        verification_result = subprocess.run([script_path, image_path], capture_output=True)
-        click.echo(str(verification_result.stdout) + " " + str(verification_result.stderr))
-        return verification_result.returncode == 0
-
     @classmethod
     def detect(cls):
         return os.path.isfile(os.path.join(HOST_PATH, 'grub/grub.cfg'))

sonic_installer/main.py

@@ -511,8 +511,7 @@ def sonic_installer():
 @click.option('-y', '--yes', is_flag=True, callback=abort_if_false,
               expose_value=False, prompt='New image will be installed, continue?')
 @click.option('-f', '--force', '--skip-secure-check', is_flag=True,
-              help="Force installation of an image of a non-secure type than secure running " +
-              " image, this flag does not affect secure upgrade image verification")
+              help="Force installation of an image of a non-secure type than secure running image")
 @click.option('--skip-platform-check', is_flag=True,
               help="Force installation of an image of a type which is not of the same platform")
 @click.option('--skip_migration', is_flag=True,
@@ -577,14 +576,6 @@ def install(url, force, skip_platform_check=False, skip_migration=False, skip_pa
                 "Aborting...", LOG_ERR)
             raise click.Abort()
 
-        # Calling verification script by default - signature will be checked if enabled in bios
-        echo_and_log("Verifing image {} signature...".format(binary_image_version))
-        if not bootloader.verify_image_sign(image_path):
-            echo_and_log('Error: Failed verify image signature', LOG_ERR)
-            raise click.Abort()
-        else:
-            echo_and_log('Verification successful')
-
         echo_and_log("Installing image {} and setting it as default...".format(binary_image_version))
         with SWAPAllocator(not skip_setup_swap, swap_mem_size, total_mem_threshold, available_mem_threshold):
             bootloader.install_image(image_path)
@@ -967,6 +958,5 @@ def verify_next_image():
         sys.exit(1)
     click.echo('Image successfully verified')
 
-
 if __name__ == '__main__':
     sonic_installer()

tests/installer_bootloader_grub_test.py

@@ -53,11 +53,3 @@ def test_set_fips_grub():
 
     # Cleanup the _tmp_host folder
     shutil.rmtree(tmp_host_path)
-
-def test_verify_image():
-
-    bootloader = grub.GrubBootloader()
-    image = f'{grub.IMAGE_PREFIX}expeliarmus-{grub.IMAGE_PREFIX}abcde'
-
-    # command should fail
-    assert not bootloader.verify_image_sign(image)