finish secure.go and test

modules/secure.go

@@ -6,40 +6,48 @@ import (
 )
 
 // 키관리 부분, 노드 입력받고 키 반환하는 부분 구현
-type Security struct{
-	KeyMap map[string] string
+type Security struct {
+	KeyMap map[string]string
 }
 
-type SecurityManage interface {
-	reEncrypt()
-	keyGenPrivate()
-	compare()
+func NewSecurity() *Security {
+	security := &Security{map[string]string{}}
+	return security
+}
+
+type SecurityManager interface {
+	RegKey(ksm KeyShareMsg)
+	GetNodeKey(message Message) int64
+	ReEncrypt(fromKey int64, toKey int64, target []int64) []int64
+	CompareTopic(topic1 []int64, topic2 []int64) int
+	CompareDigit(topic1 int64, topic2 int64) int
+	CompareAlpha(topic1 []int64, topic2 []int64) int
 }
 
 /**
 keyShareMsg 에서 각 노드의 private 키를 받아 keyMap 에 저장
- */
+*/
 func (sc Security) RegKey(ksm KeyShareMsg) {
 	sc.KeyMap[ksm.Message.From()] = ksm.key
 }
 
 /**
 각 노드의 키를 주소를 이용하여 맵에서 가져옴
- */
-func (sc Security) GetNodeKey(message Message) int{
+*/
+func (sc Security) GetNodeKey(message Message) int64 {
 
 	messageStringKey := sc.KeyMap[message.From()]
-	mKey, err := strconv.Atoi(messageStringKey)
+	mKey, err := strconv.ParseInt(messageStringKey, 10, 64)
 	if err != nil {
-		fmt.Println("reEncrypt Error: key string to int error.")
+		fmt.Println("reEncrypt Error: key string to int64 parsing error.")
 	}
 	return mKey
 }
 
 /**
 reEncrypt 해서 슬라이스 반환
- */
-func (sc Security) ReEncrypt(fromKey int,  toKey int, target []int) []int{
+*/
+func (sc Security) ReEncrypt(fromKey int64, toKey int64, target []int64) []int64 {
 	for index := range target {
 		target[index] = target[index] - fromKey + toKey
 	}
@@ -47,6 +55,35 @@ func (sc Security) ReEncrypt(fromKey int,  toKey int, target []int) []int{
 	return target
 }
 
+/**
+Compare 함수들은 같으면 0 다르면 -1 (비교가 필요한 경우 오름차순 1 내림차순 -1)
+*/
+func (sc Security) CompareTopic(topic1 []int64, topic2 []int64) int {
+	for i := 0; i < len(topic2); i++ {
+		if topic1[i] != topic2[i] {
+			return -1
+		}
+	}
+	return 0
+}
+
+func (sc Security) CompareDigit(topic1 int64, topic2 int64) int {
+	if topic1 < topic2 {
+		return 1
+	} else if topic1 > topic2 {
+		return -1
+	}
+	return 0
+}
+
+func (sc Security) CompareAlpha(topic1 []int64, topic2 []int64) int {
+	for i := 0; i < len(topic2); i++ {
+		if topic1[i] != topic2[i] {
+			return -1
+		}
+	}
+	return 0
+}
 
 // private key 생성 메세지
 //func (sc Security) keyGenPrivate() KeyGenMsg{

modules/secure_test.go

@@ -0,0 +1,22 @@
+package modules
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestCompare(t *testing.T) {
+	var security = NewSecurity()
+	var sm SecurityManager
+	sm = security
+
+	ksm := KeyShareMsg{Message: Message{from: "1.1.1.1", version: "1", time: "2", kind: 1}, key: "1234"}
+	sm.RegKey(ksm)
+	sm.GetNodeKey(ksm.Message)
+	fmt.Println(sm.GetNodeKey(ksm.Message))
+	var targetKey []int64
+	targetKey = []int64{1234, 1235, 1236}
+	fmt.Println(sm.ReEncrypt(sm.GetNodeKey(ksm.Message), 0, targetKey))
+	fmt.Println(sm.CompareDigit(1236, 1234))
+
+}