[be1] add federation result handling

be1-go/channel/federation/federation.go

@@ -7,9 +7,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/rs/zerolog"
+	"go.dedis.ch/kyber/v3/sign/schnorr"
 	"golang.org/x/xerrors"
 	"popstellar/channel"
 	"popstellar/channel/registry"
+	"popstellar/crypto"
 	"popstellar/inbox"
 	jsonrpc "popstellar/message"
 	"popstellar/message/answer"
@@ -40,15 +42,17 @@ const (
 )
 
 type remoteOrganization struct {
-	laoId       string
-	fedChannel  string
-	organizerPk string
+	laoId             string
+	fedChannel        string
+	organizerPk       string
+	signedOrganizerPk string
 
 	// store the pop tokens of the other lao
 	// popTokens map[string]struct{}
 
-	challenge messagedata.Challenge
-	socket    socket.Socket
+	challenge    messagedata.FederationChallenge
+	challengeMsg message.Message
+	socket       socket.Socket
 
 	state State
 	sync.Mutex
@@ -69,7 +73,7 @@ type Channel struct {
 	remoteOrganizations map[string]*remoteOrganization
 
 	// list of challenge requested but not used yet
-	challenges map[messagedata.Challenge]struct{}
+	challenges map[messagedata.FederationChallenge]struct{}
 
 	sync.Mutex
 }
@@ -88,7 +92,7 @@ func NewChannel(channelID string, hub channel.HubFunctionalities,
 		log:                 log,
 		localOrganizerPk:    organizerPk,
 		remoteOrganizations: make(map[string]*remoteOrganization),
-		challenges:          make(map[messagedata.Challenge]struct{}),
+		challenges:          make(map[messagedata.FederationChallenge]struct{}),
 	}
 
 	newChannel.registry = newChannel.NewFederationRegistry()
@@ -155,6 +159,7 @@ func (c *Channel) NewFederationRegistry() registry.MessageRegistry {
 	fedRegistry.Register(messagedata.FederationExpect{}, c.processFederationExpect)
 	fedRegistry.Register(messagedata.FederationInit{}, c.processFederationInit)
 	fedRegistry.Register(messagedata.FederationChallenge{}, c.processFederationChallenge)
+	fedRegistry.Register(messagedata.FederationResult{}, c.processFederationResult)
 
 	return fedRegistry
 }
@@ -230,10 +235,7 @@ func (c *Channel) processFederationInit(msg message.Message,
 	remoteOrg.organizerPk = federationInit.PublicKey
 	remoteOrg.laoId = federationInit.LaoId
 	remoteOrg.fedChannel = fmt.Sprintf("/root/%s/federation", federationInit.LaoId)
-	remoteOrg.challenge = messagedata.Challenge{
-		Value:      federationChallenge.Value,
-		ValidUntil: federationChallenge.Timestamp,
-	}
+	remoteOrg.challenge = federationChallenge
 
 	remoteOrg.socket, err = c.hub.ConnectToServerAsClient(federationInit.ServerAddress)
 	if err != nil {
@@ -293,31 +295,36 @@ func (c *Channel) processFederationExpect(msg message.Message,
 	if err != nil {
 		return xerrors.Errorf("failed to unmarshal federationExpect data: %v", err)
 	}
-
 	remoteOrg := c.getRemoteOrganization(federationExpect.PublicKey)
 	remoteOrg.Lock()
 	defer remoteOrg.Unlock()
 
 	if remoteOrg.state != None {
 		return answer.NewInternalServerError(invalidStateError, remoteOrg.state, msg)
 	}
+	var federationChallenge messagedata.FederationChallenge
+	err = federationExpect.ChallengeMsg.UnmarshalData(&federationChallenge)
+	if err != nil {
+		return xerrors.Errorf("failed to unmarshal federationChallenge data: %v", err)
+	}
 
 	c.Lock()
-	_, ok = c.challenges[federationExpect.Challenge]
+	_, ok = c.challenges[federationChallenge]
 	// always remove the challenge, if present, to avoid challenge reuse
-	delete(c.challenges, federationExpect.Challenge)
+	delete(c.challenges, federationChallenge)
 	c.Unlock()
 
 	if !ok {
 		return answer.NewAccessDeniedError("Invalid challenge %v",
-			federationExpect.Challenge)
+			federationChallenge)
 	}
 
 	remoteOrg.state = ExpectConnect
-	remoteOrg.challenge = federationExpect.Challenge
+	remoteOrg.challenge = federationChallenge
 	remoteOrg.organizerPk = federationExpect.PublicKey
 	remoteOrg.laoId = federationExpect.LaoId
 	remoteOrg.fedChannel = fmt.Sprintf("/root/%s/federation", federationExpect.LaoId)
+	remoteOrg.challengeMsg = federationExpect.ChallengeMsg
 
 	return nil
 }
@@ -369,9 +376,57 @@ func (c *Channel) processFederationChallenge(msg message.Message,
 
 	remoteOrg.state = WaitResult
 	remoteOrg.socket = s
-	// Send Federation result to S1
-	// c.remoteServer.Send(...)
 
+	federationResultData := messagedata.FederationResult{
+		Object:       messagedata.FederationObject,
+		Action:       messagedata.FederationActionResult,
+		Status:       "success",
+		PublicKey:    remoteOrg.signedOrganizerPk,
+		ChallengeMsg: remoteOrg.challengeMsg,
+	}
+
+	dataBytes, err := json.Marshal(federationResultData)
+	if err != nil {
+		return xerrors.Errorf("failed to marshal federation result message data: %v", err)
+	}
+
+	dataBase64 := base64.URLEncoding.EncodeToString(dataBytes)
+	signatureBytes, err := c.hub.Sign(dataBytes)
+	if err != nil {
+		return xerrors.Errorf("failed to sign federation result message: %v", err)
+	}
+	signatureBase64 := base64.URLEncoding.EncodeToString(signatureBytes)
+
+	federationResultMsg := message.Message{
+		Data:              dataBase64,
+		Sender:            c.hub.GetPubKeyServ().String(),
+		Signature:         signatureBase64,
+		MessageID:         messagedata.Hash(dataBase64, signatureBase64),
+		WitnessSignatures: []message.WitnessSignature{},
+	}
+
+	rpcMessage := method.Publish{
+		Base: query.Base{
+			JSONRPCBase: jsonrpc.JSONRPCBase{
+				JSONRPC: "2.0",
+			},
+			Method: "publish",
+		},
+
+		Params: struct {
+			Channel string          `json:"channel"`
+			Message message.Message `json:"message"`
+		}{
+			Channel: remoteOrg.fedChannel,
+			Message: federationResultMsg,
+		},
+	}
+	buf, err := json.Marshal(&rpcMessage)
+	if err != nil {
+		return xerrors.Errorf("failed to marshal publish query: %v", err)
+	}
+
+	remoteOrg.socket.Send(buf)
 	return nil
 }
 
@@ -405,22 +460,17 @@ func (c *Channel) processChallengeRequest(msg message.Message,
 	}
 	challengeValue := hex.EncodeToString(randomBytes)
 	expirationTime := time.Now().Add(time.Minute * 5).Unix()
-	challenge := messagedata.Challenge{
+	federationChallenge := messagedata.FederationChallenge{
+		Object:     messagedata.FederationObject,
+		Action:     messagedata.FederationActionChallenge,
 		Value:      challengeValue,
 		ValidUntil: expirationTime,
 	}
 
 	c.Lock()
-	c.challenges[challenge] = struct{}{}
+	c.challenges[federationChallenge] = struct{}{}
 	c.Unlock()
 
-	federationChallenge := messagedata.FederationChallenge{
-		Object:    messagedata.FederationObject,
-		Action:    messagedata.FederationActionChallenge,
-		Value:     challengeValue,
-		Timestamp: expirationTime,
-	}
-
 	challengeData, err := json.Marshal(federationChallenge)
 	if err != nil {
 		return xerrors.Errorf(
@@ -475,6 +525,97 @@ func (c *Channel) processChallengeRequest(msg message.Message,
 	return nil
 }
 
+func (c *Channel) processFederationResult(msg message.Message,
+	msgData interface{}, s socket.Socket) error {
+	_, ok := msgData.(*messagedata.FederationResult)
+	if !ok {
+		return xerrors.Errorf("message %v is not a federation#result message",
+			msgData)
+	}
+
+	/*
+	   This state should probably be set after sending the FederationInit message?
+	*/
+	//if c.state != WaitResult {
+	//	return answer.NewInternalServerError(invalidStateError, c.state, msg)
+	//}
+
+	var federationResult messagedata.FederationResult
+
+	err := msg.UnmarshalData(&federationResult)
+	if err != nil {
+		return xerrors.Errorf("failed to unmarshal FederationResult data: %v", err)
+	}
+
+	if federationResult.Status != "success" {
+		if len(federationResult.Reason) > 0 {
+			return xerrors.Errorf("failed to establish federated connection: %v", federationResult.Reason)
+		}
+		return xerrors.Errorf("failed to establish federated connection")
+	}
+
+	var federationChallenge messagedata.FederationChallenge
+	err = federationResult.ChallengeMsg.UnmarshalData(&federationChallenge)
+	if err != nil {
+		return xerrors.Errorf("failed to unmarshal challenge from FederationResult data: %v", err)
+	}
+
+	challengeDataBytes, err := base64.URLEncoding.DecodeString(federationResult.ChallengeMsg.Data)
+	if err != nil {
+		return xerrors.Errorf("failed to decode challenge data in FederationResult: %v", err)
+
+	}
+
+	challengeSignatureBytes, err := base64.URLEncoding.DecodeString(federationResult.ChallengeMsg.Signature)
+	if err != nil {
+		return xerrors.Errorf("failed to decode challenge signature in FederationResult: %v", err)
+
+	}
+
+	remoteOrg := c.getRemoteOrganization(federationChallenge.Value)
+	remoteOrg.Lock()
+	defer remoteOrg.Unlock()
+	pkBytes, err := base64.URLEncoding.DecodeString(remoteOrg.organizerPk)
+	if err != nil {
+		return xerrors.Errorf("failed to decode remote organizers public key: %v", err)
+
+	}
+
+	remotePk := crypto.Suite.Point()
+
+	err = remotePk.UnmarshalBinary(pkBytes)
+	if err != nil {
+		return xerrors.Errorf("failed to decode remote organizers public key: %v", err)
+
+	}
+	err = schnorr.Verify(crypto.Suite, remotePk, challengeDataBytes, challengeSignatureBytes)
+	if err != nil {
+		return xerrors.Errorf("failed to verify signature on challenge in FederationResult message: %v", err)
+
+	}
+
+	pkSignatureBytes, err := base64.URLEncoding.DecodeString(federationResult.PublicKey)
+	if err != nil {
+		return xerrors.Errorf("failed to decode signature on local public key in FederationResult message: %v", err)
+
+	}
+	localPkBinary, err := c.hub.GetPubKeyOwner().MarshalBinary()
+	if err != nil {
+		return xerrors.Errorf("failed to marshal local organizer public key: %v", err)
+
+	}
+
+	err = schnorr.Verify(crypto.Suite, remotePk, localPkBinary, pkSignatureBytes)
+	if err != nil {
+		return xerrors.Errorf("failed to verify remote signature on local organizer public key: %v", err)
+
+	}
+
+	remoteOrg.state = Connected
+
+	return nil
+}
+
 // getRemoteOrganization get the remoteOrganization for the given organizerPk
 // or return a new empty one.
 func (c *Channel) getRemoteOrganization(organizerPk string) *remoteOrganization {