p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Sanity check the build fingerprint." 

am: d5b6094ed3

Change-Id: I6b2af3071e0cbbebddff959605f1b8afacc64c70
This commit is contained in:
Tao Bao 2019-09-17 11:44:21 -07:00 committed by android-build-merger
parent 6f756187fa d5b6094ed3
commit 65f2333062
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/ota_from_target_files.py
View File

@ -299,6 +299,9 @@ class BuildInfo(object):
that it always uses the first dict to calculate the fingerprint or the that it always uses the first dict to calculate the fingerprint or the
device name. The rest would be used for asserting OEM properties only device name. The rest would be used for asserting OEM properties only
(e.g. one package can be installed on one of these devices). (e.g. one package can be installed on one of these devices).
Raises:
ValueError: On invalid inputs.
""" """
self.info_dict = info_dict self.info_dict = info_dict
self.oem_dicts = oem_dicts self.oem_dicts = oem_dicts
@ -313,6 +316,13 @@ class BuildInfo(object):
self._device = self.GetOemProperty("ro.product.device") self._device = self.GetOemProperty("ro.product.device")
self._fingerprint = self.CalculateFingerprint() self._fingerprint = self.CalculateFingerprint()
# Sanity check the build fingerprint.
if (' ' in self._fingerprint or
any(ord(ch) > 127 for ch in self._fingerprint)):
raise ValueError(
'Invalid build fingerprint: "{}". See the requirement in Android CDD '
'3.2.2. Build Parameters.'.format(self._fingerprint))
@property @property
def is_ab(self): def is_ab(self):
return self._is_ab return self._is_ab

8
tools/releasetools/test_ota_from_target_files.py
View File

@ -174,6 +174,14 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
self.assertRaises(AssertionError, BuildInfo, self.assertRaises(AssertionError, BuildInfo,
self.TEST_INFO_DICT_USES_OEM_PROPS, None) self.TEST_INFO_DICT_USES_OEM_PROPS, None)
def test_init_badFingerprint(self):
info_dict = copy.deepcopy(self.TEST_INFO_DICT)
info_dict['build.prop']['ro.build.fingerprint'] = 'bad fingerprint'
self.assertRaises(ValueError, BuildInfo, info_dict, None)
info_dict['build.prop']['ro.build.fingerprint'] = 'bad\x80fingerprint'
self.assertRaises(ValueError, BuildInfo, info_dict, None)
def test___getitem__(self): def test___getitem__(self):
target_info = BuildInfo(self.TEST_INFO_DICT, None) target_info = BuildInfo(self.TEST_INFO_DICT, None)
self.assertEqual('value1', target_info['property1']) self.assertEqual('value1', target_info['property1'])