Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flash module: ignore META-INF #8416

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

flash module: ignore META-INF #8416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions app/core/src/main/java/com/topjohnwu/magisk/core/download/DownloadEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ class DownloadEngine(
val stream = network.fetchFile(subject.url).toProgressStream(subject)
when (subject) {
is Subject.App -> handleApp(stream, subject)
is Subject.Module -> handleModule(stream, subject.file)
else -> stream.copyAndClose(subject.file.outputStream())
}
val activity = AppContext.foregroundActivity
Expand Down Expand Up @@ -307,33 +306,6 @@ class DownloadEngine(
}
}

private suspend fun handleModule(src: InputStream, file: Uri) {
val input = ZipInputStream(src)
val output = ZipOutputStream(file.outputStream())

withStreams(input, output) { zin, zout ->
zout.putNextEntry(ZipEntry("META-INF/"))
zout.putNextEntry(ZipEntry("META-INF/com/"))
zout.putNextEntry(ZipEntry("META-INF/com/google/"))
zout.putNextEntry(ZipEntry("META-INF/com/google/android/"))
zout.putNextEntry(ZipEntry("META-INF/com/google/android/update-binary"))
context.assets.open("module_installer.sh").use { it.copyAll(zout) }

zout.putNextEntry(ZipEntry("META-INF/com/google/android/updater-script"))
zout.write("#MAGISK\n".toByteArray())

zin.forEach { entry ->
val path = entry.name
if (path.isNotEmpty() && !path.startsWith("META-INF")) {
zout.putNextEntry(ZipEntry(path))
if (!entry.isDirectory) {
zin.copyAll(zout)
}
}
}
}
}

private class TeeOutputStream(
private val o1: OutputStream,
private val o2: OutputStream
Expand Down
12 changes: 3 additions & 9 deletions app/core/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,14 @@ open class FlashZip(
}
}

val isValid = try {
zipFile.unzip(installDir, "META-INF/com/google/android", true)
val script = File(installDir, "updater-script")
script.readText().contains("#MAGISK")
try {
val binary = File(installDir, "update-binary")
AppContext.assets.open("module_installer.sh").use { it.writeTo(binary) }
} catch (e: IOException) {
console.add("! Unzip error")
throw e
}

if (!isValid) {
console.add("! This zip is not a Magisk module!")
return false
}

console.add("- Installing ${mUri.displayName}")

return Shell.cmd("sh $installDir/update-binary dummy 1 \'$zipFile\'")
Expand Down
2 changes: 1 addition & 1 deletion scripts/util_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ install_module() {

# Extract prop file
unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2
[ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!"
[ ! -f $TMPDIR/module.prop ] && abort "! This zip is not a Magisk module!"

local MODDIRNAME=modules
$BOOTMODE && MODDIRNAME=modules_update
Expand Down