Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix 兼容 fingerprint.data 文件是否存在两种逻辑。修改 tms cmep 完整性保护文件名字。

Browse Source
This commit is contained in:
cheney 2026-05-21 14:05:02 +08:00
parent 29cdba33a0
commit 2be4034b49
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device-fingerprint-tool/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.sunyard.cisd</groupId> <groupId>com.sunyard.cisd</groupId>
<artifactId>device-fingerprint-tool</artifactId> <artifactId>device-fingerprint-tool</artifactId>
<version>1.0.2</version> <version>1.0.3</version>
<name>device-fingerprint-tool</name> <name>device-fingerprint-tool</name>
<description>设备指纹信息获取工具</description> <description>设备指纹信息获取工具</description>

24
device-fingerprint-tool/src/main/java/com/sunyard/cisd/device/tool/Main.java
View File

@ -3,6 +3,9 @@ package com.sunyard.cisd.device.tool;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.PublicKey; import java.security.PublicKey;
import java.util.Base64; import java.util.Base64;
import java.util.Map; import java.util.Map;
@ -41,7 +44,7 @@ public class Main {
public static final String[] CMEP_TARGETS = { public static final String[] CMEP_TARGETS = {
"/home/cmep4i/cmsp/CMEP-CMSP.jar", "/home/cmep4i/cmsp/CMEP-CMSP.jar",
"/home/cmep4i/cmtp/CMEP-CMSP.jar" "/home/cmep4i/cmtp/CMEP-CMTP.jar"
}; };
public static void main(String[] args) { public static void main(String[] args) {
@ -194,21 +197,24 @@ public class Main {
System.out.println("硬盘序列号: " + fingerprint.getHardDiskSerialNumber()); System.out.println("硬盘序列号: " + fingerprint.getHardDiskSerialNumber());
String plainText = buildPlainText(fingerprint); String plainText = buildPlainText(fingerprint);
System.out.println("\n当前拼接原文: " + plainText); // System.out.println("\n当前拼接原文: " + plainText);
String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
System.out.println("保存的拼接原文: " + savedPlainText);
byte[] signature = SM3Util.readFileBytes(SIGN_FILE); byte[] signature = SM3Util.readFileBytes(SIGN_FILE);
PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH); PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH);
boolean dataMatch = plainText.equals(savedPlainText);
boolean signatureVerified = SM2Util.verify(savedPlainText.getBytes(StandardCharsets.UTF_8), signature, publicKey); boolean signatureVerified = SM2Util.verify(plainText.getBytes(StandardCharsets.UTF_8), signature, publicKey);
System.out.println("\n=== 验证结果 ==="); System.out.println("\n=== 验证结果 ===");
System.out.println("设备信息匹配: " + dataMatch);
System.out.println("签名验证: " + signatureVerified); System.out.println("签名验证: " + signatureVerified);
System.out.println("总体验证: " + (dataMatch && signatureVerified)); if( Files.exists( Paths.get(FINGERPRINT_DATA_FILE)) ) {
String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
// System.out.println("保存的拼接原文: " + savedPlainText);
boolean dataMatch = plainText.equals(savedPlainText);
System.out.println("设备信息与保存的信息匹配: " + dataMatch);
}
// System.out.println("总体验证: " + (dataMatch && signatureVerified));
} }
private static void generateMAC() throws Exception { private static void generateMAC() throws Exception {

2
pom.xml
View File

@ -128,7 +128,7 @@
<dependency> <dependency>
<groupId>com.sunyard.cisd</groupId> <groupId>com.sunyard.cisd</groupId>
<artifactId>device-fingerprint-tool</artifactId> <artifactId>device-fingerprint-tool</artifactId>
<version>1.0.2</version> <version>1.0.3</version>
</dependency> </dependency>
</dependencies> </dependencies>

21
src/main/java/com/cisd/tms/modules/system/service/impl/SelfCheckServiceImpl.java
View File

@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
import java.io.File; import java.io.File;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.PublicKey; import java.security.PublicKey;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -153,22 +155,21 @@ public class SelfCheckServiceImpl implements SelfCheckService {
log.info("硬盘序列号: " + fingerprint.getHardDiskSerialNumber()); log.info("硬盘序列号: " + fingerprint.getHardDiskSerialNumber());
String plainText = buildPlainText(fingerprint); String plainText = buildPlainText(fingerprint);
log.info("\n当前拼接原文: " + plainText);
String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
log.info("保存的拼接原文: " + savedPlainText);
byte[] signature = SM3Util.readFileBytes(SIGN_FILE); byte[] signature = SM3Util.readFileBytes(SIGN_FILE);
PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH); PublicKey publicKey = SM2Util.loadPublicKey(FINGERPRINT_PUBLIC_KEY_PATH);
boolean signatureVerified = SM2Util.verify(plainText.getBytes(StandardCharsets.UTF_8), signature, publicKey);
boolean dataMatch = plainText.equals(savedPlainText);
boolean signatureVerified = SM2Util.verify(savedPlainText.getBytes(StandardCharsets.UTF_8), signature, publicKey);
log.info("\n=== 验证结果 ==="); log.info("\n=== 验证结果 ===");
log.info("设备信息匹配: " + dataMatch);
log.info("签名验证: " + signatureVerified); log.info("签名验证: " + signatureVerified);
log.info("总体验证: " + (dataMatch && signatureVerified)); if( Files.exists( Paths.get(FINGERPRINT_DATA_FILE)) ) {
return (dataMatch && signatureVerified); String savedPlainText = SM3Util.readFile(FINGERPRINT_DATA_FILE).trim();
// System.out.println("保存的拼接原文: " + savedPlainText);
boolean dataMatch = plainText.equals(savedPlainText);
log.info("设备信息与保存的信息匹配: " + dataMatch);
}
return signatureVerified;
} catch (Exception e) { } catch (Exception e) {
log.error("[ERROR] {} - {}", CHECK_DEVICE_FINGERPRINT, e.getMessage()); log.error("[ERROR] {} - {}", CHECK_DEVICE_FINGERPRINT, e.getMessage());
return false; return false;