add function for re-encrypt publish message and test Re-encrypt message

src/broker/modules/secure.go

@@ -17,11 +17,12 @@ func NewSecurity() *Security {
 
 type SecurityManager interface {
 	RegKey(ksm KeyShareMsg)
-	GetNodeKey(message Message) int64
+	GetNodeKey(nodeName string) 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
+	ReEncPubMsg(fromPubMsg PublishMsg, nodeName string) *PublishMsg
+	//CompareTopic(topic1 []int64, topic2 []int64) int
+	//CompareDigit(topic1 int64, topic2 int64) int
+	//CompareAlpha(topic1 []int64, topic2 []int64) int
 }
 
 /**
@@ -34,9 +35,9 @@ func (sc Security) RegKey(ksm KeyShareMsg) {
 /**
 각 노드의 키를 주소를 이용하여 맵에서 가져옴
 */
-func (sc Security) GetNodeKey(message Message) int64 {
+func (sc Security) GetNodeKey(nodeName string) int64 {
 
-	messageStringKey := sc.KeyMap[message.From()]
+	messageStringKey := sc.KeyMap[nodeName]
 	mKey, err := strconv.ParseInt(messageStringKey, 10, 64)
 	if err != nil {
 		fmt.Println("reEncrypt Error: key string to int64 parsing error.")
@@ -55,44 +56,66 @@ func (sc Security) ReEncrypt(fromKey int64, toKey int64, target []int64) []int64
 	return target
 }
 
-/**
-Compare 함수들은 같으면 0 다르면 -1 (비교가 필요한 경우 오름차순 1 내림차순 -1)
-*/
-func (sc Security) CompareTopic(topic1 []int64, topic2 []int64) int {
-	// 길이 같은지 체크
-	if len(topic1) != len(topic2) {
-		return -1
-	}
-	for i := 0; i < len(topic2); i++ {
-		if topic1[i] != topic2[i] {
-			return -1
-		}
+func (sc Security) ReEncryptWithoutPrivateKey(toKey int64, target []int64) []int64 {
+	for index := range target {
+		target[index] = target[index] + toKey
 	}
-	return 0
-}
 
-func (sc Security) CompareDigit(topic1 int64, topic2 int64) int {
-	if topic1 < topic2 {
-		return 1
-	} else if topic1 > topic2 {
-		return -1
-	}
-	return 0
+	return target
 }
 
-func (sc Security) CompareAlpha(topic1 []int64, topic2 []int64) int {
-	// 길이 같은지 체크
-	if len(topic1) != len(topic2) {
-		return -1
-	}
-	for i := 0; i < len(topic2); i++ {
-		if topic1[i] != topic2[i] {
-			return -1
-		}
-	}
-	return 0
+// topic과 value는 m+k로만 존재하므로 ReEnc과정에서 subscriber의 개인키만 더해주면 된다.
+func (sc Security) ReEncPubMsg(fromPubMsg PublishMsg, nodeName string) *PublishMsg {
+	toKey := sc.GetNodeKey(nodeName)
+	fromKey := sc.GetNodeKey(fromPubMsg.Message.From())
+
+	toPubMsg := new(PublishMsg)
+	toPubMsg.Message = fromPubMsg.Message
+	toPubMsg.topic = sc.ReEncryptWithoutPrivateKey(toKey, fromPubMsg.topic)
+	toPubMsg.value = sc.ReEncryptWithoutPrivateKey(toKey, fromPubMsg.value)
+	toPubMsg.content = sc.ReEncrypt(fromKey, toKey, fromPubMsg.content)
+
+	return toPubMsg
 }
 
+/**
+Compare 함수들은 같으면 0 다르면 -1 (비교가 필요한 경우 오름차순 1 내림차순 -1)
+*/
+//func (sc Security) CompareTopic(topic1 []int64, topic2 []int64) int {
+//	// 길이 같은지 체크
+//	if len(topic1) != len(topic2) {
+//		return -1
+//	}
+//	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 {
+//	// 길이 같은지 체크
+//	if len(topic1) != len(topic2) {
+//		return -1
+//	}
+//	for i := 0; i < len(topic2); i++ {
+//		if topic1[i] != topic2[i] {
+//			return -1
+//		}
+//	}
+//	return 0
+//}
+
 // private key 생성 메세지
 //func (sc Security) keyGenPrivate() KeyGenMsg{
 //

src/broker/modules/secure_test.go

@@ -12,11 +12,101 @@ func TestCompare(t *testing.T) {
 
 	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))
+	sm.GetNodeKey(ksm.Message.From())
+	fmt.Println(sm.GetNodeKey(ksm.Message.From()))
 	var targetKey []int64
 	targetKey = []int64{1234, 1235, 1236}
-	fmt.Println(sm.ReEncrypt(sm.GetNodeKey(ksm.Message), 0, targetKey))
-	fmt.Println(sm.CompareDigit(1236, 1234))
+	fmt.Println(sm.ReEncrypt(sm.GetNodeKey(ksm.Message.From()), 0, targetKey))
+	//fmt.Println(sm.CompareDigit(1236, 1234))
 
 }
+
+func CreatePubMsg(msg Message, topic string, value string, content string) *PublishMsg {
+	toPubMsg := new(PublishMsg)
+	toPubMsg.Message = msg
+
+	intArr := []rune(topic)
+	fmt.Print("topic length ")
+	fmt.Println(len(intArr))
+	fmt.Println(len(toPubMsg.topic))
+	for index := 0; index < len(intArr); index++ {
+		toPubMsg.topic = append(toPubMsg.topic, int64(intArr[index]))
+	}
+	fmt.Println(len(toPubMsg.topic))
+	intArr = []rune(value)
+	for index := 0; index < len(intArr); index++ {
+		toPubMsg.value = append(toPubMsg.value, int64(intArr[index]))
+	}
+	intArr = []rune(content)
+	for index := 0; index < len(intArr); index++ {
+		toPubMsg.content = append(toPubMsg.content, int64(intArr[index]))
+	}
+
+	return toPubMsg
+}
+
+func EncryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) PublishMsg {
+	for index := range msg.topic {
+		msg.topic[index] = msg.topic[index] + gyKey
+	}
+	for index := range msg.value {
+		msg.value[index] = msg.value[index] + gyKey
+	}
+	for index := range msg.content {
+		msg.content[index] = msg.content[index] + gyKey + privateKey
+	}
+
+	return *msg
+}
+
+func DecryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) {
+	for index := range msg.topic {
+		msg.topic[index] = msg.topic[index] - gyKey - privateKey
+	}
+	for index := range msg.value {
+		msg.value[index] = msg.value[index] - gyKey - privateKey
+	}
+	for index := range msg.content {
+		msg.content[index] = msg.content[index] - gyKey - privateKey
+	}
+
+	var runeArr []rune
+	for index := range msg.topic {
+		runeArr = append(runeArr, rune(int(msg.topic[index])))
+	}
+	fmt.Println("\n\ntopic is: " + string(runeArr))
+	runeArr = nil
+
+	for index := range msg.value {
+		runeArr = append(runeArr, rune(int(msg.value[index])))
+	}
+	fmt.Println("value is: " + string(runeArr))
+	runeArr = nil
+
+	for index := range msg.content {
+		runeArr = append(runeArr, rune(int(msg.content[index])))
+	}
+	fmt.Println("content is: " + string(runeArr))
+	runeArr = nil
+
+}
+
+// from "1.1.1.1" to "3.3.3.3" node
+func TestReEnc(t *testing.T) {
+	var security = NewSecurity()
+	var sm SecurityManager
+	sm = security
+	security.KeyMap["1.1.1.1"] = "5678"
+	security.KeyMap["3.3.3.3"] = "9999"
+
+	fmt.Println(sm.GetNodeKey("3.3.3.3"))
+	msg := Message{from: "1.1.1.1", version: "1", time: "123", kind: 1}
+	fmt.Println(msg)
+	publishMsg := CreatePubMsg(msg, "soccer123한글", "playerList", "son and 10 players")
+	fmt.Println(publishMsg)
+	encPublishMsg := EncryptionMsg(publishMsg, 1234, 5678)
+	fmt.Println(encPublishMsg)
+	reEncPublishMsg := sm.ReEncPubMsg(encPublishMsg, "3.3.3.3")
+	fmt.Println(reEncPublishMsg)
+	DecryptionMsg(reEncPublishMsg, 1234, 9999)
+}