Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dd8f20 authored by Tianjie's avatar Tianjie Committed by Tianjie Xu
Browse files

Update the argument when signing aftl 

The arguments transparency_log_servers and transparency_log_pub_keys
have been merged. Update the caller in the OTA script accordingly.

Also disable the test to contact aftl server until we have
a public server.

Bug: 153940575
Test: check the argument
Change-Id: If6a7e7d644884d395c75c2fcdfd6aa7c2380d851
parent 2cbcf3bd

tools/releasetools/common.py

+11 −4
Original line number Diff line number Diff line
@@ -932,8 +932,8 @@ def GetAvbChainedPartitionArg(partition, info_dict, key=None): 
  return "{}:{}:{}".format(partition, rollback_index_location, pubkey_path)





def AddAftlInclusionProof(output_image):

  """Appends the aftl inclusion proof to the vbmeta image."""

def ConstructAftlMakeImageCommands(output_image):

  """Constructs the command to append the aftl image to vbmeta."""



  # Ensure the other AFTL parameters are set as well.

  assert OPTIONS.aftl_tool_path is not None, 'No aftl tool provided.'
@@ -946,17 +946,24 @@ def AddAftlInclusionProof(output_image): 
  build_info = BuildInfo(OPTIONS.info_dict)

  version_incremental = build_info.GetBuildProp("ro.build.version.incremental")

  aftltool = OPTIONS.aftl_tool_path

  server_argument_list = [OPTIONS.aftl_server, OPTIONS.aftl_key_path]

  aftl_cmd = [aftltool, "make_icp_from_vbmeta",

              "--vbmeta_image_path", vbmeta_image,

              "--output", output_image,

              "--version_incremental", version_incremental,

              "--transparency_log_servers", OPTIONS.aftl_server,

              "--transparency_log_pub_keys", OPTIONS.aftl_key_path,

              "--transparency_log_servers", ','.join(server_argument_list),

              "--manufacturer_key", OPTIONS.aftl_manufacturer_key_path,

              "--algorithm", "SHA256_RSA4096",

              "--padding", "4096"]

  if OPTIONS.aftl_signer_helper:

    aftl_cmd.extend(shlex.split(OPTIONS.aftl_signer_helper))

  return aftl_cmd





def AddAftlInclusionProof(output_image):

  """Appends the aftl inclusion proof to the vbmeta image."""



  aftl_cmd = ConstructAftlMakeImageCommands(output_image)

  RunAndCheckOutput(aftl_cmd)



  verify_cmd = ['aftltool', 'verify_image_icp', '--vbmeta_image_path',

tools/releasetools/test_common.py

+40 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import os 
import subprocess

import tempfile

import time

import unittest

import zipfile

from hashlib import sha1
@@ -1431,8 +1432,45 @@ class CommonUtilsTest(test_utils.ReleaseToolsTestCase): 
    self.assertEqual('3', chained_partition_args[1])

    self.assertTrue(os.path.exists(chained_partition_args[2]))



  @test_utils.SkipIfExternalToolsUnavailable()

  def test_BuildVBMeta_appendAftl(self):

  def test_BuildVBMeta_appendAftlCommandSyntax(self):

    testdata_dir = test_utils.get_testdata_dir()

    common.OPTIONS.info_dict = {

        'ab_update': 'true',

        'avb_avbtool': 'avbtool',

        'build.prop': {

            'ro.build.version.incremental': '6285659',

            'ro.product.device': 'coral',

            'ro.build.fingerprint': 'google/coral/coral:R/RP1A.200311.002/'

                                    '6285659:userdebug/dev-keys'

        }

    }

    common.OPTIONS.aftl_tool_path = 'aftltool'

    common.OPTIONS.aftl_server = 'log.endpoints.aftl-dev.cloud.goog:9000'

    common.OPTIONS.aftl_key_path = os.path.join(testdata_dir,

                                                'test_transparency_key.pub')

    common.OPTIONS.aftl_manufacturer_key_path = os.path.join(

        testdata_dir, 'test_aftl_rsa4096.pem')



    vbmeta_image = tempfile.NamedTemporaryFile(delete=False)

    cmd = common.ConstructAftlMakeImageCommands(vbmeta_image.name)

    expected_cmd = [

        'aftltool', 'make_icp_from_vbmeta',

        '--vbmeta_image_path', 'place_holder',

        '--output', vbmeta_image.name,

        '--version_incremental', '6285659',

        '--transparency_log_servers',

        'log.endpoints.aftl-dev.cloud.goog:9000,{}'.format(

            common.OPTIONS.aftl_key_path),

        '--manufacturer_key', common.OPTIONS.aftl_manufacturer_key_path,

        '--algorithm', 'SHA256_RSA4096',

        '--padding', '4096']



    # ignore the place holder, i.e. path to a temp file

    self.assertEqual(cmd[:3], expected_cmd[:3])

    self.assertEqual(cmd[4:], expected_cmd[4:])



  @unittest.skip("enable after we have a server for public")

  def test_BuildVBMeta_appendAftlContactServer(self):

    testdata_dir = test_utils.get_testdata_dir()

    common.OPTIONS.info_dict = {

        'ab_update': 'true',