1. 整理目录结构

2. 增加正则表达式/Ant表达式过滤器和“非”not逻辑运算过滤器 3. 将XEntryFilters工具类整合在XKit类中 4. 缺省情况下Spring-Boot JAR包加密的资源只限定在BOOT-INF/classes/下
core-lib · Jan 23, 2019 · 0844a38 · 0844a38
1 parent c4add5c
commit 0844a38
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 32 deletions.
diff --git a/src/main/java/io/xjar/boot/XBootDecryptor.java b/src/main/java/io/xjar/boot/XBootDecryptor.java
@@ -21,20 +21,18 @@
  * 2018/11/22 15:27
  */
 public class XBootDecryptor extends XEntryDecryptor<JarArchiveEntry> implements XDecryptor, XConstants {
-    // 安全过滤器，避免由于用户自定义过滤器时把其他无关资源加密了造成无法运行
-    private final XEntryFilter<JarArchiveEntry> safeFilter = new XBootClassesFilter();
     private final int level;
 
     public XBootDecryptor(XDecryptor xEncryptor) {
-        this(xEncryptor, null);
+        this(xEncryptor, new XBootClassesFilter());
     }
 
     public XBootDecryptor(XDecryptor xDecryptor, XEntryFilter<JarArchiveEntry> filter) {
         this(xDecryptor, Deflater.DEFLATED, filter);
     }
 
     public XBootDecryptor(XDecryptor xEncryptor, int level) {
-        this(xEncryptor, level, null);
+        this(xEncryptor, level, new XBootClassesFilter());
     }
 
     public XBootDecryptor(XDecryptor xDecryptor, int level, XEntryFilter<JarArchiveEntry> filter) {
@@ -121,8 +119,4 @@ public void decrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
         }
     }
 
-    @Override
-    public boolean filtrate(JarArchiveEntry entry) {
-        return super.filtrate(entry) && safeFilter.filtrate(entry);
-    }
 }
diff --git a/src/main/java/io/xjar/boot/XBootEncryptor.java b/src/main/java/io/xjar/boot/XBootEncryptor.java
@@ -23,20 +23,18 @@
  * 2018/11/22 15:27
  */
 public class XBootEncryptor extends XEntryEncryptor<JarArchiveEntry> implements XEncryptor, XConstants {
-    // 安全过滤器，避免由于用户自定义过滤器时把其他无关资源加密了造成无法运行
-    private final XEntryFilter<JarArchiveEntry> safeFilter = new XBootClassesFilter();
     private final int level;
 
     public XBootEncryptor(XEncryptor xEncryptor) {
-        this(xEncryptor, null);
+        this(xEncryptor, new XBootClassesFilter());
     }
 
     public XBootEncryptor(XEncryptor xEncryptor, XEntryFilter<JarArchiveEntry> filter) {
         this(xEncryptor, Deflater.DEFLATED, filter);
     }
 
     public XBootEncryptor(XEncryptor xEncryptor, int level) {
-        this(xEncryptor, level, null);
+        this(xEncryptor, level, new XBootClassesFilter());
     }
 
     public XBootEncryptor(XEncryptor xEncryptor, int level, XEntryFilter<JarArchiveEntry> filter) {
@@ -150,8 +148,4 @@ public void encrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
         }
     }
 
-    @Override
-    public boolean filtrate(JarArchiveEntry entry) {
-        return super.filtrate(entry) && safeFilter.filtrate(entry);
-    }
 }
diff --git a/src/main/java/io/xjar/jar/XJarDecryptor.java b/src/main/java/io/xjar/jar/XJarDecryptor.java
@@ -101,4 +101,8 @@ public void decrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
         }
     }
 
+    @Override
+    public boolean filtrate(JarArchiveEntry entry) {
+        return super.filtrate(entry) && !entry.getName().equals(META_INF_MANIFEST);
+    }
 }
diff --git a/src/main/java/io/xjar/war/XWarDecryptor.java b/src/main/java/io/xjar/war/XWarDecryptor.java
@@ -17,20 +17,18 @@
  * 2018/11/22 15:27
  */
 public class XWarDecryptor extends XEntryDecryptor<JarArchiveEntry> implements XDecryptor, XConstants {
-    // 安全过滤器，避免由于用户自定义过滤器时把其他无关资源加密了造成无法运行
-    private final XEntryFilter<JarArchiveEntry> safeFilter = new XWarAllFilter();
     private final int level;
 
     public XWarDecryptor(XDecryptor xEncryptor) {
-        this(xEncryptor, null);
+        this(xEncryptor, new XWarClassesFilter());
     }
 
     public XWarDecryptor(XDecryptor xDecryptor, XEntryFilter<JarArchiveEntry> filter) {
         this(xDecryptor, Deflater.DEFLATED, filter);
     }
 
     public XWarDecryptor(XDecryptor xEncryptor, int level) {
-        this(xEncryptor, level, null);
+        this(xEncryptor, level, new XWarClassesFilter());
     }
 
     public XWarDecryptor(XDecryptor xDecryptor, int level, XEntryFilter<JarArchiveEntry> filter) {
@@ -98,8 +96,4 @@ public void decrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
         }
     }
 
-    @Override
-    public boolean filtrate(JarArchiveEntry entry) {
-        return super.filtrate(entry) && safeFilter.filtrate(entry);
-    }
 }
diff --git a/src/main/java/io/xjar/war/XWarEncryptor.java b/src/main/java/io/xjar/war/XWarEncryptor.java
@@ -19,20 +19,18 @@
  * 2018/11/22 15:27
  */
 public class XWarEncryptor extends XEntryEncryptor<JarArchiveEntry> implements XEncryptor, XConstants {
-    // 安全过滤器，避免由于用户自定义过滤器时把其他无关资源加密了造成无法运行
-    private final XEntryFilter<JarArchiveEntry> safeFilter = new XWarAllFilter();
     private final int level;
 
     public XWarEncryptor(XEncryptor xEncryptor) {
-        this(xEncryptor, null);
+        this(xEncryptor, new XWarClassesFilter());
     }
 
     public XWarEncryptor(XEncryptor xEncryptor, XEntryFilter<JarArchiveEntry> filter) {
         this(xEncryptor, Deflater.DEFLATED, filter);
     }
 
     public XWarEncryptor(XEncryptor xEncryptor, int level) {
-        this(xEncryptor, level, null);
+        this(xEncryptor, level, new XWarClassesFilter());
     }
 
     public XWarEncryptor(XEncryptor xEncryptor, int level, XEntryFilter<JarArchiveEntry> filter) {
@@ -121,8 +119,4 @@ public void encrypt(XKey key, InputStream in, OutputStream out) throws IOExcepti
         }
     }
 
-    @Override
-    public boolean filtrate(JarArchiveEntry entry) {
-        return super.filtrate(entry) && safeFilter.filtrate(entry);
-    }
 }