ReVanced/ARSCLib
1
0
Fork 0
mirror of https://github.com/revanced/ARSCLib.git synced 2025-04-29 22:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dump & restore signature block at encode and decode #33

Browse Source
This commit is contained in:
REAndroid 2023-04-28 22:36:30 +02:00
parent 9fb87d972e
commit edf1d93d4a
6 changed files with 165 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/reandroid/apk/ApkJsonDecoder.java
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2022 github.com/REAndroid
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -16,6 +16,7 @@
package com.reandroid.apk;
import com.reandroid.archive.InputSource;
import com.reandroid.archive2.block.ApkSignatureBlock;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.chunk.xml.AndroidManifestBlock;
import com.reandroid.arsc.chunk.xml.ResXmlDocument;
@ -53,8 +54,18 @@ public class ApkJsonDecoder {
writeResources(dir);
writeRootFiles(dir);
writePathMap(dir);
dumpSignatures(dir);
return new File(dir, apkModule.getModuleName());
}
private void dumpSignatures(File outDir) throws IOException {
ApkSignatureBlock signatureBlock = apkModule.getApkSignatureBlock();
if(signatureBlock == null){
return;
}
apkModule.logMessage("Dumping signatures: " + ApkUtil.SIGNATURE_FILE_NAME);
File file = toSignatureFile(outDir);
signatureBlock.writeRaw(file);
}
private void writePathMap(File dir) throws IOException {
PathMap pathMap = new PathMap();
pathMap.add(apkModule.getApkArchive());
@ -189,6 +200,10 @@ public class ApkJsonDecoder {
String name = "public.xml";
return new File(file, name);
}
private File toSignatureFile(File dir){
File file = new File(dir, apkModule.getModuleName());
return new File(file, ApkUtil.SIGNATURE_FILE_NAME);
}
private File toPathMapJsonFile(File dir){
File file = new File(dir, apkModule.getModuleName());
return new File(file, PathMap.JSON_FILE);

19
src/main/java/com/reandroid/apk/ApkJsonEncoder.java
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2022 github.com/REAndroid
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -17,6 +17,7 @@ package com.reandroid.apk;
import com.reandroid.archive.APKArchive;
import com.reandroid.archive.FileInputSource;
import com.reandroid.archive2.block.ApkSignatureBlock;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.chunk.xml.AndroidManifestBlock;
import com.reandroid.json.JSONArray;
@ -40,12 +41,28 @@ public class ApkJsonEncoder {
scanResJsonDirs(moduleDir);
scanRootDirs(moduleDir);
ApkModule module=new ApkModule(moduleName, apkArchive);
module.setLoadDefaultFramework(false);
module.setAPKLogger(apkLogger);
loadUncompressed(module, moduleDir);
applyResourceId(module, moduleDir);
restorePathMap(moduleDir, module);
restoreSignatures(moduleDir, module);
return module;
}
private void restoreSignatures(File dir, ApkModule apkModule){
File file = new File(dir, ApkUtil.SIGNATURE_FILE_NAME);
if(!file.isFile()){
return;
}
logMessage("Loading signature: " + file.getName());
ApkSignatureBlock signatureBlock = new ApkSignatureBlock();
try {
signatureBlock.read(file);
apkModule.setApkSignatureBlock(signatureBlock);
} catch (IOException exception){
logError("Failed to load signatures: ", exception);
}
}
private void restorePathMap(File dir, ApkModule apkModule){
File file = new File(dir, PathMap.JSON_FILE);
if(!file.isFile()){

14
src/main/java/com/reandroid/apk/ApkModuleXmlDecoder.java
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2022 github.com/REAndroid
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -19,6 +19,7 @@ import com.reandroid.apk.xmldecoder.ResXmlDocumentSerializer;
import com.reandroid.archive.InputSource;
import com.reandroid.apk.xmldecoder.XMLBagDecoder;
import com.reandroid.apk.xmldecoder.XMLNamespaceValidator;
import com.reandroid.archive2.block.ApkSignatureBlock;
import com.reandroid.arsc.chunk.PackageBlock;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.chunk.TypeBlock;
@ -92,6 +93,17 @@ import java.util.*;
extractRootFiles(outDir);
writePathMap(outDir);
dumpSignatures(outDir);
}
private void dumpSignatures(File outDir) throws IOException {
ApkSignatureBlock signatureBlock = apkModule.getApkSignatureBlock();
if(signatureBlock == null){
return;
}
logMessage("Dumping signatures: " + ApkUtil.SIGNATURE_FILE_NAME);
File file = new File(outDir, ApkUtil.SIGNATURE_FILE_NAME);
signatureBlock.writeRaw(file);
}
private void writePathMap(File dir) throws IOException {
PathMap pathMap = new PathMap();

39
src/main/java/com/reandroid/apk/ApkModuleXmlEncoder.java
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2022 github.com/REAndroid
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -15,19 +15,20 @@
*/
package com.reandroid.apk;
import com.reandroid.archive.APKArchive;
import com.reandroid.archive.FileInputSource;
import com.reandroid.apk.xmlencoder.RESEncoder;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.json.JSONArray;
import com.reandroid.xml.XMLException;
import com.reandroid.archive.APKArchive;
import com.reandroid.archive.FileInputSource;
import com.reandroid.apk.xmlencoder.RESEncoder;
import com.reandroid.archive2.block.ApkSignatureBlock;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.json.JSONArray;
import com.reandroid.xml.XMLException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
public class ApkModuleXmlEncoder {
public class ApkModuleXmlEncoder {
private final RESEncoder resEncoder;
public ApkModuleXmlEncoder(){
this.resEncoder = new RESEncoder();
@ -41,6 +42,18 @@ package com.reandroid.apk;
File rootDir=new File(mainDirectory, "root");
scanRootDir(rootDir);
restorePathMap(mainDirectory);
restoreSignatures(mainDirectory);
}
private void restoreSignatures(File dir) throws IOException {
File file = new File(dir, ApkUtil.SIGNATURE_FILE_NAME);
if(!file.isFile()){
return;
}
ApkModule apkModule = getApkModule();
apkModule.logMessage("Loading signature: " + file.getName());
ApkSignatureBlock signatureBlock = new ApkSignatureBlock();
signatureBlock.read(file);
apkModule.setApkSignatureBlock(signatureBlock);
}
private void restorePathMap(File dir) throws IOException{
File file = new File(dir, PathMap.JSON_FILE);
@ -74,4 +87,4 @@ package com.reandroid.apk;
public void setApkLogger(APKLogger apkLogger) {
this.resEncoder.setAPKLogger(apkLogger);
}
}
}

5
src/main/java/com/reandroid/apk/ApkUtil.java
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2022 github.com/REAndroid
*
* Licensed under the Apache License, Version 2.0 (the "License");
@ -16,6 +16,7 @@
package com.reandroid.apk;
import com.reandroid.archive.InputSource;
import com.reandroid.archive2.block.ApkSignatureBlock;
import java.io.File;
import java.util.*;
@ -192,5 +193,7 @@ public class ApkUtil {
public static final String TAG_STRING_ARRAY = "string-array";
public static final String TAG_INTEGER_ARRAY = "integer-array";
public static final String SIGNATURE_FILE_NAME = "signatures" + ApkSignatureBlock.FILE_EXT;
private static final int MAX_FILE_NAME_LENGTH = 50;
}

2
src/main/java/com/reandroid/archive2/block/ApkSignatureBlock.java
View File

@ -157,5 +157,5 @@ public class ApkSignatureBlock extends LengthPrefixedList<SignatureInfo>
return 0;
}
public static final String FILE_EXT = ".signature.block.bin";
public static final String FILE_EXT = ".sig";
}