From bbee7f879e32e3ca222f0ab51e406040e4f029fe Mon Sep 17 00:00:00 2001 From: ChessNineeee <709030194@qq.com> Date: Wed, 14 Apr 2021 16:51:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:IdentifyManager=E7=9A=84=E5=B0=8Fbug?= =?UTF-8?q?=EF=BC=88=E5=BC=82=E5=B8=B8=E5=80=BC=E5=88=A4=E6=96=AD=EF=BC=89?= =?UTF-8?q?=20fix:=E5=BC=95=E5=85=A5mgmt.Exception(=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF)=20add:IdentifyManager?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/component/LpPacketHeader.java | 2 +- src/main/java/encoding/SelfEncodingBase.java | 5 +- .../certificate/cert/CertUtils.java | 3 + .../identity/persist/sqlite/Sqlite.java | 3 + src/main/java/packet/CPacket.java | 3 +- src/main/java/packet/Data.java | 3 +- src/main/java/packet/Interest.java | 3 +- src/main/java/security/IdentifyManager.java | 28 +- src/test/java/component/KeyLocatorTest.java | 3 +- .../java/component/SignatureTypeTest.java | 7 +- .../minsecurity/identity/TestIdentity.java | 37 ++ src/test/java/others/TestCallBack.java | 3 +- .../java/security/IdentifyManagerTest.java | 330 ++++++++++++++++++ 13 files changed, 417 insertions(+), 13 deletions(-) create mode 100644 src/test/java/security/IdentifyManagerTest.java diff --git a/src/main/java/component/LpPacketHeader.java b/src/main/java/component/LpPacketHeader.java index ba63c34..30a5c77 100644 --- a/src/main/java/component/LpPacketHeader.java +++ b/src/main/java/component/LpPacketHeader.java @@ -1,6 +1,6 @@ package component; -import com.sun.org.apache.regexp.internal.RE; +// import com.sun.org.apache.regexp.internal.RE; import encoding.*; import packet.LpPacket; diff --git a/src/main/java/encoding/SelfEncodingBase.java b/src/main/java/encoding/SelfEncodingBase.java index 411091e..3450bb9 100644 --- a/src/main/java/encoding/SelfEncodingBase.java +++ b/src/main/java/encoding/SelfEncodingBase.java @@ -2,6 +2,7 @@ package encoding; import component.CanBePrefix; import component.ComponentException; +import mgmt.MgmtException; import packet.PacketException; /* @@ -46,7 +47,7 @@ public class SelfEncodingBase { * @param iEncodingAble * @return */ - public Block selfWireEncode(IEncodingAble iEncodingAble) throws EncoderException, BlockException, ComponentException, PacketException { + public Block selfWireEncode(IEncodingAble iEncodingAble) throws EncoderException, BlockException, ComponentException, PacketException, MgmtException { // this.setiEncodingAble(iEncodingAble); if((this.rawBlock!=null)&&this.rawBlock.isValid()){ return this.rawBlock; @@ -66,7 +67,7 @@ public class SelfEncodingBase { * @param iEncodingAble * @return */ - private Block easyEncoder(IEncodingAble iEncodingAble) throws PacketException, ComponentException, EncoderException, BlockException { + private Block easyEncoder(IEncodingAble iEncodingAble) throws PacketException, ComponentException, EncoderException, BlockException, MgmtException { Encoder encoder=new Encoder(); // 首先测量目标 TLV 的大小 diff --git a/src/main/java/minsecurity/certificate/cert/CertUtils.java b/src/main/java/minsecurity/certificate/cert/CertUtils.java index 25b1188..b6e5fd7 100644 --- a/src/main/java/minsecurity/certificate/cert/CertUtils.java +++ b/src/main/java/minsecurity/certificate/cert/CertUtils.java @@ -246,6 +246,9 @@ public class CertUtils { * @date 2021/3/7 **/ public static String toPem(Certificate certificate, byte[] passwd, int symAlgoMode) throws CertException, NoSuchPaddingException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, NoSuchProviderException, InvalidKeyException { + // 证书为空 返回空字符串 + if (certificate == null) + return ""; if(certificate.getSignature() == null){ throw new CertException("该证书未签名"); } diff --git a/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java b/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java index a9426a4..bc949d0 100644 --- a/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java +++ b/src/main/java/minsecurity/identity/persist/sqlite/Sqlite.java @@ -134,6 +134,9 @@ public class Sqlite { */ public Connection getConn() throws Exception { Connection c = null; + // 当未打开数据库获取连接时打开默认数据库获取连接 + if ("".equals(db_path)) + this.openDefault(); try{ String real_db_file = db_path + db_file; // Class.forName("org.sqlite.JDBC"); diff --git a/src/main/java/packet/CPacket.java b/src/main/java/packet/CPacket.java index 2fd0696..a340a5d 100644 --- a/src/main/java/packet/CPacket.java +++ b/src/main/java/packet/CPacket.java @@ -3,6 +3,7 @@ package packet; import com.sun.xml.internal.ws.api.message.Packet; import component.*; import encoding.*; +import mgmt.MgmtException; /* * @Author: Wang Feng @@ -177,7 +178,7 @@ public class CPacket implements InteractWithField, IEncodingAble { minPacket.identifierField.addIdentifier(dstIdentifierWrapper); return true; - } catch (EncoderException | BlockException | ComponentException e) { + } catch (EncoderException | BlockException | ComponentException | MgmtException e) { throw new PacketException("CPacket.fillDataToFields: " + e.getMessage()); } } diff --git a/src/main/java/packet/Data.java b/src/main/java/packet/Data.java index 9403840..de52dee 100644 --- a/src/main/java/packet/Data.java +++ b/src/main/java/packet/Data.java @@ -2,6 +2,7 @@ package packet; import component.*; import encoding.*; +import mgmt.MgmtException; /* * @Author: Wang Feng @@ -170,7 +171,7 @@ public class Data implements IEncodingAble, InteractWithField { } minPacket.identifierField.addIdentifier(identifierWrapper); return true; - } catch (EncoderException | BlockException | ComponentException e) { + } catch (EncoderException | BlockException | ComponentException | MgmtException e) { throw new PacketException("Data.fillDataToFields: " + e.getMessage()); } } diff --git a/src/main/java/packet/Interest.java b/src/main/java/packet/Interest.java index 0215a00..902c2a1 100644 --- a/src/main/java/packet/Interest.java +++ b/src/main/java/packet/Interest.java @@ -2,6 +2,7 @@ package packet; import component.*; import encoding.*; +import mgmt.MgmtException; /* * @Author: Wang Feng @@ -254,7 +255,7 @@ public class Interest implements InteractWithField, IEncodingAble { minPacket.identifierField.addIdentifier(identifierWrapper); return true; - } catch (EncoderException | BlockException | ComponentException e) { + } catch (EncoderException | BlockException | ComponentException | MgmtException e) { throw new PacketException("Interest.fillDataToFields: " + e.getMessage()); } } diff --git a/src/main/java/security/IdentifyManager.java b/src/main/java/security/IdentifyManager.java index 3fde6c2..d586852 100644 --- a/src/main/java/security/IdentifyManager.java +++ b/src/main/java/security/IdentifyManager.java @@ -77,6 +77,8 @@ public class IdentifyManager { * @date 2021/3/11 **/ public Identity getIdentityByName(String name){ + if (name == null) + return null; return identifies.get(name); } @@ -90,6 +92,12 @@ public class IdentifyManager { * @date 2021/3/11 **/ public boolean deleteIdentityByName(String name, boolean commit) throws Exception { + if (name == null) + return false; + // 内存中不存在该身份 不去数据库中操作 + if (!this.identifies.containsKey(name)) + return false; + // 从内存中删除掉它 this.identifies.remove(name); // 从sqlite中删除掉它 @@ -110,7 +118,9 @@ public class IdentifyManager { * @date 2021/3/11 **/ public boolean saveIdentity(Identity newIdentity, boolean force, boolean commit) throws Exception { - // identifies.con + if (newIdentity == null) + return false; + if(identifies.containsKey(newIdentity.getName()) && !force) { return false; } @@ -140,6 +150,9 @@ public class IdentifyManager { * @date 2021/3/11 **/ public Identity createIdentityByNameAndKeyParam(String name, KeyParam keyParam, String passwd, boolean commit) throws Exception { + if (name == null || keyParam == null) + return null; + if(identifies.containsKey(name)){ return null; } @@ -189,8 +202,17 @@ public class IdentifyManager { public boolean setDefaultIdentity(Identity identity, boolean commit) throws Exception { if (identity == null) return false; - this.defaultIdentity = identity; + + // 如果身份不存在，则先将其存储到内存与数据库再设置默认身份 + if (!identifies.containsKey(identity.getName())){ + saveIdentity(identity, true, true); + // 保存成功后缓存到内存中 + identifies.put(identity.getName(), identity); + } + Persist.setDefaultIdentityByNameInStorage(identity.getName()); + // 数据库设置成功后再设置内存中数据 + this.defaultIdentity = identity; return true; } @@ -202,6 +224,8 @@ public class IdentifyManager { * @date 2021/3/11 **/ public boolean existIdentity(String name){ + if (name == null) + return false; return identifies.containsKey(name); } diff --git a/src/test/java/component/KeyLocatorTest.java b/src/test/java/component/KeyLocatorTest.java index a1a226b..d529ab1 100644 --- a/src/test/java/component/KeyLocatorTest.java +++ b/src/test/java/component/KeyLocatorTest.java @@ -1,6 +1,7 @@ package component; import encoding.*; +import mgmt.MgmtException; import org.checkerframework.checker.units.qual.K; import org.junit.Test; import packet.PacketException; @@ -86,7 +87,7 @@ public class KeyLocatorTest { } @Test - public void TestKeyLocator_WireDecode() throws ComponentException, BlockException, EncoderException, PacketException { + public void TestKeyLocator_WireDecode() throws ComponentException, BlockException, EncoderException, PacketException, MgmtException { Identifier gotIdentifier=new Identifier("/min/pku/111"); KeyLocator gotKey=new KeyLocator(gotIdentifier); System.out.println(gotKey.getIdentifier().toUri()); diff --git a/src/test/java/component/SignatureTypeTest.java b/src/test/java/component/SignatureTypeTest.java index f835bc0..3b523c0 100644 --- a/src/test/java/component/SignatureTypeTest.java +++ b/src/test/java/component/SignatureTypeTest.java @@ -1,6 +1,7 @@ package component; import encoding.*; +import mgmt.MgmtException; import org.junit.Test; import packet.PacketException; @@ -35,7 +36,7 @@ public class SignatureTypeTest { } @Test - public void TestCreateSignatureTypeByValue() throws PacketException, EncoderException, BlockException, ComponentException { + public void TestCreateSignatureTypeByValue() throws PacketException, EncoderException, BlockException, ComponentException, MgmtException { SignatureAlgorithm value=new SignatureAlgorithm(0); SignatureType got=new SignatureType(value); System.out.println(got.getValue().getSignatureAlgorithm()); @@ -44,7 +45,7 @@ public class SignatureTypeTest { } @Test - public void TestSignatureType_WireEncode() throws PacketException, EncoderException, BlockException, ComponentException { + public void TestSignatureType_WireEncode() throws PacketException, EncoderException, BlockException, ComponentException, MgmtException { SignatureAlgorithm value=new SignatureAlgorithm(0); SignatureType got=new SignatureType(value); System.out.println(got.getValue().getSignatureAlgorithm()); @@ -58,7 +59,7 @@ public class SignatureTypeTest { } @Test - public void TestCreateSignatureTypeByValue2() throws PacketException, EncoderException, BlockException, ComponentException { + public void TestCreateSignatureTypeByValue2() throws PacketException, EncoderException, BlockException, ComponentException, MgmtException { SignatureAlgorithm value=new SignatureAlgorithm(0); SignatureType got=new SignatureType(value); System.out.println(got.getValue().getSignatureAlgorithm()); diff --git a/src/test/java/minsecurity/identity/TestIdentity.java b/src/test/java/minsecurity/identity/TestIdentity.java index f1b4346..8cfe35f 100644 --- a/src/test/java/minsecurity/identity/TestIdentity.java +++ b/src/test/java/minsecurity/identity/TestIdentity.java @@ -5,6 +5,7 @@ import minsecurity.certificate.cert.CertUtils; import minsecurity.certificate.cert.Certificate; import minsecurity.crypto.TestSM2; import minsecurity.crypto.sm2.SM2Base; +import minsecurity.crypto.sm2.SM2KeyPair; import minsecurity.crypto.sm2.SM2PrivateKey; import minsecurity.crypto.sm2.SM2PublicKey; import org.bouncycastle.crypto.AsymmetricCipherKeyPair; @@ -25,6 +26,42 @@ import org.slf4j.LoggerFactory; public class TestIdentity { private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestIdentity.class); + /** + * 随机生成身份数据 + * @return Identity + */ + private Identity createRandomIdentity() throws Exception{ + // 测试PersistIdentity + SM2KeyPair pair = SM2KeyPair.generateKeyPair(); + Identity identity = new Identity(); + identity.setName("wzq"+Math.random()); + KeyParam keyParam = new KeyParam(); + keyParam.PublicKeyAlgorithm = 0; + keyParam.SignatureAlgorithm = 0; + identity.setKeyParam(keyParam); + identity.setPrikey(pair.getSm2PrivateKey()); + identity.setPubkey(pair.getSm2PublicKey()); + identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); + identity.lock("0123456789abcdef", Common.SM4ECB); + Certificate cert = new Certificate(); + cert.setVersion(1); + cert.setSerialNumber(1); + cert.setPublicKey(pair.getSm2PublicKey()); + cert.setSignatureAlgorithm(Common.SM3withSM2); // TODO 名字有误？ SM2withSM3? + cert.setPublicKeyAlgorithm(Common.SM2); + cert.setIssueTo("root"); + cert.setIssuer("root"); + long timestamp = System.currentTimeMillis() / 1000; + cert.setTimestamp(timestamp); // 10bit timestamp + cert.setNotAfter(timestamp); // 10bit timestamp + cert.setNotBefore(timestamp + 1000); // 10bit timestamp + cert.setKeyUsage(Common.CertSign); + cert.setCA(true); + CertUtils.signCert(cert, pair.getSm2PrivateKey()); + + identity.setCert(cert); + return identity; + } @Test public void testIdentity1() throws Exception { diff --git a/src/test/java/others/TestCallBack.java b/src/test/java/others/TestCallBack.java index 48a3ae5..d21b282 100644 --- a/src/test/java/others/TestCallBack.java +++ b/src/test/java/others/TestCallBack.java @@ -6,6 +6,7 @@ import encoding.Block; import encoding.BlockException; import encoding.EncoderException; import encoding.SelfEncodingBase; +import mgmt.MgmtException; import packet.PacketException; /* @@ -16,7 +17,7 @@ import packet.PacketException; * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 */ public class TestCallBack { - public static void main(String[] args) throws EncoderException, BlockException, PacketException, ComponentException { + public static void main(String[] args) throws EncoderException, BlockException, PacketException, ComponentException, MgmtException { CanBePrefix canBePrefix=new CanBePrefix(); Block block=new SelfEncodingBase().selfWireEncode(canBePrefix); } diff --git a/src/test/java/security/IdentifyManagerTest.java b/src/test/java/security/IdentifyManagerTest.java new file mode 100644 index 0000000..57b16ed --- /dev/null +++ b/src/test/java/security/IdentifyManagerTest.java @@ -0,0 +1,330 @@ +package security; + +import minsecurity.Common; +import minsecurity.certificate.cert.CertUtils; +import minsecurity.certificate.cert.Certificate; +import minsecurity.crypto.sm2.SM2KeyPair; +import minsecurity.identity.Identity; +import minsecurity.identity.KeyParam; +import minsecurity.identity.TestIdentity; +import minsecurity.identity.persist.sqlite.Sqlite; +import org.junit.Test; +import org.slf4j.LoggerFactory; + +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +public class IdentifyManagerTest { + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestIdentity.class); + /** + * 随机生成身份数据 + * @return Identity + */ + private Identity createRandomIdentity() throws Exception{ + // 测试PersistIdentity + SM2KeyPair pair = SM2KeyPair.generateKeyPair(); + Identity identity = new Identity(); + identity.setName("wzq"+Math.random()); + KeyParam keyParam = new KeyParam(); + keyParam.PublicKeyAlgorithm = 0; + keyParam.SignatureAlgorithm = 0; + identity.setKeyParam(keyParam); + identity.setPrikey(pair.getSm2PrivateKey()); + identity.setPubkey(pair.getSm2PublicKey()); + identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); + identity.lock("0123456789abcdef", Common.SM4ECB); + Certificate cert = new Certificate(); + cert.setVersion(1); + cert.setSerialNumber(1); + cert.setPublicKey(pair.getSm2PublicKey()); + cert.setSignatureAlgorithm(Common.SM3withSM2); // TODO 名字有误？ SM2withSM3? + cert.setPublicKeyAlgorithm(Common.SM2); + cert.setIssueTo("root"); + cert.setIssuer("root"); + long timestamp = System.currentTimeMillis() / 1000; + cert.setTimestamp(timestamp); // 10bit timestamp + cert.setNotAfter(timestamp); // 10bit timestamp + cert.setNotBefore(timestamp + 1000); // 10bit timestamp + cert.setKeyUsage(Common.CertSign); + cert.setCA(true); + CertUtils.signCert(cert, pair.getSm2PrivateKey()); + + identity.setCert(cert); + return identity; + } + @Test + public void testIdentifyManagerInit(){ + try{ + // 打开数据库 + // Sqlite.getInstance().openDefault(); + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("默认身份：%s", manager.getDefaultIdentity().getName())); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + logger.debug(String.format("私钥加密算法：%d", manager.getPrivateKeyEncryptionAlgorithm())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testGetIdentityByName(){ + try{ + IdentifyManager manager = new IdentifyManager(); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 查询所有manager中的用户 + for (String s: + keySet) { + logger.debug(String.format("查询身份：%s，结果身份：%s", s, manager.getIdentityByName(s).getName())); + } + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testGetIdentityByName2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + for (String s: + keySet) { + // 查询不存在的名称 返回null + String sSet = s + "test"; + logger.debug(String.format("查询身份：%s，结果身份：%s", sSet, manager.getIdentityByName(sSet))); + // 查询null 抛出异常 已改为返回null + sSet = null; + logger.debug(String.format("查询身份：%s，结果身份：%s", sSet, manager.getIdentityByName(sSet))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testDeleteIdentityByName2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + for (String s: + keySet) { + // 删除不存在的名称 返回false + String sSet = s + "test"; + logger.debug(String.format("删除身份：%s，结果：%s", sSet, manager.deleteIdentityByName(sSet, true))); + // 查询null 抛出异常 已改为返回false + sSet = null; + logger.debug(String.format("删除身份：%s，结果：%s", sSet, manager.deleteIdentityByName(sSet, true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testDeleteIdentityByName(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 删除所有manager中的用户 + for (String s: + keySet) { + logger.debug(String.format("删除身份：%s，结果：%s", s, manager.deleteIdentityByName(s, true))); + logger.debug(String.format("查询身份：%s，结果身份：%s", s, manager.getIdentityByName(s))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSaveIdentity(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 随机生成身份并保存 重复五次 + for (int i = 0; i < 5; i++) { + Identity id = createRandomIdentity(); + // todo 确认是否需要强制覆盖？ + logger.debug(String.format("保存身份：%s，结果：%s", id.getName(), manager.saveIdentity(id, true, true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSaveIdentity2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 插入 null 重复五次 + for (int i = 0; i < 5; i++) { + Identity id = null; + logger.debug(String.format("保存身份：%s，结果：%s", id, manager.saveIdentity(id, true, true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testCreateIdentityByNameAndKeyParam(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 随机生成名称并保存 重复五次 + for (int i = 0; i < 5; i++) { + String s = "wzq"+Math.random(); + KeyParam keyParam = new KeyParam(); + keyParam.PublicKeyAlgorithm = 0; + keyParam.SignatureAlgorithm = 0; + // todo 确认身份在没有证书的情况下能否存储 + logger.debug(String.format("保存身份：%s，结果：%s", s, manager.createIdentityByNameAndKeyParam(s, keyParam, "1234", true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testCreateIdentityByName(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 随机生成名称并保存 重复五次 + for (int i = 0; i < 5; i++) { + String s = "wzq"+Math.random(); + logger.debug(String.format("保存身份：%s，结果：%s", s, manager.createIdentityByName(s, "1234", true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testCreateIdentityByName2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 保存null 重复五次 + for (int i = 0; i < 5; i++) { + String s = null; + // 保存失败 返回null + logger.debug(String.format("保存身份：%s，结果：%s", s, manager.createIdentityByName(s, "1234", true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testCreateIdentityByNameAndKeyParam2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + // 保存null 重复五次 + for (int i = 0; i < 5; i++) { + String s = null; + // 不会插入 返回null + logger.debug(String.format("保存身份：%s，结果：%s", s, manager.createIdentityByName(s, "1234", true))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSetDefaultIdentity(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 轮流设置默认身份 + for (String s: + keySet) { + logger.debug(String.format("设置身份：%s，结果：%s", s, manager.setDefaultIdentity(manager.getIdentifies().get(s), true))); + logger.debug(String.format("查询默认身份：%s", manager.getDefaultIdentity())); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSetDefaultIdentity2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 轮流设置默认身份 设置的身份原本不存在 + for (String s: + keySet) { + Identity id = manager.getIdentifies().get(s); + String sNew = s + "test"; + id.setName(sNew); + logger.debug(String.format("设置身份：%s，结果：%s", sNew, manager.setDefaultIdentity(id, true))); + logger.debug(String.format("查询默认身份：%s", manager.getDefaultIdentity())); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testExistIdentity(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 正常查询身份是否存在 + for (String s: + keySet) { + String sSet = "test" + s; + logger.debug(String.format("查询身份：%s 是否存在， 结果：%s", s, manager.existIdentity(s))); + logger.debug(String.format("查询身份：%s 是否存在， 结果：%s", sSet, manager.existIdentity(sSet))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testExistIdentity2(){ + try{ + IdentifyManager manager = new IdentifyManager(); + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + ConcurrentMap hashMap = manager.getIdentifies(); + Set keySet = hashMap.keySet(); + // 查询 null 是否存在 + for (String s: + keySet) { + logger.debug(String.format("查询身份：%s 是否存在， 结果：%s", null, manager.existIdentity(null))); + } + logger.debug(String.format("身份数量：%d", manager.getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } +} From 528141ab5f95e6612ef40a4caf3f444115839add Mon Sep 17 00:00:00 2001 From: ChessNineeee <709030194@qq.com> Date: Wed, 14 Apr 2021 22:17:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=97=B6Packet=E6=A8=A1=E5=9D=97=E4=B8=AD=E9=81=87=E5=88=B0?= =?UTF-8?q?=E7=9A=84NullPointerException=20add:KeyChain=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/packet/CPacket.java | 13 +- src/main/java/packet/Data.java | 11 +- src/main/java/packet/Interest.java | 10 +- src/main/java/security/KeyChain.java | 114 ++++++++- src/test/java/security/KeyChainTest.java | 310 +++++++++++++++++++++++ 5 files changed, 431 insertions(+), 27 deletions(-) diff --git a/src/main/java/packet/CPacket.java b/src/main/java/packet/CPacket.java index a340a5d..c747724 100644 --- a/src/main/java/packet/CPacket.java +++ b/src/main/java/packet/CPacket.java @@ -157,12 +157,15 @@ public class CPacket implements InteractWithField, IEncodingAble { // 填充只读区 // 首先清除所有的Block - minPacket.readOnlyField.clearBlocks(); - block = new SelfEncodingBase().selfWireEncode(this.payload); - if (block == null) { - return false; + if (this.payload.getValue() != null){ + minPacket.readOnlyField.clearBlocks(); + block = new SelfEncodingBase().selfWireEncode(this.payload); + if (block == null) { + return false; + } + minPacket.readOnlyField.addBlock(block); } - minPacket.readOnlyField.addBlock(block); + // 填充标识区 // 首先清除所有的标识 diff --git a/src/main/java/packet/Data.java b/src/main/java/packet/Data.java index de52dee..4d2d443 100644 --- a/src/main/java/packet/Data.java +++ b/src/main/java/packet/Data.java @@ -154,11 +154,14 @@ public class Data implements IEncodingAble, InteractWithField { } // Payload - block = new SelfEncodingBase().selfWireEncode(this.payload); - if (block == null) { - return false; + if (this.payload.getValue() != null){ + block = new SelfEncodingBase().selfWireEncode(this.payload); + if (block == null) { + return false; + } + minPacket.readOnlyField.addBlock(block); } - minPacket.readOnlyField.addBlock(block); + ///////////////////////////////////////////////////////////// //// 填充标识区 diff --git a/src/main/java/packet/Interest.java b/src/main/java/packet/Interest.java index 902c2a1..62b2af9 100644 --- a/src/main/java/packet/Interest.java +++ b/src/main/java/packet/Interest.java @@ -237,11 +237,13 @@ public class Interest implements InteractWithField, IEncodingAble { } // Payload - block = new SelfEncodingBase().selfWireEncode(this.payload); - if (block == null) { - return false; + if (this.payload.getValue() != null){ + block = new SelfEncodingBase().selfWireEncode(this.payload); + if (block == null) { + return false; + } + minPacket.readOnlyField.addBlock(block); } - minPacket.readOnlyField.addBlock(block); ///////////////////////////////////////////////////////////// //// 填充标识区 diff --git a/src/main/java/security/KeyChain.java b/src/main/java/security/KeyChain.java index 7dbf0bf..ee439c1 100644 --- a/src/main/java/security/KeyChain.java +++ b/src/main/java/security/KeyChain.java @@ -28,6 +28,7 @@ import java.util.IdentityHashMap; * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室 */ public class KeyChain { + private static final String defaultIdentifyName = "/localhost/operator"; public IdentifyManager getIdentifyManager() { return identifyManager; } @@ -54,14 +55,19 @@ public class KeyChain { * @author hongyu guo * @date 2021/3/11 **/ - public KeyChain(){ + public KeyChain() throws Exception{ identifyManager = new IdentifyManager(); currentIdentity = identifyManager.getDefaultIdentity(); - // TODO: 考虑是否需要在没有默认身份的时候创建一个缺省的本地网络身份 + // DONE: 考虑是否需要在没有默认身份的时候创建一个缺省的本地网络身份 + if (currentIdentity == null){ + Identity newId = this.identifyManager.createIdentityByName(defaultIdentifyName, "", true); + this.identifyManager.setDefaultIdentity(newId); + this.currentIdentity = newId; + } } /** - * 设置当前使用的网络身份 + * 设置当前使用的网络身份，用 password 对目标网络身份进行解锁 * @param identity * @param passwd 如果passwd不为null 且不为空字符串, 则使用该passwd对identity进行解密 * @return void @@ -70,8 +76,10 @@ public class KeyChain { **/ public void setCurrentIdentity(Identity identity, String passwd) { try { - if(passwd != null && !passwd.equals("")) + if(passwd != null && !passwd.equals("")){ identity.unLock(passwd, identifyManager.getPrivateKeyEncryptionAlgorithm()); + currentIdentity = identity; + } } catch (IdentityException e) { e.printStackTrace(); } catch (NoSuchAlgorithmException e) { @@ -124,20 +132,45 @@ public class KeyChain { } + /** + * 从 MIN 网络包中提取出标识区和只读区的值，用于签名和验签 + * @param packet MINPacket + * @return byte[] + * @throws Exception + */ private byte[] getIdentifierAndReadOnlyValueFromPacket(MINPacket packet) throws Exception{ - Block iBlock = new SelfEncodingBase().selfWireEncode(packet.identifierField); - Block rBlock = new SelfEncodingBase().selfWireEncode(packet.readOnlyField); - - byte[] iBlockValue = iBlock.getValue(); - byte[] rBlockValue = rBlock.getValue(); - byte[] rawData = new byte[iBlockValue.length + rBlockValue.length]; - - System.arraycopy(iBlockValue, 0, rawData, 0, iBlockValue.length); - System.arraycopy(rBlockValue, 0, rawData, iBlockValue.length, rBlockValue.length); - + byte[] rawData = null; + byte[] iBlockValue = null; + byte[] rBlockValue = null; + int totalLength = 0; + // 1. 获取标识区数据 + Block iBlock = new SelfEncodingBase().selfWireEncode(packet.identifierField); + if (iBlock != null){ + iBlockValue = iBlock.getValue(); + totalLength += iBlockValue.length; + } + // 2. 获取只读区数据 + Block rBlock = new SelfEncodingBase().selfWireEncode(packet.readOnlyField); + if (rBlock != null){ + rBlockValue = rBlock.getValue(); + totalLength += rBlockValue.length; + } + // 3. 合并数据 + if (totalLength == 0) + return rawData; + rawData = new byte[totalLength]; + if (iBlock != null) + System.arraycopy(iBlockValue, 0, rawData, 0, iBlockValue.length); + if (rBlock != null) + System.arraycopy(rBlockValue, 0, rawData, iBlockValue.length, rBlockValue.length); return rawData; } + /** + * 给一个通用的网络包签名 + * @param packet + * @throws Exception + */ public void sign(MINPacket packet) throws Exception{ // 首先检查当前使用的身份是否可以用来签名 checkIdentifyCanUseToSign(this.currentIdentity); @@ -153,21 +186,41 @@ public class KeyChain { packet.signatureField.addSignature(signature); } + /** + * 对CPacket进行签名 + * @param cPacket + * @throws Exception + */ public void signCPacket(CPacket cPacket) throws Exception{ cPacket.fillDataToFields(); this.sign(cPacket.minPacket); } + /** + * 对Interest进行签名 + * @param interest + * @throws Exception + */ public void signInterest(Interest interest) throws Exception{ interest.fillDataToFields(); this.sign(interest.minPacket); } + /** + * 对Data进行签名 + * @param data + * @throws Exception + */ public void signData(Data data) throws Exception{ data.fillDataToFields(); this.sign(data.minPacket); } + /** + * 验证一个MIN网络包中的签名是否有效 + * @param minPacket + * @throws Exception + */ public void verify(MINPacket minPacket) throws Exception{ // 提取签名区的第一个签名进行验证（认为签名区的第一个签名为包的签名，包含标识区和只读区签名） Signature signature = minPacket.signatureField.getSignature(0); @@ -183,28 +236,61 @@ public class KeyChain { identity.verify(rawData, signature.getSigValue().getValue()); } + /** + * 验证一个 CPacket 中的签名是否有效 + * @param packet + * @throws Exception + */ public void verifyCPacket(CPacket packet) throws Exception{ packet.fillDataToFields(); verify(packet.minPacket); } + /** + * 验证一个 Interest 中的签名是否有效 + * @param interest + * @throws Exception + */ public void verifyInterest(Interest interest) throws Exception{ interest.fillDataToFields(); verify(interest.minPacket); } + /** + * 验证一个 Data 中的签名是否有效 + * @param data + * @throws Exception + */ public void verifyData(Data data) throws Exception{ data.fillDataToFields(); verify(data.minPacket); } + /** + * 将一个网络身份导出为一个 SafeBag 对象 + * @param identity + * @param passwd + * @return SafeBag + * @throws Exception + */ public SafeBag exportSafeBag(Identity identity, String passwd) throws Exception{ + if (identity == null) + return null; byte[] res = identity.dump(passwd); SafeBag safeBag = new SafeBag(res); return safeBag; } + /** + * 从一个 SafeBag 中导入网络身份，保存到本地 + * @param safeBag + * @param passwd + * @param force + * @throws Exception + */ public void importSafeBag(SafeBag safeBag, String passwd, boolean force) throws Exception{ + if (safeBag == null) + throw new KeyChainException(String.format("SafeBag is %s", safeBag)); Identity identity = Identity.load(safeBag.getValue(), passwd); if (!this.identifyManager.existIdentity(identity.getName()) || force){ diff --git a/src/test/java/security/KeyChainTest.java b/src/test/java/security/KeyChainTest.java index 69d1de7..41986ea 100644 --- a/src/test/java/security/KeyChainTest.java +++ b/src/test/java/security/KeyChainTest.java @@ -1,13 +1,66 @@ package security; +import component.Identifier; +import component.TTL; +import encoding.TLV; +import encoding.VlInt; import minsecurity.Common; +import minsecurity.certificate.cert.CertUtils; +import minsecurity.certificate.cert.Certificate; +import minsecurity.crypto.sm2.SM2KeyPair; import minsecurity.identity.Identity; +import minsecurity.identity.KeyParam; +import minsecurity.identity.TestIdentity; +import org.checkerframework.checker.units.qual.C; +import org.checkerframework.checker.units.qual.K; import org.junit.Test; +import org.slf4j.LoggerFactory; +import packet.CPacket; +import packet.Data; +import packet.Interest; +import packet.MINPacket; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; public class KeyChainTest { + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TestIdentity.class); + /** + * 随机生成身份数据 + * @return Identity + */ + private Identity createRandomIdentity() throws Exception{ + // 测试PersistIdentity + SM2KeyPair pair = SM2KeyPair.generateKeyPair(); + Identity identity = new Identity(); + identity.setName("/wzq"+Math.random()); // 身份名称必须以/开头 Identifier规定 + KeyParam keyParam = new KeyParam(); + keyParam.PublicKeyAlgorithm = 0; + keyParam.SignatureAlgorithm = 0; + identity.setKeyParam(keyParam); + identity.setPrikey(pair.getSm2PrivateKey()); + identity.setPubkey(pair.getSm2PublicKey()); + identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); + identity.lock("0123456789abcdef", Common.SM4ECB); + Certificate cert = new Certificate(); + cert.setVersion(1); + cert.setSerialNumber(1); + cert.setPublicKey(pair.getSm2PublicKey()); + cert.setSignatureAlgorithm(Common.SM3withSM2); // TODO 名字有误？ SM2withSM3? + cert.setPublicKeyAlgorithm(Common.SM2); + cert.setIssueTo("root"); + cert.setIssuer("root"); + long timestamp = System.currentTimeMillis() / 1000; + cert.setTimestamp(timestamp); // 10bit timestamp + cert.setNotAfter(timestamp); // 10bit timestamp + cert.setNotBefore(timestamp + 1000); // 10bit timestamp + cert.setKeyUsage(Common.CertSign); + cert.setCA(true); + CertUtils.signCert(cert, pair.getSm2PrivateKey()); + + identity.setCert(cert); + return identity; + } @Test public void testCreateKeyChain(){ try{ @@ -19,6 +72,7 @@ public class KeyChainTest { ConcurrentHashMap identityHashMap = new ConcurrentHashMap<>(); identityHashMap.put("/wzq", identity); + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); keyChain.getIdentifyManager().setIdentifies(identityHashMap); keyChain.getIdentifyManager().setDefaultIdentity(identity); @@ -26,8 +80,264 @@ public class KeyChainTest { Identity identity1 = keyChain.getIdentifyManager().createIdentityByName("/wzq1", passwd, false); identity1.unLock(passwd, Common.SM4ECB); System.out.println(identity1.getPrikey()); + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); }catch (Exception ex){ System.out.println(ex.getMessage()); } } + + @Test + public void testInitialKeyChain(){ + try { + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyInterest(){ + try { + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + + // 身份允许签名与验证签名 + Identifier id1 = new Identifier("/min/pku/sz"); + Identifier id2 = new Identifier("/install"); + + //////////////////// 构建兴趣包 //////////////////////// + Interest interest = new Interest(); + interest.minPacket.packetType = new VlInt(3); + interest.setName(id1); + interest.canBePrefix.setCanBePrefix(true); + interest.mustBeRefresh.setMustBeRefresh(true); + interest.nonce.setNonce(1234); + interest.hopLimit.setHopLimit(1234); + interest.congestionMark.setCongestionLevel(1234); + interest.ttl.setTtl(1234); + interest.payload.setValue(new byte[]{1, 2, 3, 4, 5}); + + + // 正常测试签名与验签 + keyChain.signInterest(interest); + keyChain.verifyInterest(interest); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyInterest2(){ + try { + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + + // 身份允许签名与验证签名 + Identifier id1 = new Identifier("/min/pku/sz"); + Identifier id2 = new Identifier("/install"); + + //////////////////// 构建兴趣包 只读区与标识区为空 //////////////////////// + Interest interest = new Interest(); + interest.minPacket.packetType = new VlInt(3); + // interest.setName(id1); +// interest.canBePrefix.setCanBePrefix(true); +// interest.mustBeRefresh.setMustBeRefresh(true); +// interest.nonce.setNonce(1234); +// interest.hopLimit.setHopLimit(1234); +// interest.interestLifeTime.setInterestLifeTime(1234); + interest.congestionMark.setCongestionLevel(1234); + interest.ttl.setTtl(1234); + // interest.payload.setValue(new byte[]{1, 2, 3, 4, 5}); + + + // 测试无数据的签名与验签 通过 + keyChain.signInterest(interest); + keyChain.verifyInterest(interest); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyCPacket2(){ + try { + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + + // 身份允许签名与验证签名 +// Identifier id1 = new Identifier("/min/pku/sz"); +// Identifier id2 = new Identifier("/install"); + + CPacket cPacket = new CPacket(); + cPacket.minPacket.packetType = new VlInt(3); +// cPacket.setSrcIdentifier(id1); +// cPacket.setDstIdentifier(id2); + cPacket.setTtl(new TTL(16546418374324163L)); + // cPacket.payload.setValue(new byte[]{1, 2, 3, 4, 6}); + + // 测试无数据的签名与验证 通过 + keyChain.signCPacket(cPacket); + keyChain.verifyCPacket(cPacket); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyCPacket(){ + try { + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + + // 身份允许签名与验证签名 + Identifier id1 = new Identifier("/min/pku/sz"); + Identifier id2 = new Identifier("/install"); + + CPacket cPacket = new CPacket(); + cPacket.minPacket.packetType = new VlInt(3); + cPacket.setSrcIdentifier(id1); + cPacket.setDstIdentifier(id2); + cPacket.setTtl(new TTL(16546418374324163L)); + cPacket.payload.setValue(new byte[]{1, 2, 3, 4, 6}); + + // 正常测试签名与验签 + keyChain.signCPacket(cPacket); + keyChain.verifyCPacket(cPacket); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyData(){ + try{ + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + //////////////////// 构建Data包 //////////////////////// + Data data = new Data(); + data.freshnessPeriod.setFreshnessPeriod(02346345465453L); + data.payload.setValue(new byte[]{1, 2, 3, 4, 5}); + data.congestionMark.setCongestionLevel(1234L); + Identifier id2 = new Identifier("/wzq"); + data.setName(id2); + data.minPacket.packetType = new VlInt(3); + // 正常测试签名与验签 + keyChain.signData(data); + keyChain.verifyData(data); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testSignAndVerifyData2(){ + try{ + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id = createRandomIdentity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + //////////////////// 构建Data包 无只读区与标识区 //////////////////////// + Data data = new Data(); +// data.freshnessPeriod.setFreshnessPeriod(02346345465453L); +// data.payload.setValue(new byte[]{1, 2, 3, 4, 5}); + data.congestionMark.setCongestionLevel(1234L); + Identifier id2 = new Identifier("/wzq"); + data.setName(id2); + data.minPacket.packetType = new VlInt(3); + // 测试无数据的签名与验证 通过 + keyChain.signData(data); + keyChain.verifyData(data); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testExportAndImportSafeBag(){ + try{ + Identity id = createRandomIdentity(); + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id2 = createRandomIdentity(); + id2.unLock("0123456789abcdef", Common.SM4ECB); // 锁住的Identity无法导出 + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + // 正常导入导出 通过 + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + SafeBag bag = keyChain.exportSafeBag(id2, "1234"); + keyChain.importSafeBag(bag, "1234", true); + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testExportAndImportSafeBag2(){ + try{ + Identity id = createRandomIdentity(); + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id2 = createRandomIdentity(); + id2.unLock("0123456789abcdef", Common.SM4ECB); // 锁住的Identity无法导出 + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + // 导入null 抛出异常 + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + SafeBag bag = keyChain.exportSafeBag(null, "1234"); + keyChain.importSafeBag(bag, "1234", true); + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } + + @Test + public void testExportAndImportSafeBag3(){ + try{ + Identity id = createRandomIdentity(); + // 测试设置新身份为当前身份 + KeyChain keyChain = new KeyChain(); + Identity id2 = new Identity(); + keyChain.getIdentifyManager().setDefaultIdentity(id, true); + // 输入密码用于解锁身份 + keyChain.setCurrentIdentity(keyChain.getIdentifyManager().getDefaultIdentity(), "0123456789abcdef"); + // 导入空Identity 抛出异常 + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + SafeBag bag = keyChain.exportSafeBag(null, "1234"); + keyChain.importSafeBag(bag, "1234", true); + logger.debug(String.format("身份数量：%d", keyChain.getIdentifyManager().getIdentifies().size())); + }catch (Exception ex){ + logger.debug(ex.getMessage()); + } + } } From 105435dd7543c646432926ca0f2efc800c939dad Mon Sep 17 00:00:00 2001 From: ChessNineeee <709030194@qq.com> Date: Wed, 14 Apr 2021 22:25:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/minsecurity/identity/TestIdentity.java | 4 +--- src/test/java/security/IdentifyManagerTest.java | 2 +- src/test/java/security/KeyChainTest.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/java/minsecurity/identity/TestIdentity.java b/src/test/java/minsecurity/identity/TestIdentity.java index 8cfe35f..c1d8237 100644 --- a/src/test/java/minsecurity/identity/TestIdentity.java +++ b/src/test/java/minsecurity/identity/TestIdentity.java @@ -42,7 +42,7 @@ public class TestIdentity { identity.setPrikey(pair.getSm2PrivateKey()); identity.setPubkey(pair.getSm2PublicKey()); identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); - identity.lock("0123456789abcdef", Common.SM4ECB); + // identity.lock("0123456789abcdef", Common.SM4ECB); Certificate cert = new Certificate(); cert.setVersion(1); cert.setSerialNumber(1); @@ -113,6 +113,4 @@ public class TestIdentity { logger.debug(identity.getPrikey().getBytes().length + " " + identity.getPubkey().getBytes().length); } - - } diff --git a/src/test/java/security/IdentifyManagerTest.java b/src/test/java/security/IdentifyManagerTest.java index 57b16ed..97b17b9 100644 --- a/src/test/java/security/IdentifyManagerTest.java +++ b/src/test/java/security/IdentifyManagerTest.java @@ -33,7 +33,7 @@ public class IdentifyManagerTest { identity.setPrikey(pair.getSm2PrivateKey()); identity.setPubkey(pair.getSm2PublicKey()); identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); - identity.lock("0123456789abcdef", Common.SM4ECB); + // identity.lock("0123456789abcdef", Common.SM4ECB); Certificate cert = new Certificate(); cert.setVersion(1); cert.setSerialNumber(1); diff --git a/src/test/java/security/KeyChainTest.java b/src/test/java/security/KeyChainTest.java index 41986ea..17aff42 100644 --- a/src/test/java/security/KeyChainTest.java +++ b/src/test/java/security/KeyChainTest.java @@ -41,7 +41,7 @@ public class KeyChainTest { identity.setPrikey(pair.getSm2PrivateKey()); identity.setPubkey(pair.getSm2PublicKey()); identity.setPasswd("2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99"); - identity.lock("0123456789abcdef", Common.SM4ECB); + // identity.lock("0123456789abcdef", Common.SM4ECB); Certificate cert = new Certificate(); cert.setVersion(1); cert.setSerialNumber(1);