change secure test

.idea/vcs.xml

@@ -2,5 +2,9 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/davecgh/go-spew" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/pmezard/go-difflib" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/github.com/stretchr/testify" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/gopkg.in/yaml.v3" vcs="Git" />
   </component>
 </project>

src/broker/modules/go.mod

@@ -1,3 +0,0 @@
-module modules
-
-go 1.16

src/broker/modules/matching.go

@@ -1,21 +1,21 @@
 package modules
-
-import (
-	_ "errors"
-	_ "fmt"
-)
-
-type match_manager struct {
-}
-
-func (match_mng *match_manager) matching(queue *MsgQueue) error {
-	msg := queue.pop(true)
-
-	//Implement here ~~
-	subscription := msg.(*PublishMsg).subscription
-	content := msg.(*PublishMsg).content
-
-	println(subscription, content)
-
-	return nil
-}
+//
+//import (
+//	_ "errors"
+//	_ "fmt"
+//)
+//
+//type match_manager struct {
+//}
+//
+//func (match_mng *match_manager) matching(queue *MsgQueue) error {
+//	msg := queue.pop(true)
+//
+//	//Implement here ~~
+//	subscription := msg.(*PublishMsg).subscription
+//	content := msg.(*PublishMsg).content
+//
+//	println(subscription, content)
+//
+//	return nil
+//}

src/broker/modules/matching_test.go

@@ -1,37 +1,37 @@
 package modules
-
-import (
-	"fmt"
-	"testing"
-)
-
-func Test_simpleLList_pbNtraverse(t *testing.T) {
-	mylist := new(LList)
-	mylist.PushBack(30)
-	mylist.PushBack(40)
-	mylist.PushBack(20)
-	mylist.PushBack(10)
-	ptr := mylist.head
-	for ptr != nil {
-		fmt.Printf("data = %d, address = %p\n", ptr.val, ptr.next)
-		ptr = ptr.next
-	}
-}
-
-func Test_simpleLList_mergeSort(t *testing.T) {
-	mylist := new(LList)
-	mylist.PushBack(30)
-	mylist.PushBack(40)
-	mylist.PushBack(20)
-	mylist.PushBack(10)
-	mylist.head = MergeSort(mylist.head, mylist.size / 2)
-	ptr := mylist.head
-	for ptr != nil {
-		fmt.Printf("data = %d, address = %p\n", ptr.val, ptr.next)
-		ptr = ptr.next
-	}
-}
-
-func Test_removeArray(t *testing.T){}
-func Test_deleteList(t *testing.T){}
-func Test_insertList(t *testing.T){}
+//
+//import (
+//	"fmt"
+//	"testing"
+//)
+//
+//func Test_simpleLList_pbNtraverse(t *testing.T) {
+//	mylist := new(LList)
+//	mylist.PushBack(30)
+//	mylist.PushBack(40)
+//	mylist.PushBack(20)
+//	mylist.PushBack(10)
+//	ptr := mylist.head
+//	for ptr != nil {
+//		fmt.Printf("data = %d, address = %p\n", ptr.val, ptr.next)
+//		ptr = ptr.next
+//	}
+//}
+//
+//func Test_simpleLList_mergeSort(t *testing.T) {
+//	mylist := new(LList)
+//	mylist.PushBack(30)
+//	mylist.PushBack(40)
+//	mylist.PushBack(20)
+//	mylist.PushBack(10)
+//	mylist.head = MergeSort(mylist.head, mylist.size / 2)
+//	ptr := mylist.head
+//	for ptr != nil {
+//		fmt.Printf("data = %d, address = %p\n", ptr.val, ptr.next)
+//		ptr = ptr.next
+//	}
+//}
+//
+//func Test_removeArray(t *testing.T){}
+//func Test_deleteList(t *testing.T){}
+//func Test_insertList(t *testing.T){}

src/broker/modules/secure.go

@@ -40,7 +40,7 @@ func (sc Security) GetNodeKey(nodeName string) int64 {
 	messageStringKey := sc.KeyMap[nodeName]
 	mKey, err := strconv.ParseInt(messageStringKey, 10, 64)
 	if err != nil {
-		fmt.Println("reEncrypt Error: key string to int64 parsing error.")
+		fmt.Println("GetNodeKey Error: key string to int64 parsing error.")
 	}
 	return mKey
 }

src/broker/modules/secure_test.go

@@ -26,13 +26,13 @@ func CreatePubMsg(msg Message, topic string, value string, content string) *Publ
 	toPubMsg.Message = msg
 
 	intArr := []rune(topic)
-	fmt.Print("topic length ")
-	fmt.Println(len(intArr))
-	fmt.Println(len(toPubMsg.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))
+	//fmt.Println(len(toPubMsg.topic))
 	intArr = []rune(value)
 	for index := 0; index < len(intArr); index++ {
 		toPubMsg.value = append(toPubMsg.value, int64(intArr[index]))
@@ -45,7 +45,7 @@ func CreatePubMsg(msg Message, topic string, value string, content string) *Publ
 	return toPubMsg
 }
 
-func EncryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) PublishMsg {
+func EncryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) *PublishMsg {
 	for index := range msg.topic {
 		msg.topic[index] = msg.topic[index] + gyKey
 	}
@@ -56,7 +56,8 @@ func EncryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) PublishMsg {
 		msg.content[index] = msg.content[index] + gyKey + privateKey
 	}
 
-	return *msg
+
+	return msg
 }
 
 func DecryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) {
@@ -74,7 +75,7 @@ func DecryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) {
 	for index := range msg.topic {
 		runeArr = append(runeArr, rune(int(msg.topic[index])))
 	}
-	fmt.Println("\n\ntopic is: " + string(runeArr))
+	fmt.Println("topic is: " + string(runeArr))
 	runeArr = nil
 
 	for index := range msg.value {
@@ -91,22 +92,58 @@ func DecryptionMsg(msg *PublishMsg, gyKey int64, privateKey int64) {
 
 }
 
+func printMsg(msg *PublishMsg){
+	var runeArr []rune
+	for index := range msg.topic {
+		runeArr = append(runeArr, rune(int(msg.topic[index])))
+	}
+	fmt.Println("topic 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) + "\n\n")
+	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"
+	security.KeyMap["1.1.1.1"] = "56789"
+	security.KeyMap["3.3.3.3"] = "99999"
 
-	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(sm.GetNodeKey("3.3.3.3"))
+	msg := Message{from: "1.1.1.1", version: "1", time: "123", kind: 3}
+	//fmt.Println(msg)
+	publishMsg := CreatePubMsg(msg, "soccer123한글", "playerList", "Son and 10 players")
 	fmt.Println(publishMsg)
-	encPublishMsg := EncryptionMsg(publishMsg, 1234, 5678)
+	fmt.Println("original publish message is...")
+	printMsg(publishMsg)
+	encPublishMsg := EncryptionMsg(publishMsg, 1234, 56789)
+	fmt.Println("encrypt publish message by publisher's private key")
+	printMsg(encPublishMsg)
 	fmt.Println(encPublishMsg)
-	reEncPublishMsg := sm.ReEncPubMsg(encPublishMsg, "3.3.3.3")
-	fmt.Println(reEncPublishMsg)
-	DecryptionMsg(reEncPublishMsg, 1234, 9999)
+	reEncPublishMsg := sm.ReEncPubMsg(*encPublishMsg, "3.3.3.3")
+	fmt.Println("re-encrypt publish message by subscriber's private key")
+	printMsg(reEncPublishMsg)
+	//fmt.Println(reEncPublishMsg)
+	fmt.Println("decrypted publish message is...")
+	DecryptionMsg(reEncPublishMsg, 1234, 99999)
 }
+
+//func TestReEncUsingSHA(r *testing.T){
+//	var security = NewSecurity()
+//	var sm SecurityManager
+//	sm = security
+//	security.KeyMap["1.1.1.1"] = "56789"
+//	security.KeyMap["3.3.3.3"] = "99999"
+//}

src/broker/modules/subscription_test.go

@@ -1,145 +1,145 @@
 package modules
-
-import (
-	"fmt"
-	_ "fmt"
-	"math/rand"
-	"strconv"
-	"testing"
-	"time"
-	"github.com/stretchr/testify/assert"
-)
-
-func dataMake(isalpha bool) MsgUnit{
-	rand.Seed(time.Now().UnixNano())
-
-	// Set Ipaddr
-	msg := Message{"", "1.0", "", SM}
-	for i := 0; i < 4; i++{
-		itoa := strconv.Itoa(rand.Int() % 256)
-
-		msg.from += itoa
-		if i != 3{
-			msg.from += "."
-		}
-	}
-
-	// Set Time
-	msg.time += strconv.Itoa(rand.Int()%24) + ":"
-	msg.time += strconv.Itoa(rand.Int()%60)
-
-	// Set Topic, Value, operator
-	topic := []int64{}
-	value := []int64{}
-	operator := []string{}
-	candOp := []string{">", ">=", "<=" ,"<", "=="}
-	logicalOp := []string{"&&", "||"}
-
-	topic = append(topic, rand.Int63())
-
-	if isalpha{
-		value = append(value, rand.Int63())
-		operator = append(operator, "==")
-	} else{
-		len := rand.Int() % 2 + 1
-		value = append(value, rand.Int63())
-
-		if len == 1{
-			operator = append(operator, candOp[rand.Int()%5])
-		} else{
-			value = append(value, rand.Int63())
-			op := rand.Int()%2
-			operator = append(operator, candOp[rand.Int()%2])
-			if op == 0 {
-				operator = append(operator, logicalOp[0])
-			} else{
-				operator = append(operator, logicalOp[1])
-			}
-			operator = append(operator, candOp[rand.Int()%2 + 2])
-		}
-	}
-
-	return &SubscriptionMsg{msg, topic, value, operator, isalpha}
-}
-
-func Test_addSubscription(t *testing.T) {
-	rand.Seed(time.Now().UnixNano())
-
-	// To Init sub_mng
-	mos := Moscato{sub_mng : sub_manager{}}
-
-	// Make Data set(Subscription)
-	msgList := []MsgUnit{}
-	dataLen:= 3
-	for i := 0 ; i < dataLen ; i++{
-		seed := rand.Int()%2
-		if seed == 0{
-			msgList = append(msgList, dataMake(false))
-		} else{
-			msgList = append(msgList, dataMake(true))
-		}
-	}
-
-	// Watch Data set
-	for i := 0; i < dataLen ; i++{
-		msg := msgList[i]
-		fmt.Println(
-			" from = ", msg.(*SubscriptionMsg).Message.from,
-			" time = ", msg.(*SubscriptionMsg).Message.time,
-			" topic = ", msg.(*SubscriptionMsg).topic,
-			" value = ", msg.(*SubscriptionMsg).value,
-			" operator = ", msg.(*SubscriptionMsg).operator,
-			" isAlpha ?= ", msg.(*SubscriptionMsg).isAlpha)
-	}
-
-	// Test addSubScription
-	for i := 0; i < dataLen ; i++{
-
-		msg := msgList[i]
-		ip := msg.(*SubscriptionMsg).Message.from
-		topic := msg.(*SubscriptionMsg).topic
-		value := msg.(*SubscriptionMsg).value
-		//operator := msg.(*SubscriptionMsg).operator
-		//isAlpha := msg.(*SubscriptionMsg).isAlpha
-		subnumber := mos.sub_mng.count_sub
-
-		mos.sub_mng.addSubscription(msg)
-
-
-		// 1. Check if ip mapping is correct
-		assert.Equal(t, subnumber, mos.sub_mng.ip2sub[ip][len(mos.sub_mng.ip2sub[ip]) - 1], "Ip mapping is failed")
-
-		// 2. Check topicNode
-		nameptr := mos.sub_mng.list.head
-		for nameptr != nil{
-			if nameptr.topic[0] == topic[0]{
-				break
-			}
-			nameptr = nameptr.next
-		}
-
-		for i := 0 ; i < len(topic); i++{
-			assert.Equal(t, topic[i], nameptr.topic[i], "topicNode Add is failed")
-		}
-
-		// 3. Check Value in ValueNode
-		valptr := nameptr.list.head
-		for valptr != nil{
-			for i:=0 ; i < len(value); i++{
-				find := true
-				if value[i] != valptr.val[i]{
-					find = false
-				}
-				if find{
-					break
-				}
-			}
-			valptr = valptr.next
-		}
-		fmt.Println("my value = ", valptr.val, " real value = ", value)
-
-		for i := 0; i < len(value); i++{
-			assert.Equal(t, value[i], valptr.val[i], "ValNode Add is failed")
-		}
-	}
-}
+//
+//import (
+//	"fmt"
+//	_ "fmt"
+//	"math/rand"
+//	"strconv"
+//	"testing"
+//	"time"
+//	"github.com/stretchr/testify/assert"
+//)
+//
+//func dataMake(isalpha bool) MsgUnit{
+//	rand.Seed(time.Now().UnixNano())
+//
+//	// Set Ipaddr
+//	msg := Message{"", "1.0", "", SM}
+//	for i := 0; i < 4; i++{
+//		itoa := strconv.Itoa(rand.Int() % 256)
+//
+//		msg.from += itoa
+//		if i != 3{
+//			msg.from += "."
+//		}
+//	}
+//
+//	// Set Time
+//	msg.time += strconv.Itoa(rand.Int()%24) + ":"
+//	msg.time += strconv.Itoa(rand.Int()%60)
+//
+//	// Set Topic, Value, operator
+//	topic := []int64{}
+//	value := []int64{}
+//	operator := []string{}
+//	candOp := []string{">", ">=", "<=" ,"<", "=="}
+//	logicalOp := []string{"&&", "||"}
+//
+//	topic = append(topic, rand.Int63())
+//
+//	if isalpha{
+//		value = append(value, rand.Int63())
+//		operator = append(operator, "==")
+//	} else{
+//		len := rand.Int() % 2 + 1
+//		value = append(value, rand.Int63())
+//
+//		if len == 1{
+//			operator = append(operator, candOp[rand.Int()%5])
+//		} else{
+//			value = append(value, rand.Int63())
+//			op := rand.Int()%2
+//			operator = append(operator, candOp[rand.Int()%2])
+//			if op == 0 {
+//				operator = append(operator, logicalOp[0])
+//			} else{
+//				operator = append(operator, logicalOp[1])
+//			}
+//			operator = append(operator, candOp[rand.Int()%2 + 2])
+//		}
+//	}
+//
+//	return &SubscriptionMsg{msg, topic, value, operator, isalpha}
+//}
+//
+//func Test_addSubscription(t *testing.T) {
+//	rand.Seed(time.Now().UnixNano())
+//
+//	// To Init sub_mng
+//	mos := Moscato{sub_mng : sub_manager{}}
+//
+//	// Make Data set(Subscription)
+//	msgList := []MsgUnit{}
+//	dataLen:= 3
+//	for i := 0 ; i < dataLen ; i++{
+//		seed := rand.Int()%2
+//		if seed == 0{
+//			msgList = append(msgList, dataMake(false))
+//		} else{
+//			msgList = append(msgList, dataMake(true))
+//		}
+//	}
+//
+//	// Watch Data set
+//	for i := 0; i < dataLen ; i++{
+//		msg := msgList[i]
+//		fmt.Println(
+//			" from = ", msg.(*SubscriptionMsg).Message.from,
+//			" time = ", msg.(*SubscriptionMsg).Message.time,
+//			" topic = ", msg.(*SubscriptionMsg).topic,
+//			" value = ", msg.(*SubscriptionMsg).value,
+//			" operator = ", msg.(*SubscriptionMsg).operator,
+//			" isAlpha ?= ", msg.(*SubscriptionMsg).isAlpha)
+//	}
+//
+//	// Test addSubScription
+//	for i := 0; i < dataLen ; i++{
+//
+//		msg := msgList[i]
+//		ip := msg.(*SubscriptionMsg).Message.from
+//		topic := msg.(*SubscriptionMsg).topic
+//		value := msg.(*SubscriptionMsg).value
+//		//operator := msg.(*SubscriptionMsg).operator
+//		//isAlpha := msg.(*SubscriptionMsg).isAlpha
+//		subnumber := mos.sub_mng.count_sub
+//
+//		mos.sub_mng.addSubscription(msg)
+//
+//
+//		// 1. Check if ip mapping is correct
+//		assert.Equal(t, subnumber, mos.sub_mng.ip2sub[ip][len(mos.sub_mng.ip2sub[ip]) - 1], "Ip mapping is failed")
+//
+//		// 2. Check topicNode
+//		nameptr := mos.sub_mng.list.head
+//		for nameptr != nil{
+//			if nameptr.topic[0] == topic[0]{
+//				break
+//			}
+//			nameptr = nameptr.next
+//		}
+//
+//		for i := 0 ; i < len(topic); i++{
+//			assert.Equal(t, topic[i], nameptr.topic[i], "topicNode Add is failed")
+//		}
+//
+//		// 3. Check Value in ValueNode
+//		valptr := nameptr.list.head
+//		for valptr != nil{
+//			for i:=0 ; i < len(value); i++{
+//				find := true
+//				if value[i] != valptr.val[i]{
+//					find = false
+//				}
+//				if find{
+//					break
+//				}
+//			}
+//			valptr = valptr.next
+//		}
+//		fmt.Println("my value = ", valptr.val, " real value = ", value)
+//
+//		for i := 0; i < len(value); i++{
+//			assert.Equal(t, value[i], valptr.val[i], "ValNode Add is failed")
+//		}
+//	}
+//}