identity & identity基础功能测试

src/main/java/minsecurity/crypto/sm2/SM2PrivateKey.java

@@ -38,15 +38,7 @@ public class SM2PrivateKey implements PrivateKeyInterface {
      * @date 2021/3/7
     **/
     public SM2PrivateKey(byte[] d) {
-        if(d.length == 32 || d.length == 33)
-            privateKey = new ECPrivateKeyParameters(new BigInteger(d), SM2Base.DOMAIN_PARAMS);
-        else {
-            try {
-                throw new SM2Exception("SM2私钥中，参数d长度应为32/33");
-            } catch (SM2Exception e) {
-                e.printStackTrace();
-            }
-        }
+        privateKey = new ECPrivateKeyParameters(new BigInteger(d), SM2Base.DOMAIN_PARAMS);
     }
     public SM2PrivateKey(byte[] d, ECDomainParameters parameters){
         if(d.length == 32 || d.length == 33)

src/main/java/minsecurity/identity/persist/IdentitySerializer.java

@@ -1,6 +1,5 @@
 package minsecurity.identity.persist;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import minsecurity.Common;
 import minsecurity.certificate.cert.CertException;
 import minsecurity.certificate.cert.CertUtils;
@@ -31,8 +30,9 @@ import java.security.NoSuchProviderException;
  * @Date: 20:50 2021/03/09
  * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
  */
-public class IdentitySerializer implements Serializer<Identity> {
 
+// TODO: 加密版本的序列化
+public class IdentitySerializer implements Serializer<Identity> {
 
     @Override
     public void serialize(@NotNull DataOutput2 dataOutput2, @NotNull Identity identity) throws IOException {

src/main/java/minsecurity/identity/persist/MapDB.java

@@ -0,0 +1,152 @@
+package minsecurity.identity.persist;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import minsecurity.identity.Identity;
+import org.mapdb.DB;
+import org.mapdb.DBMaker;
+import org.mapdb.Serializer;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.concurrent.ConcurrentMap;
+
+/*
+ * @Author: hongyu guo
+ * @Description: 封装MapDB中需要的方法
+ * @Version: 1.0.0
+ * @Date: 10:34 2021/03/10
+ * @Copyright: MIN-Group；国家重大科技基础设施——未来网络北大实验室；深圳市信息论与未来网络重点实验室
+ */
+public class MapDB {
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(MapDB.class);
+    // TODO: 如有需要, 后续添加其他map
+    // TODO: 数据库加密?
+    public static final String defaultPath = "./target/test.db";
+    public static final String defaultIdentity = "identity";
+    public static final String defaultName = "/default";
+    private DB db;
+    private ConcurrentMap<String, Identity> identityMap;
+    private Serializer<Identity> customSerializer;
+    private static MapDB mapDB = null;
+
+    private MapDB(){
+        db = DBMaker.fileDB(defaultPath).closeOnJvmShutdown().transactionEnable().make();
+        customSerializer = new IdentitySerializer();
+        identityMap =  db.hashMap(defaultIdentity)
+                .keySerializer(Serializer.STRING)
+                .valueSerializer(customSerializer)
+                .createOrOpen();
+    }
+    private MapDB(String filePath){
+        db = DBMaker.fileDB(filePath).closeOnJvmShutdown().transactionEnable().make();
+        customSerializer = new IdentitySerializer();
+        identityMap =  db.hashMap(defaultIdentity)
+                .keySerializer(Serializer.STRING)
+                .valueSerializer(customSerializer)
+                .createOrOpen();
+    }
+
+    public static MapDB getInstance(){
+        if(mapDB == null){
+            mapDB = new MapDB();
+        }
+        return mapDB;
+    }
+    public static MapDB getInstance(String filePath){
+        if(mapDB == null){
+            mapDB = new MapDB(filePath);
+        }
+        return mapDB;
+    }
+
+    public Identity addIdentity(String name, Identity identity, boolean commit){
+        Identity id = identityMap.put(name,identity);
+        if(identityMap.size() == 1){
+            // 首次添加default Identity
+            setDefaultIdentity(name, commit);
+        }
+
+
+        if(commit){
+            db.commit();
+        }
+        return id;
+    }
+
+    public void closeDB(){
+        db.close();
+        mapDB = null;
+    }
+
+    public void commit(){
+        db.commit();
+    }
+
+
+    public Identity getIdentityByName(String name){
+        return identityMap.get(name);
+    }
+
+    public ArrayList<Identity> getAllIdentity(){
+        ArrayList<Identity> list = new ArrayList<>();
+        for(String key : identityMap.keySet()){
+            list.add(identityMap.get(key));
+        }
+        return list;
+    }
+
+    public boolean setDefaultIdentity(String name, boolean commit){
+        Identity identity = identityMap.get(name);
+        if(identity == null)
+            return false;
+        // 将所有identity的设置为非默认
+        for(String key : identityMap.keySet()){
+            Identity id = identityMap.get(key);
+            if(id.isDefault()) {
+                id.setDefault(false);
+                identityMap.put(key, id);
+            }
+        }
+        identity.setDefault(true);
+        identityMap.put(name, identity);
+        // set /default
+        identityMap.put(defaultName, identity);
+        if(commit){
+            db.commit();
+        }
+        return true;
+    }
+
+    public Identity getDefaultIdentity(){
+        return identityMap.get(defaultName);
+    }
+
+    public Identity deleteIdentity(String name, boolean commit){
+        // 不能删除默认Identity
+        if(name.equals(defaultName)){
+            logger.error("不能删除default identity");
+            return null;
+        }
+        Identity identity = identityMap.remove(name);
+        if(commit){
+            db.commit();
+        }
+        return identity;
+    }
+
+    public DB getDb() {
+        return db;
+    }
+
+    public void setDb(DB db) {
+        this.db = db;
+    }
+
+    public ConcurrentMap<String, Identity> getIdentityMap() {
+        return identityMap;
+    }
+
+    public void setIdentityMap(ConcurrentMap<String, Identity> identityMap) {
+        this.identityMap = identityMap;
+    }
+}