finish secure.go

modules/matching_test.go

@@ -1,37 +0,0 @@
-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){}

modules/message.go

@@ -71,7 +71,8 @@ type PublishMsg struct {
 type SubscriptionMsg struct {
 	Message
 	topic []int64 //대주제
-	value []string //범위 및 세부조건, 피연산자 연산자 순으로 등장
+	value []int64 //피연산자
+	operator []string //연산자
 	isAlpha bool // 범위연산인지 단순비교연산인지 구분 가능하게 함
 }
 

modules/secure.go

@@ -10,10 +10,18 @@ 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
 }
 
 /**
@@ -26,12 +34,12 @@ func (sc Security) RegKey(ksm KeyShareMsg) {
 /**
 각 노드의 키를 주소를 이용하여 맵에서 가져옴
  */
-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
 }
@@ -39,7 +47,7 @@ func (sc Security) GetNodeKey(message Message) int{
 /**
 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
 	}
@@ -48,6 +56,39 @@ func (sc Security) ReEncrypt(fromKey int,  toKey int, target []int) []int{
 }
 
 
+/**
+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{
 //