diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-17 23:04:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-17 23:04:21 +0000 |
commit | 5c3a34b358da7fdfe17c5ffec16eda4f30738788 (patch) | |
tree | 68b1a591f58f1d1f741a2b42d724bef8b1e0a6eb | |
parent | 251eac36ab32edb018ca02ed31ed4638a7f87865 (diff) | |
parent | 57c1aa7b1605881a753f89ee467f3aecf5851f7e (diff) | |
download | build-5c3a34b358da7fdfe17c5ffec16eda4f30738788.tar.gz |
Merge "Handle zip64 extra fields better" am: 57c1aa7b16
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431
Change-Id: Ieefcc8ee08c2d91f447fc5209967d43db7454c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | tools/releasetools/check_target_files_signatures.py | 5 | ||||
-rw-r--r-- | tools/releasetools/common.py | 18 | ||||
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 19 |
3 files changed, 30 insertions, 12 deletions
diff --git a/tools/releasetools/check_target_files_signatures.py b/tools/releasetools/check_target_files_signatures.py index d935607e43..a7b35230ea 100755 --- a/tools/releasetools/check_target_files_signatures.py +++ b/tools/releasetools/check_target_files_signatures.py @@ -241,7 +241,8 @@ class APK(object): # Signer (minSdkVersion=24, maxSdkVersion=32) certificate SHA-1 digest: 19da94896ce4078c38ca695701f1dec741ec6d67 # ... certs_info = {} - certificate_regex = re.compile(r"(Signer (?:#[0-9]+|\(.*\))) (certificate .*):(.*)") + certificate_regex = re.compile( + r"(Signer (?:#[0-9]+|\(.*\))) (certificate .*):(.*)") for line in output.splitlines(): m = certificate_regex.match(line) if not m: @@ -312,7 +313,7 @@ class TargetFiles(object): # This is the list of wildcards of files we extract from |filename|. apk_extensions = ['*.apk', '*.apex'] - with zipfile.ZipFile(filename) as input_zip: + with zipfile.ZipFile(filename, "r") as input_zip: self.certmap, compressed_extension = common.ReadApkCerts(input_zip) if compressed_extension: apk_extensions.append('*.apk' + compressed_extension) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 2019adda65..c5ad68ddb0 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -2135,9 +2135,23 @@ def UnzipToDir(filename, dirname, patterns=None): # to indicate the actual local header offset. # As of python3.11, python does not handle zip64 central directories # correctly, so we will manually do the parsing here. + + # ZIP64 central directory extra field has two required fields: + # 2 bytes header ID and 2 bytes size field. Thes two require fields have + # a total size of 4 bytes. Then it has three other 8 bytes field, followed + # by a 4 byte disk number field. The last disk number field is not required + # to be present, but if it is present, the total size of extra field will be + # divisible by 8(because 2+2+4+8*n is always going to be multiple of 8) + # Most extra fields are optional, but when they appear, their must appear + # in the order defined by zip64 spec. Since file header offset is the 2nd + # to last field in zip64 spec, it will only be at last 8 bytes or last 12-4 + # bytes, depending on whether disk number is present. for entry in entries: - if entry.header_offset == 0xFFFFFFFF and len(entry.extra) >= 28: - entry.header_offset = int.from_bytes(entry.extra[20:28], "little") + if entry.header_offset == 0xFFFFFFFF: + if len(entry.extra) % 8 == 0: + entry.header_offset = int.from_bytes(entry.extra[-12:-4], "little") + else: + entry.header_offset = int.from_bytes(entry.extra[-8:], "little") if patterns is not None: filtered = [info for info in entries if any( [fnmatch.fnmatch(info.filename, p) for p in patterns])] diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 4c0d391f8e..f3e6f1e3d1 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -633,14 +633,17 @@ def GetTargetFilesZipForPartialUpdates(input_file, ab_partitions): return True return False - postinstall_config = common.ReadFromInputFile(input_file, POSTINSTALL_CONFIG) - postinstall_config = [ - line for line in postinstall_config.splitlines() if IsInPartialList(line)] - if postinstall_config: - postinstall_config = "\n".join(postinstall_config) - common.WriteToInputFile(input_file, POSTINSTALL_CONFIG, postinstall_config) - else: - os.unlink(os.path.join(input_file, POSTINSTALL_CONFIG)) + if common.DoesInputFileContain(input_file, POSTINSTALL_CONFIG): + postinstall_config = common.ReadFromInputFile( + input_file, POSTINSTALL_CONFIG) + postinstall_config = [ + line for line in postinstall_config.splitlines() if IsInPartialList(line)] + if postinstall_config: + postinstall_config = "\n".join(postinstall_config) + common.WriteToInputFile( + input_file, POSTINSTALL_CONFIG, postinstall_config) + else: + os.unlink(os.path.join(input_file, POSTINSTALL_CONFIG)) return input_file |