update container signature verify

server/taskresult.go

@@ -77,16 +77,22 @@ func (wm *WorkerManager) computeTaskResult(worker *Worker, task *odysseus.TaskCo
 		if len(signature) == 65 {
 			signature = signature[:64]
 		}
-		pubkey := utils.FromHex(string(task.ContainerPubkey))
-		if len(pubkey) > 65 {
-			pubkey = pubkey[:65]
+		pubLen := len(task.ContainerPubkey)
+		pubkey := []byte{}
+
+		if pubLen == 130 || pubLen == 132 {
+			pubkey = utils.FromHex(string(task.ContainerPubkey))
+		} else if pubLen == 65 {
+			pubkey = task.ContainerPubkey
 		}
 
 		verified := crypto.VerifySignature(pubkey, dataHash[:], signature)
 		log.WithFields(log.Fields{
 			"containerSignatureVerify": verified,
 			"taskkind":                 task.TaskKind,
-			"containerPubkey":          string(task.ContainerPubkey),
+			"dataHash":                 hex.EncodeToString(dataHash[:]),
+			"containerPubkey":          hex.EncodeToString(pubkey),
+			"signature":                hex.EncodeToString(signature),
 		}).Debug("container signature verify")
 		if !verified {
 			// todo: handle signature verify failed
@@ -182,10 +188,13 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC
 		if len(signature) == 65 {
 			signature = signature[:64]
 		}
-		pubkey := task.ContainerPubkey
-		//pubkey := utils.FromHex(string(task.ContainerPubkey))
-		if len(pubkey) > 65 {
-			pubkey = pubkey[:65]
+		pubLen := len(task.ContainerPubkey)
+		pubkey := []byte{}
+
+		if pubLen == 130 || pubLen == 132 {
+			pubkey = utils.FromHex(string(task.ContainerPubkey))
+		} else if pubLen == 65 {
+			pubkey = task.ContainerPubkey
 		}
 
 		verified := crypto.VerifySignature(pubkey, dataHash[:], signature)
@@ -193,7 +202,7 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC
 			"containerSignatureVerify": verified,
 			"taskkind":                 task.TaskKind,
 			"dataHash":                 hex.EncodeToString(dataHash[:]),
-			"containerPubkey":          hex.EncodeToString(task.ContainerPubkey),
+			"containerPubkey":          hex.EncodeToString(pubkey),
 			"signature":                hex.EncodeToString(signature),
 		}).Debug("container signature verify")
 		if !verified {

utils/crypto_test.go

 package utils
+
+import (
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/magiconair/properties/assert"
+	"testing"
+)
+
+func TestCombineBytes(t *testing.T) {
+	hash := FromHex("0xaa81f776e43511492b9db11894c71e7fdca3f09bd24dc1fe93f1e017e6eef947")
+	pubkey := FromHex("0423965c5d5b4c2fa03fe024cfbcd413db25e7c420b73bd5dccb78fada9e22d4848d32952c913ae0cdcc70efa38094dc49c05c6a0cec7e1712557050da7d7bd05a")
+	signature := FromHex("db2be765e420d3b67e695612a349090e9fe2446c6b7875d36a0e6268bc3619e14d24b93a5d8f7f55b9649ad3f5a636a886c480fbe6fb5c49f3b716c0ea66ea7a01")
+	if len(signature) == 65 {
+		signature = signature[:64]
+	}
+	if len(pubkey) > 65 {
+		pubkey = pubkey[:65]
+	}
+	verified := crypto.VerifySignature(pubkey, hash, signature)
+	assert.Equal(t, verified, true)
+}