Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
0b26882f
Commit
0b26882f
authored
Jun 22, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build dynamic stub resource APK at runtime
Close #6013 Co-authored-by:
vvb2060
<
vvb2060@gmail.com
>
parent
a2495fb5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
29 deletions
+38
-29
Setup.kt
buildSrc/src/main/java/Setup.kt
+10
-18
DownloadActivity.java
.../src/main/java/com/topjohnwu/magisk/DownloadActivity.java
+28
-11
No files found.
buildSrc/src/main/java/Setup.kt
View file @
0b26882f
...
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream
...
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream
import
java.io.ByteArrayOutputStream
import
java.io.ByteArrayOutputStream
import
java.io.File
import
java.io.File
import
java.io.PrintStream
import
java.io.PrintStream
import
java.nio.file.Files
import
java.security.KeyStore
import
java.security.KeyStore
import
java.security.cert.X509Certificate
import
java.security.cert.X509Certificate
import
java.util.*
import
java.util.*
...
@@ -270,27 +269,20 @@ fun Project.setupStub() {
...
@@ -270,27 +269,20 @@ fun Project.setupStub() {
commandLine
(
aapt
,
"optimize"
,
"-o"
,
apkTmp
,
"--collapse-resource-names"
,
apk
)
commandLine
(
aapt
,
"optimize"
,
"-o"
,
apkTmp
,
"--collapse-resource-names"
,
apk
)
}
}
val
buffer
=
ByteArrayOutputStream
()
val
bos
=
ByteArrayOutputStream
()
apkTmp
.
inputStream
().
use
{
ZipFile
(
apkTmp
).
use
{
src
->
object
:
GZIPOutputStream
(
buffer
)
{
ZipOutputStream
(
apk
.
outputStream
()).
use
{
init
{
it
.
setLevel
(
Deflater
.
BEST_COMPRESSION
)
def
.
setLevel
(
Deflater
.
BEST_COMPRESSION
)
it
.
putNextEntry
(
ZipEntry
(
"AndroidManifest.xml"
))
}
src
.
getInputStream
(
src
.
getEntry
(
"AndroidManifest.xml"
)).
transferTo
(
it
)
}.
use
{
o
->
it
.
closeEntry
()
it
.
transferTo
(
o
)
}
}
}
DeflaterOutputStream
(
bos
,
Deflater
(
Deflater
.
BEST_COMPRESSION
)).
use
{
ZipFile
(
apkTmp
).
use
{
o
->
src
.
getInputStream
(
src
.
getEntry
(
"resources.arsc"
)).
transferTo
(
it
)
ZipOutputStream
(
apk
.
outputStream
()).
use
{
n
->
n
.
setLevel
(
Deflater
.
BEST_COMPRESSION
)
n
.
putNextEntry
(
ZipEntry
(
"AndroidManifest.xml"
))
o
.
getInputStream
(
o
.
getEntry
(
"AndroidManifest.xml"
)).
transferTo
(
n
)
n
.
closeEntry
()
n
.
finish
()
}
}
}
}
apkTmp
.
delete
()
apkTmp
.
delete
()
genEncryptedResources
(
ByteArrayInputStream
(
b
uffer
.
toByteArray
()),
outSrcDir
)
genEncryptedResources
(
ByteArrayInputStream
(
b
os
.
toByteArray
()),
outSrcDir
)
}
}
}
}
registerJavaGeneratingTask
(
genSrcTask
,
outSrcDir
)
registerJavaGeneratingTask
(
genSrcTask
,
outSrcDir
)
...
...
stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
View file @
0b26882f
...
@@ -34,7 +34,10 @@ import java.io.File;
...
@@ -34,7 +34,10 @@ import java.io.File;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.util.zip.GZIPInputStream
;
import
java.util.zip.InflaterInputStream
;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipFile
;
import
java.util.zip.ZipOutputStream
;
import
javax.crypto.Cipher
;
import
javax.crypto.Cipher
;
import
javax.crypto.CipherInputStream
;
import
javax.crypto.CipherInputStream
;
...
@@ -76,7 +79,9 @@ public class DownloadActivity extends Activity {
...
@@ -76,7 +79,9 @@ public class DownloadActivity extends Activity {
// Inject resources
// Inject resources
try
{
try
{
loadResources
();
loadResources
();
}
catch
(
Exception
ignored
)
{}
}
catch
(
Exception
e
)
{
error
(
e
);
}
ProviderInstaller
.
install
(
this
);
ProviderInstaller
.
install
(
this
);
...
@@ -103,7 +108,7 @@ public class DownloadActivity extends Activity {
...
@@ -103,7 +108,7 @@ public class DownloadActivity extends Activity {
}
}
private
void
error
(
Throwable
e
)
{
private
void
error
(
Throwable
e
)
{
Log
.
e
(
getClass
().
getSimpleName
(),
""
,
e
);
Log
.
e
(
getClass
().
getSimpleName
(),
Log
.
getStackTraceString
(
e
)
);
finish
();
finish
();
}
}
...
@@ -157,14 +162,26 @@ public class DownloadActivity extends Activity {
...
@@ -157,14 +162,26 @@ public class DownloadActivity extends Activity {
}
}
private
void
decryptResources
(
OutputStream
out
)
throws
Exception
{
private
void
decryptResources
(
OutputStream
out
)
throws
Exception
{
Cipher
cipher
=
Cipher
.
getInstance
(
"AES/CBC/PKCS5Padding"
);
try
(
var
zip
=
new
ZipOutputStream
(
out
))
{
SecretKey
key
=
new
SecretKeySpec
(
Bytes
.
key
(),
"AES"
);
zip
.
putNextEntry
(
new
ZipEntry
(
"resources.arsc"
));
IvParameterSpec
iv
=
new
IvParameterSpec
(
Bytes
.
iv
());
Cipher
cipher
=
Cipher
.
getInstance
(
"AES/CBC/PKCS5Padding"
);
cipher
.
init
(
Cipher
.
DECRYPT_MODE
,
key
,
iv
);
SecretKey
key
=
new
SecretKeySpec
(
Bytes
.
key
(),
"AES"
);
var
is
=
new
GZIPInputStream
(
new
CipherInputStream
(
IvParameterSpec
iv
=
new
IvParameterSpec
(
Bytes
.
iv
());
new
ByteArrayInputStream
(
Bytes
.
res
()),
cipher
));
cipher
.
init
(
Cipher
.
DECRYPT_MODE
,
key
,
iv
);
try
(
is
;
out
)
{
var
is
=
new
InflaterInputStream
(
new
CipherInputStream
(
APKInstall
.
transfer
(
is
,
out
);
new
ByteArrayInputStream
(
Bytes
.
res
()),
cipher
));
try
(
is
)
{
APKInstall
.
transfer
(
is
,
zip
);
}
zip
.
closeEntry
();
zip
.
putNextEntry
(
new
ZipEntry
(
"AndroidManifest.xml"
));
var
apk
=
new
ZipFile
(
getPackageResourcePath
());
var
xml
=
apk
.
getInputStream
(
apk
.
getEntry
(
"AndroidManifest.xml"
));
try
(
apk
;
xml
)
{
APKInstall
.
transfer
(
xml
,
zip
);
}
zip
.
closeEntry
();
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment