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
6f7c13b8
Commit
6f7c13b8
authored
Nov 03, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor JarMap
parent
e7d66850
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
108 additions
and
76 deletions
+108
-76
PatchAPK.kt
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
+1
-1
JarMap.java
signing/src/main/java/com/topjohnwu/signing/JarMap.java
+105
-73
SignAPK.java
signing/src/main/java/com/topjohnwu/signing/SignAPK.java
+1
-1
ZipSigner.java
signing/src/main/java/com/topjohnwu/signing/ZipSigner.java
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
View file @
6f7c13b8
...
...
@@ -118,7 +118,7 @@ object PatchAPK {
@JvmOverloads
fun
patch
(
apk
:
String
,
out
:
String
,
pkg
:
String
,
label
:
String
=
"Manager"
):
Boolean
{
try
{
val
jar
=
JarMap
(
apk
)
val
jar
=
JarMap
.
open
(
apk
)
val
je
=
jar
.
getJarEntry
(
Const
.
ANDROID_MANIFEST
)
val
xml
=
jar
.
getRawData
(
je
)
...
...
signing/src/main/java/com/topjohnwu/signing/JarMap.java
View file @
6f7c13b8
...
...
@@ -15,117 +15,149 @@ import java.util.jar.Manifest;
import
java.util.zip.ZipEntry
;
import
java.util.zip.ZipFile
;
/*
* A universal random access interface for both JarFile and JarInputStream
*
* In the case when JarInputStream is provided to constructor, the whole stream
* will be loaded into memory for random access purposes.
* On the other hand, when a JarFile is provided, it simply works as a wrapper.
* */
public
class
JarMap
implements
Closeable
{
private
JarFile
jarFile
;
private
JarInputStream
jis
;
private
LinkedHashMap
<
String
,
JarEntry
>
bufMap
;
private
Manifest
manifest
;
public
JarMap
(
File
file
)
throws
IOException
{
this
(
file
,
true
);
}
public
abstract
class
JarMap
implements
Closeable
{
public
JarMap
(
File
file
,
boolean
verify
)
throws
IOException
{
this
(
file
,
verify
,
ZipFile
.
OPEN_READ
);
}
LinkedHashMap
<
String
,
JarEntry
>
entryMap
;
public
JarMap
(
File
file
,
boolean
verify
,
int
mode
)
throws
IOException
{
jarFile
=
new
JarFile
(
file
,
verify
,
mode
);
manifest
=
jarFile
.
getManifest
();
public
static
JarMap
open
(
String
file
)
throws
IOException
{
return
new
FileMap
(
new
File
(
file
),
true
,
ZipFile
.
OPEN_READ
);
}
public
JarMap
(
String
name
)
throws
IOException
{
this
(
new
File
(
name
)
);
public
static
JarMap
open
(
File
file
,
boolean
verify
)
throws
IOException
{
return
new
FileMap
(
file
,
verify
,
ZipFile
.
OPEN_READ
);
}
public
JarMap
(
String
nam
e
,
boolean
verify
)
throws
IOException
{
this
(
new
File
(
name
),
verify
);
public
static
JarMap
open
(
String
fil
e
,
boolean
verify
)
throws
IOException
{
return
new
FileMap
(
new
File
(
file
),
verify
,
ZipFile
.
OPEN_READ
);
}
public
JarMap
(
InputStream
is
)
throws
IOException
{
this
(
is
,
true
);
}
public
JarMap
(
InputStream
is
,
boolean
verify
)
throws
IOException
{
jis
=
new
JarInputStream
(
is
,
verify
);
bufMap
=
new
LinkedHashMap
<>();
JarEntry
entry
;
while
((
entry
=
jis
.
getNextJarEntry
())
!=
null
)
{
bufMap
.
put
(
entry
.
getName
(),
new
JarMapEntry
(
entry
,
jis
));
}
manifest
=
jis
.
getManifest
();
public
static
JarMap
open
(
InputStream
is
,
boolean
verify
)
throws
IOException
{
return
new
StreamMap
(
is
,
verify
);
}
public
File
getFile
()
{
return
jarFile
==
null
?
null
:
new
File
(
jarFile
.
getName
())
;
return
null
;
}
public
Manifest
getManifest
()
{
return
manifest
;
}
public
abstract
Manifest
getManifest
()
throws
IOException
;
public
InputStream
getInputStream
(
ZipEntry
ze
)
throws
IOException
{
if
(
bufMap
!=
null
)
{
JarMapEntry
e
=
(
JarMapEntry
)
bufMap
.
get
(
ze
.
getName
());
if
(
e
!=
null
)
return
e
.
data
.
getInputStream
();
}
return
jarFile
.
getInputStream
(
ze
);
JarMapEntry
e
=
getMapEntry
(
ze
.
getName
());
return
e
!=
null
?
e
.
data
.
getInputStream
()
:
null
;
}
public
OutputStream
getOutputStream
(
ZipEntry
ze
)
{
manifest
=
null
;
/* Invalidate the manifest */
if
(
bufMap
==
null
)
bufMap
=
new
LinkedHashMap
<>();
if
(
entryMap
==
null
)
entryMap
=
new
LinkedHashMap
<>();
JarMapEntry
e
=
new
JarMapEntry
(
ze
.
getName
());
buf
Map
.
put
(
ze
.
getName
(),
e
);
entry
Map
.
put
(
ze
.
getName
(),
e
);
return
e
.
data
;
}
public
byte
[]
getRawData
(
ZipEntry
ze
)
throws
IOException
{
if
(
bufMap
!=
null
)
{
JarMapEntry
e
=
(
JarMapEntry
)
bufMap
.
get
(
ze
.
getName
());
if
(
e
!=
null
)
return
e
.
data
.
toByteArray
();
}
ByteArrayStream
bytes
=
new
ByteArrayStream
();
bytes
.
readFrom
(
jarFile
.
getInputStream
(
ze
));
return
bytes
.
toByteArray
();
JarMapEntry
e
=
getMapEntry
(
ze
.
getName
());
return
e
!=
null
?
e
.
data
.
toByteArray
()
:
null
;
}
public
Enumeration
<
JarEntry
>
entries
()
{
return
jarFile
==
null
?
Collections
.
enumeration
(
bufMap
.
values
())
:
jarFile
.
entries
();
}
public
abstract
Enumeration
<
JarEntry
>
entries
();
public
ZipEntry
getEntry
(
String
name
)
{
public
final
ZipEntry
getEntry
(
String
name
)
{
return
getJarEntry
(
name
);
}
public
JarEntry
getJarEntry
(
String
name
)
{
JarEntry
e
=
jarFile
==
null
?
bufMap
.
get
(
name
)
:
jarFile
.
getJarEntry
(
name
);
if
(
e
==
null
&&
bufMap
!=
null
)
return
bufMap
.
get
(
name
);
return
getMapEntry
(
name
);
}
JarMapEntry
getMapEntry
(
String
name
)
{
JarMapEntry
e
=
null
;
if
(
entryMap
!=
null
)
e
=
(
JarMapEntry
)
entryMap
.
get
(
name
);
return
e
;
}
@Override
public
void
close
()
throws
IOException
{
if
(
jarFile
!=
null
)
private
static
class
FileMap
extends
JarMap
{
private
JarFile
jarFile
;
FileMap
(
File
file
,
boolean
verify
,
int
mode
)
throws
IOException
{
jarFile
=
new
JarFile
(
file
,
verify
,
mode
);
}
@Override
public
File
getFile
()
{
return
new
File
(
jarFile
.
getName
());
}
@Override
public
Manifest
getManifest
()
throws
IOException
{
return
jarFile
.
getManifest
();
}
@Override
public
InputStream
getInputStream
(
ZipEntry
ze
)
throws
IOException
{
InputStream
is
=
super
.
getInputStream
(
ze
);
return
is
!=
null
?
is
:
jarFile
.
getInputStream
(
ze
);
}
@Override
public
byte
[]
getRawData
(
ZipEntry
ze
)
throws
IOException
{
byte
[]
b
=
super
.
getRawData
(
ze
);
if
(
b
!=
null
)
return
b
;
ByteArrayStream
bytes
=
new
ByteArrayStream
();
bytes
.
readFrom
(
jarFile
.
getInputStream
(
ze
));
return
bytes
.
toByteArray
();
}
@Override
public
Enumeration
<
JarEntry
>
entries
()
{
return
jarFile
.
entries
();
}
@Override
public
JarEntry
getJarEntry
(
String
name
)
{
JarEntry
e
=
getMapEntry
(
name
);
return
e
!=
null
?
e
:
jarFile
.
getJarEntry
(
name
);
}
@Override
public
void
close
()
throws
IOException
{
jarFile
.
close
();
else
}
}
private
static
class
StreamMap
extends
JarMap
{
private
JarInputStream
jis
;
StreamMap
(
InputStream
is
,
boolean
verify
)
throws
IOException
{
jis
=
new
JarInputStream
(
is
,
verify
);
entryMap
=
new
LinkedHashMap
<>();
JarEntry
entry
;
while
((
entry
=
jis
.
getNextJarEntry
())
!=
null
)
{
entryMap
.
put
(
entry
.
getName
(),
new
JarMapEntry
(
entry
,
jis
));
}
}
@Override
public
Manifest
getManifest
()
{
return
jis
.
getManifest
();
}
@Override
public
Enumeration
<
JarEntry
>
entries
()
{
return
Collections
.
enumeration
(
entryMap
.
values
());
}
@Override
public
void
close
()
throws
IOException
{
jis
.
close
();
}
}
private
static
class
JarMapEntry
extends
JarEntry
{
ByteArrayStream
data
;
JarMapEntry
(
JarEntry
je
,
InputStream
is
)
{
...
...
signing/src/main/java/com/topjohnwu/signing/SignAPK.java
View file @
6f7c13b8
...
...
@@ -72,7 +72,7 @@ public class SignAPK {
ZipAdjust
.
adjust
(
temp1
,
temp2
);
try
(
JarMap
map
=
new
JarMap
(
temp2
,
false
))
{
try
(
JarMap
map
=
JarMap
.
open
(
temp2
,
false
))
{
sign
(
cert
,
key
,
map
,
output
,
true
);
}
}
finally
{
...
...
signing/src/main/java/com/topjohnwu/signing/ZipSigner.java
View file @
6f7c13b8
...
...
@@ -65,7 +65,7 @@ public class ZipSigner {
Security
.
insertProviderAt
(
new
BouncyCastleProvider
(),
1
);
try
(
JarMap
in
=
new
JarMap
(
args
[
args
.
length
-
2
],
false
);
try
(
JarMap
in
=
JarMap
.
open
(
args
[
args
.
length
-
2
],
false
);
OutputStream
out
=
new
FileOutputStream
(
args
[
args
.
length
-
1
]))
{
if
(
args
.
length
==
2
)
{
sign
(
in
,
out
);
...
...
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