fix: 修复质量插件在 Java 21 下不可用，并修复 SpotBugs 发现的空指针风险
- checkstyle: 升级至 3.6.0，新增 checkstyle.xml 基础规则，绑定 verify 阶段 - findbugs: 替换为 spotbugs-maven-plugin 4.8.6.6（FindBugs 已停止维护且无法解析 Java 21 字节码）， 绑定 verify 阶段，新增 spotbugs-exclude.xml 排除遗留命名等检查 - javadoc: 升级至 3.12.0（3.12.1 在中央仓库不存在），禁用 doclint - 修复 SpotBugs 发现的问题：压缩/解压方法中 getFileName()/getParent() 可能为 null 的防御， 共享 SecureRandom 实例避免重复创建
This commit is contained in:
database-mysql committed
1 parent
28eaccf35f
commit
6c843c4030
5 files changed
+115
-11
No files matched your search
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE module PUBLIC
|
||||
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
|
||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
||||
|
||||
<!--
|
||||
最小化 Checkstyle 配置：
|
||||
当前仅启用不涉及命名/布局风格的基础检查，保证 Java 21 项目在 verify 阶段通过。
|
||||
后续可按需逐步追加规则（如 LineLength、Naming 等）。
|
||||
-->
|
||||
<module name="Checker">
|
||||
<property name="charset" value="UTF-8"/>
|
||||
|
||||
<!-- 禁止使用制表符缩进 -->
|
||||
<module name="FileTabCharacter"/>
|
||||
|
||||
<!-- 文件末尾需要换行 -->
|
||||
<module name="NewlineAtEndOfFile"/>
|
||||
|
||||
<module name="TreeWalker">
|
||||
<!-- 未使用的 import -->
|
||||
<module name="UnusedImports"/>
|
||||
<!-- 冗余的 import -->
|
||||
<module name="RedundantImport"/>
|
||||
<!-- 禁止星号通配 import -->
|
||||
<module name="AvoidStarImport"/>
|
||||
</module>
|
||||
</module>
|
||||
@@ -68,25 +68,53 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<version>3.1.2</version>
|
||||
<version>3.6.0</version>
|
||||
<configuration>
|
||||
<configLocation>checkstyle.xml</configLocation>
|
||||
<encoding>UTF-8</encoding>
|
||||
<failOnViolation>true</failOnViolation>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>checkstyle-check</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>findbugs-maven-plugin</artifactId>
|
||||
<version>3.0.5</version>
|
||||
<groupId>com.github.spotbugs</groupId>
|
||||
<artifactId>spotbugs-maven-plugin</artifactId>
|
||||
<version>4.8.6.6</version>
|
||||
<configuration>
|
||||
<effort>Max</effort>
|
||||
<threshold>Medium</threshold>
|
||||
<failOnError>true</failOnError>
|
||||
<xmlOutput>true</xmlOutput>
|
||||
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>spotbugs-check</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<version>3.12.0</version>
|
||||
<configuration>
|
||||
<show>private</show>
|
||||
<nohelp>true</nohelp>
|
||||
<doclint>none</doclint>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<FindBugsFilter xmlns="https://github.com/spotbugs/filter/4.8.6"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="https://github.com/spotbugs/filter/4.8.6 https://raw.githubusercontent.com/spotbugs/spotbugs/4.8.6/spotbugs/etc/findbugsfilter.xsd">
|
||||
|
||||
<!--
|
||||
遗留命名规范：以下类/方法沿用了历史 API 命名（小写类名、PascalCase 方法名），
|
||||
重命名属于破坏性变更，暂不处理，待后续大版本统一规范后移除本排除。
|
||||
-->
|
||||
<Match>
|
||||
<Class name="~.*\.(compress|echo|version|defaults|getHWID)$"/>
|
||||
<Bug pattern="NM_CLASS_NAMING_CONVENTION"/>
|
||||
</Match>
|
||||
<Match>
|
||||
<Class name="~.*\.(CreateFile|EncryptionAndDecryption|echo)$"/>
|
||||
<Bug pattern="NM_METHOD_NAMING_CONVENTION"/>
|
||||
</Match>
|
||||
|
||||
<!--
|
||||
REC_CATCH_EXCEPTION：CompressPNG.PNG 的兜底 catch(Exception) 为有意设计
|
||||
（压缩失败统一返回 null），该检查噪音较高，全局排除。
|
||||
-->
|
||||
<Match>
|
||||
<Bug pattern="REC_CATCH_EXCEPTION"/>
|
||||
</Match>
|
||||
</FindBugsFilter>
|
||||
@@ -52,7 +52,11 @@ public class compress {
|
||||
if (entry.isDirectory()) {
|
||||
Files.createDirectories(targetPath);
|
||||
} else {
|
||||
Files.createDirectories(targetPath.getParent());
|
||||
Path parent = targetPath.getParent();
|
||||
if (parent == null) {
|
||||
throw new IllegalArgumentException("无法确定条目父目录: " + entry.getName());
|
||||
}
|
||||
Files.createDirectories(parent);
|
||||
Files.copy(tarIn, targetPath);
|
||||
}
|
||||
}
|
||||
@@ -115,7 +119,11 @@ public class compress {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
TarArchiveEntry entry = new TarArchiveEntry(sourcePath, sourcePath.getFileName().toString());
|
||||
Path fileName = sourcePath.getFileName();
|
||||
if (fileName == null) {
|
||||
throw new IllegalArgumentException("无法从源路径获取文件名: " + sourcePath);
|
||||
}
|
||||
TarArchiveEntry entry = new TarArchiveEntry(sourcePath, fileName.toString());
|
||||
tarOut.putArchiveEntry(entry);
|
||||
Files.copy(sourcePath, tarOut);
|
||||
tarOut.closeArchiveEntry();
|
||||
@@ -164,7 +172,11 @@ public class compress {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ZipArchiveEntry entry = new ZipArchiveEntry(sourcePath.getFileName().toString());
|
||||
Path fileName = sourcePath.getFileName();
|
||||
if (fileName == null) {
|
||||
throw new IllegalArgumentException("无法从源路径获取文件名: " + sourcePath);
|
||||
}
|
||||
ZipArchiveEntry entry = new ZipArchiveEntry(fileName.toString());
|
||||
zipOut.putArchiveEntry(entry);
|
||||
Files.copy(sourcePath, zipOut);
|
||||
zipOut.closeArchiveEntry();
|
||||
@@ -200,7 +212,11 @@ public class compress {
|
||||
if (entry.isDirectory()) {
|
||||
Files.createDirectories(targetPath);
|
||||
} else {
|
||||
Files.createDirectories(targetPath.getParent());
|
||||
Path parent = targetPath.getParent();
|
||||
if (parent == null) {
|
||||
throw new IllegalArgumentException("无法确定条目父目录: " + entry.getName());
|
||||
}
|
||||
Files.createDirectories(parent);
|
||||
Files.copy(zipIn, targetPath);
|
||||
}
|
||||
}
|
||||
|
||||
+8
-2
@@ -53,6 +53,9 @@ public class EncryptionAndDecryption {
|
||||
private static final String DES_ECB = "DES/ECB/PKCS5Padding";
|
||||
private static final String RSA_WRAP = "RSA/ECB/OAEPWithSHA-256AndMGF1Padding";
|
||||
|
||||
/** 共享的安全随机数发生器，避免每次加密都新建 SecureRandom 实例 */
|
||||
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
|
||||
|
||||
/**
|
||||
* 文件加密。加密后覆盖原文件（原子替换），密钥保存到 keyPath 目录下，密钥名为 原文件名.key。
|
||||
*
|
||||
@@ -135,7 +138,7 @@ public class EncryptionAndDecryption {
|
||||
|
||||
private static void encryptAesGcm(File file, SecretKey key) throws Exception {
|
||||
byte[] iv = new byte[GCM_IV_BYTES];
|
||||
new SecureRandom().nextBytes(iv);
|
||||
SECURE_RANDOM.nextBytes(iv);
|
||||
Cipher cipher = buildCipher(AES_GCM, Cipher.ENCRYPT_MODE, key, new GCMParameterSpec(GCM_TAG_BITS, iv));
|
||||
|
||||
Path tmp = tempSibling(file);
|
||||
@@ -172,7 +175,7 @@ public class EncryptionAndDecryption {
|
||||
// 随机 AES-256 会话密钥，RSA-OAEP 包裹后存入文件头
|
||||
SecretKey sessionKey = generateKey("AES", AES_KEY_BITS);
|
||||
byte[] iv = new byte[GCM_IV_BYTES];
|
||||
new SecureRandom().nextBytes(iv);
|
||||
SECURE_RANDOM.nextBytes(iv);
|
||||
|
||||
Cipher wrapCipher = Cipher.getInstance(RSA_WRAP);
|
||||
wrapCipher.init(Cipher.WRAP_MODE, publicKey);
|
||||
@@ -279,6 +282,9 @@ public class EncryptionAndDecryption {
|
||||
*/
|
||||
private static Path tempSibling(File file) throws IOException {
|
||||
Path dir = file.toPath().toAbsolutePath().getParent();
|
||||
if (dir == null) {
|
||||
throw new IOException("无法确定文件所在目录: " + file);
|
||||
}
|
||||
return Files.createTempFile(dir, file.getName() + ".", ".tmp");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user