chlwodud0123/testrepo
1
0
Fork 0
Code Issues Discussions Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ZipUtils Cleanup

Browse Source
This commit is contained in:
Konloch 2024-10-02 14:41:49 -06:00
parent a9beeeeaae
commit e456952f5c

AI 샘플 코드 생성 중입니다

Loading...
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/the/bytecode/club/bytecodeviewer/util/ZipUtils.java
View File

@ -46,53 +46,33 @@ public final class ZipUtils
String canonicalDestDir = new File(destinationDir).getCanonicalPath(); String canonicalDestDir = new File(destinationDir).getCanonicalPath();
if (!canonicalDestDir.endsWith(File.separator)) if (!canonicalDestDir.endsWith(File.separator))
{
canonicalDestDir += File.separator; canonicalDestDir += File.separator;
}
File file = new File(jarPath); try (JarFile jarFile = new JarFile(new File(jarPath)))
try (JarFile jar = new JarFile(file))
{ {
// fist get all directories,
// then make those directory on the destination Path
/*for (Enumeration<JarEntry> enums = jar.entries(); enums.hasMoreElements(); ) {
JarEntry entry = (JarEntry) enums.nextElement();
String fileName = destinationDir + File.separator + entry.getName();
File f = new File(fileName);
if (fileName.endsWith("/")) {
f.mkdirs();
}
}*/
//now create all files //now create all files
for (Enumeration<JarEntry> enums = jar.entries(); enums.hasMoreElements(); ) for (Enumeration<JarEntry> enums = jarFile.entries();
enums.hasMoreElements(); )
{ {
JarEntry entry = enums.nextElement(); JarEntry entry = enums.nextElement();
String fileName = destinationDir + File.separator + entry.getName(); String fileName = destinationDir + File.separator + entry.getName();
File f = new File(fileName); File file = new File(fileName);
if (!f.getCanonicalPath().startsWith(canonicalDestDir)) if (!file.getCanonicalPath().startsWith(canonicalDestDir))
{ {
System.out.println("Zip Slip exploit detected. Skipping entry " + entry.getName()); System.out.println("Zip Slip exploit detected. Skipping entry " + entry.getName());
continue; continue;
} }
File parent = f.getParentFile(); File parent = file.getParentFile();
if (!parent.exists()) if (!parent.exists())
{
parent.mkdirs(); parent.mkdirs();
}
if (!fileName.endsWith("/")) if (!fileName.endsWith("/"))
{ {
try (InputStream is = jar.getInputStream(entry); FileOutputStream fos = new FileOutputStream(f)) try (InputStream is = jarFile.getInputStream(entry); FileOutputStream fos = new FileOutputStream(file))
{ {
// write contents of 'is' to 'fos' // write contents of 'is' to 'fos'
while (is.available() > 0) while (is.available() > 0)
@ -117,6 +97,7 @@ public final class ZipUtils
try (FileInputStream in = new FileInputStream(inputFile)) try (FileInputStream in = new FileInputStream(inputFile))
{ {
int len; int len;
while ((len = in.read(buffer)) > 0) while ((len = in.read(buffer)) > 0)
{ {
zos.write(buffer, 0, len); zos.write(buffer, 0, len);
@ -153,9 +134,7 @@ public final class ZipUtils
File folder = new File(srcFile); File folder = new File(srcFile);
if (folder.isDirectory()) if (folder.isDirectory())
{
addFolderToZip(path, srcFile, zip, ignore); addFolderToZip(path, srcFile, zip, ignore);
}
else else
{ {
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];
@ -185,10 +164,11 @@ public final class ZipUtils
File folder = new File(srcFile); File folder = new File(srcFile);
String check = path.toLowerCase(); String check = path.toLowerCase();
//if(check.startsWith("decoded unknown") || check.startsWith("decoded lib") || check.startsWith("decoded //if(check.startsWith("decoded unknown") || check.startsWith("decoded lib") || check.startsWith("decoded
// assets") || check.startsWith("decoded original") || check.startsWith("decoded smali") || check.startsWith // assets") || check.startsWith("decoded original") || check.startsWith("decoded smali") || check.startsWith
// ("decoded apktool.yml")) // ("decoded apktool.yml"))
if (check.startsWith("decoded original") || check.startsWith("decoded smali") || check.startsWith("decoded " + "apktool.yml")) if (check.startsWith("decoded original") || check.startsWith("decoded smali") || check.startsWith("decoded apktool.yml"))
return; return;
//if(path.equals("original") || path.equals("classes.dex") || path.equals("apktool.yml")) //if(path.equals("original") || path.equals("classes.dex") || path.equals("apktool.yml"))