Merge branch 'master' into feat/remote-storage

# Conflicts:
#	client/client.go
#	main.go
This commit is contained in:
Andrej Zavgorodnij 2020-09-09 13:54:59 +03:00
commit 9c6ea1f8f1
8 changed files with 508 additions and 120 deletions

View File

@ -216,7 +216,7 @@ func (am *AirgappedMachine) HandleOperation(operation client.Operation) (client.
}
// HandleQR - gets an operation from a QR code, do necessary things for the operation and returns paths to QR-code images
func (am *AirgappedMachine) HandleQR() (string, error) {
func (am *AirgappedMachine) HandleQR() ([]string, error) {
var (
err error
@ -227,28 +227,38 @@ func (am *AirgappedMachine) HandleQR() (string, error) {
resultOperation client.Operation
)
if qrData, err = am.qrProcessor.ReadQR(); err != nil {
return "", fmt.Errorf("failed to read QR: %w", err)
if qrData, err = qr.ReadDataFromQRChunks(am.qrProcessor); err != nil {
return nil, fmt.Errorf("failed to read QR: %w", err)
}
if err = json.Unmarshal(qrData, &operation); err != nil {
return "", fmt.Errorf("failed to unmarshal operation: %w", err)
return nil, fmt.Errorf("failed to unmarshal operation: %w", err)
}
if resultOperation, err = am.HandleOperation(operation); err != nil {
return "", err
return nil, err
}
qrPath := fmt.Sprintf("%s/%s_%s_%s.png", resultQRFolder, resultOperation.Type, resultOperation.ID, resultOperation.To)
operationBz, err := json.Marshal(resultOperation)
if err != nil {
return "", fmt.Errorf("failed to marshal operation: %w", err)
return nil, fmt.Errorf("failed to marshal operation: %w", err)
}
if err = am.qrProcessor.WriteQR(qrPath, operationBz); err != nil {
return "", fmt.Errorf("failed to write QR")
chunks, err := qr.DataToChunks(operationBz)
if err != nil {
return nil, fmt.Errorf("failed to divide a data on chunks: %w", err)
}
qrPaths := make([]string, 0, len(chunks))
for idx, chunk := range chunks {
qrPath := fmt.Sprintf("%s/%s_%s_%s-%d.png", resultQRFolder, resultOperation.Type, resultOperation.ID,
resultOperation.To, idx)
if err = am.qrProcessor.WriteQR(qrPath, chunk); err != nil {
return nil, fmt.Errorf("failed to write QR")
}
qrPaths = append(qrPaths, qrPath)
}
return qrPath, nil
return qrPaths, nil
}
func (am *AirgappedMachine) writeErrorRequestToOperation(o *client.Operation, handlerError error) error {

View File

@ -6,14 +6,12 @@ import (
"encoding/json"
"errors"
"fmt"
sipf "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
"log"
"path/filepath"
"sync"
"time"
sipf "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
"github.com/depools/dc4bc/airgapped"
"github.com/depools/dc4bc/client/types"
"github.com/depools/dc4bc/fsm/types/requests"
"github.com/google/uuid"
@ -34,9 +32,22 @@ const (
QrCodesDir = "/tmp"
)
type Poller interface {
GetAddr() string
GetPubKey() ed25519.PublicKey
Poll() error
SendMessage(message storage.Message) error
ProcessMessage(message storage.Message) error
GetOperations() (map[string]*types.Operation, error)
GetOperationQRPath(operationID string) ([]string, error)
ReadProcessedOperation() error
StartHTTPServer(listenAddr string) error
GetLogger() *logger
}
type Client struct {
sync.Mutex
logger *logger
Logger *logger
userName string
address string
pubKey ed25519.PublicKey
@ -45,7 +56,6 @@ type Client struct {
storage storage.Storage
keyStore KeyStore
qrProcessor qr.Processor
Airgapped *airgapped.AirgappedMachine
}
func NewClient(
@ -55,8 +65,7 @@ func NewClient(
storage storage.Storage,
keyStore KeyStore,
qrProcessor qr.Processor,
airgappedMachine *airgapped.AirgappedMachine,
) (*Client, error) {
) (Poller, error) {
keyPair, err := keyStore.LoadKeys(userName, "")
if err != nil {
return nil, fmt.Errorf("failed to LoadKeys: %w", err)
@ -64,7 +73,7 @@ func NewClient(
return &Client{
ctx: ctx,
logger: newLogger(userName),
Logger: newLogger(userName),
userName: userName,
address: keyPair.GetAddr(),
pubKey: keyPair.Pub,
@ -72,10 +81,13 @@ func NewClient(
storage: storage,
keyStore: keyStore,
qrProcessor: qrProcessor,
Airgapped: airgappedMachine,
}, nil
}
func (c *Client) GetLogger() *logger {
return c.Logger
}
func (c *Client) GetAddr() string {
return c.address
}
@ -101,38 +113,15 @@ func (c *Client) Poll() error {
for _, message := range messages {
if message.RecipientAddr == "" || message.RecipientAddr == c.GetAddr() {
c.logger.Log("Handling message with offset %d, type %s", message.Offset, message.Event)
c.Logger.Log("Handling message with offset %d, type %s", message.Offset, message.Event)
if err := c.ProcessMessage(message); err != nil {
c.logger.Log("Failed to process message: %v", err)
c.Logger.Log("Failed to process message: %v", err)
} else {
c.logger.Log("Successfully processed message with offset %d, type %s",
c.Logger.Log("Successfully processed message with offset %d, type %s",
message.Offset, message.Event)
}
}
}
operations, err := c.GetOperations()
if err != nil {
c.logger.Log("Failed to get operations: %v", err)
}
c.logger.Log("Got %d Operations from pool", len(operations))
for _, operation := range operations {
c.logger.Log("Handling operation %s in airgapped", operation.Type)
processedOperation, err := c.Airgapped.HandleOperation(*operation)
if err != nil {
c.logger.Log("Failed to handle operation: %v", err)
}
c.logger.Log("Got %d Processed Operations from Airgapped", len(operations))
c.logger.Log("Operation %s handled in airgapped, result event is %s",
operation.Event, processedOperation.Event)
if err = c.handleProcessedOperation(processedOperation); err != nil {
c.logger.Log("Failed to handle processed operation: %v", err)
} else {
c.logger.Log("Successfully handled processed operation %s", processedOperation.Event)
}
}
case <-c.ctx.Done():
log.Println("Context closed, stop polling...")
return nil
@ -170,7 +159,7 @@ func (c *Client) ProcessMessage(message storage.Message) error {
return fmt.Errorf("failed to Do operation in FSM: %w", err)
}
c.logger.Log("message %s done successfully from %s", message.Event, message.SenderAddr)
c.Logger.Log("message %s done successfully from %s", message.Event, message.SenderAddr)
if resp.State == spf.StateSignatureProposalCollected {
fsmInstance, err = state_machines.FromDump(fsmDump)
@ -224,7 +213,7 @@ func (c *Client) ProcessMessage(message storage.Message) error {
}
}
default:
c.logger.Log("State %s does not require an operation", resp.State)
c.Logger.Log("State %s does not require an operation", resp.State)
}
if operation != nil {
@ -264,25 +253,36 @@ func (c *Client) getOperationJSON(operationID string) ([]byte, error) {
// GetOperationQRPath returns a path to the image with the QR generated
// for the specified operation. It is supposed that the user will open
// this file herself.
func (c *Client) GetOperationQRPath(operationID string) (string, error) {
func (c *Client) GetOperationQRPath(operationID string) ([]string, error) {
operationJSON, err := c.getOperationJSON(operationID)
if err != nil {
return "", fmt.Errorf("failed to get operation in JSON: %w", err)
return nil, fmt.Errorf("failed to get operation in JSON: %w", err)
}
operationQRPath := filepath.Join(QrCodesDir, operationID)
if err := c.qrProcessor.WriteQR(operationQRPath, operationJSON); err != nil {
return "", fmt.Errorf("failed to WriteQR: %w", err)
chunks, err := qr.DataToChunks(operationJSON)
if err != nil {
return nil, fmt.Errorf("failed to divide a data on chunks: %w", err)
}
return operationQRPath, nil
qrs := make([]string, 0, len(chunks))
for idx, chunk := range chunks {
qrPath := fmt.Sprintf("%s-%d", operationQRPath, idx)
if err = c.qrProcessor.WriteQR(qrPath, chunk); err != nil {
return nil, err
}
qrs = append(qrs, qrPath)
}
return qrs, nil
}
// ReadProcessedOperation reads the processed operation from camera, checks that
// the processed operation has its unprocessed counterpart in our state,
// posts a Message to the storage and deletes the operation from our state.
func (c *Client) ReadProcessedOperation() error {
bz, err := c.qrProcessor.ReadQR()
bz, err := qr.ReadDataFromQRChunks(c.qrProcessor)
if err != nil {
return fmt.Errorf("failed to ReadQR: %s", err)
}

View File

@ -49,7 +49,6 @@ func TestClient_ProcessMessage(t *testing.T) {
stg,
keyStore,
qrProcessor,
nil,
)
req.NoError(err)
@ -132,7 +131,6 @@ func TestClient_GetOperationsList(t *testing.T) {
stg,
keyStore,
qrProcessor,
nil,
)
req.NoError(err)
@ -180,7 +178,6 @@ func TestClient_GetOperationQRPath(t *testing.T) {
stg,
keyStore,
qrProcessor,
nil,
)
req.NoError(err)
@ -232,7 +229,6 @@ func TestClient_ReadProcessedOperation(t *testing.T) {
stg,
keyStore,
qrProcessor,
nil,
)
req.NoError(err)

View File

@ -1,9 +1,15 @@
package client
import (
"crypto/md5"
"encoding/hex"
"encoding/json"
"fmt"
"github.com/depools/dc4bc/client/types"
"github.com/depools/dc4bc/fsm/fsm"
spf "github.com/depools/dc4bc/fsm/state_machines/signature_proposal_fsm"
sif "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
"github.com/google/uuid"
"image"
"io/ioutil"
"log"
@ -13,16 +19,40 @@ import (
"github.com/depools/dc4bc/storage"
)
func errorResponse(w http.ResponseWriter, statusCode int, err string) {
log.Println(err)
w.WriteHeader(statusCode)
if _, err := w.Write([]byte(err)); err != nil {
type Response struct {
ErrorMessage string `json:"error_message,omitempty"`
Result interface{} `json:"result"`
}
func rawResponse(w http.ResponseWriter, response []byte) {
if _, err := w.Write(response); err != nil {
panic(fmt.Sprintf("failed to write response: %v", err))
}
}
func successResponse(w http.ResponseWriter, response []byte) {
if _, err := w.Write(response); err != nil {
func errorResponse(w http.ResponseWriter, statusCode int, error string) {
w.WriteHeader(statusCode)
w.Header().Set("Content-Type", "application/json")
resp := Response{ErrorMessage: error}
respBz, err := json.Marshal(resp)
if err != nil {
log.Printf("Failed to marshal response: %v\n", err)
return
}
if _, err := w.Write(respBz); err != nil {
panic(fmt.Sprintf("failed to write response: %v", err))
}
}
func successResponse(w http.ResponseWriter, response interface{}) {
w.Header().Set("Content-Type", "application/json")
resp := Response{Result: response}
respBz, err := json.Marshal(resp)
if err != nil {
log.Printf("Failed to marshal response: %v\n", err)
return
}
if _, err := w.Write(respBz); err != nil {
panic(fmt.Sprintf("failed to write response: %v", err))
}
}
@ -36,7 +66,12 @@ func (c *Client) StartHTTPServer(listenAddr string) error {
mux.HandleFunc("/readProcessedOperation", c.readProcessedOperationFromBodyHandler)
mux.HandleFunc("/getOperationQR", c.getOperationQRToBodyHandler)
mux.HandleFunc("/handleProcessedOperationJSON", c.handleJSONOperationHandler)
mux.HandleFunc("/startDKG", c.startDKGHandler)
mux.HandleFunc("/proposeSignMessage", c.proposeSignDataHandler)
c.Logger.Log("Starting HTTP server on address: %s", listenAddr)
return http.ListenAndServe(listenAddr, mux)
}
@ -50,6 +85,7 @@ func (c *Client) sendMessageHandler(w http.ResponseWriter, r *http.Request) {
errorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to read request body: %v", err))
return
}
defer r.Body.Close()
var msg storage.Message
if err = json.Unmarshal(reqBytes, &msg); err != nil {
@ -62,7 +98,7 @@ func (c *Client) sendMessageHandler(w http.ResponseWriter, r *http.Request) {
return
}
successResponse(w, []byte("ok"))
successResponse(w, "ok")
}
func (c *Client) getOperationsHandler(w http.ResponseWriter, r *http.Request) {
@ -77,13 +113,7 @@ func (c *Client) getOperationsHandler(w http.ResponseWriter, r *http.Request) {
return
}
response, err := json.Marshal(operations)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to marshal operations: %v", err))
return
}
successResponse(w, response)
successResponse(w, operations)
}
func (c *Client) getOperationQRPathHandler(w http.ResponseWriter, r *http.Request) {
@ -93,13 +123,13 @@ func (c *Client) getOperationQRPathHandler(w http.ResponseWriter, r *http.Reques
}
operationID := r.URL.Query().Get("operationID")
qrPath, err := c.GetOperationQRPath(operationID)
qrPaths, err := c.GetOperationQRPath(operationID)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to get operation QR path: %v", err))
return
}
successResponse(w, []byte(qrPath))
successResponse(w, qrPaths)
}
func (c *Client) getOperationQRToBodyHandler(w http.ResponseWriter, r *http.Request) {
@ -123,7 +153,7 @@ func (c *Client) getOperationQRToBodyHandler(w http.ResponseWriter, r *http.Requ
w.Header().Set("Content-Type", "image/jpeg")
w.Header().Set("Content-Length", fmt.Sprintf("%d", len(encodedData)))
successResponse(w, encodedData)
rawResponse(w, encodedData)
}
func (c *Client) readProcessedOperationFromCameraHandler(w http.ResponseWriter, r *http.Request) {
@ -138,7 +168,7 @@ func (c *Client) readProcessedOperationFromCameraHandler(w http.ResponseWriter,
return
}
successResponse(w, []byte("ok"))
successResponse(w, "ok")
}
func (c *Client) readProcessedOperationFromBodyHandler(w http.ResponseWriter, r *http.Request) {
@ -179,4 +209,102 @@ func (c *Client) readProcessedOperationFromBodyHandler(w http.ResponseWriter, r
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to handle an operation: %v", err))
return
}
successResponse(w, "ok")
}
func (c *Client) startDKGHandler(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
errorResponse(w, http.StatusBadRequest, "Wrong HTTP method")
return
}
reqBody, err := ioutil.ReadAll(r.Body)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to read body: %v", err))
return
}
defer r.Body.Close()
dkgRoundID := md5.Sum(reqBody)
message, err := c.buildMessage(hex.EncodeToString(dkgRoundID[:]), spf.EventInitProposal, reqBody)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to build message: %v", err))
return
}
if err = c.SendMessage(*message); err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to send message: %v", err))
return
}
successResponse(w, "ok")
}
func (c *Client) proposeSignDataHandler(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
errorResponse(w, http.StatusBadRequest, "Wrong HTTP method")
return
}
reqBody, err := ioutil.ReadAll(r.Body)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to read body: %v", err))
return
}
defer r.Body.Close()
var req map[string][]byte
if err = json.Unmarshal(reqBody, &req); err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to umarshal request: %v", err))
return
}
message, err := c.buildMessage(hex.EncodeToString(req["dkgID"]), sif.EventSigningStart, req["data"])
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to build message: %v", err))
}
if err = c.SendMessage(*message); err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to send message: %v", err))
return
}
successResponse(w, "ok")
}
func (c *Client) handleJSONOperationHandler(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
errorResponse(w, http.StatusBadRequest, "Wrong HTTP method")
return
}
reqBody, err := ioutil.ReadAll(r.Body)
if err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to read body: %v", err))
return
}
defer r.Body.Close()
var req types.Operation
if err = json.Unmarshal(reqBody, &req); err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to umarshal request: %v", err))
return
}
if err = c.handleProcessedOperation(req); err != nil {
errorResponse(w, http.StatusInternalServerError, fmt.Sprintf("failed to handle processed operation: %v", err))
return
}
successResponse(w, "ok")
}
func (c *Client) buildMessage(dkgRoundID string, event fsm.Event, data []byte) (*storage.Message, error) {
message := storage.Message{
ID: uuid.New().String(),
DkgRoundID: dkgRoundID,
Event: string(event),
Data: data,
SenderAddr: c.GetAddr(),
}
signature, err := c.signMessage(message.Bytes())
if err != nil {
return nil, fmt.Errorf("failed to sign message: %w", err)
}
message.Signature = signature
return &message, nil
}

169
main.go
View File

@ -1,41 +1,122 @@
package main
import (
"bytes"
"context"
"crypto/ed25519"
"crypto/md5"
"encoding/hex"
"encoding/json"
"fmt"
"github.com/depools/dc4bc/client/types"
_ "image/jpeg"
"io/ioutil"
"log"
"net/http"
"sync"
"time"
"github.com/depools/dc4bc/airgapped"
"github.com/depools/dc4bc/client"
spf "github.com/depools/dc4bc/fsm/state_machines/signature_proposal_fsm"
sif "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
"github.com/depools/dc4bc/fsm/types/requests"
"github.com/depools/dc4bc/qr"
"github.com/depools/dc4bc/storage"
"github.com/google/uuid"
)
type Transport struct {
nodes []*client.Client
type node struct {
client client.Poller
keyPair *client.KeyPair
air *airgapped.AirgappedMachine
listenAddr string
}
type node struct {
client *client.Client
keyPair *client.KeyPair
type OperationsResponse struct {
Result map[string]*types.Operation `json:"result"`
}
func getOperations(url string) (*OperationsResponse, error) {
resp, err := http.Get(url)
if err != nil {
return nil, fmt.Errorf("failed to get operations for node %w", err)
}
defer resp.Body.Close()
responseBody, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Fatalf("failed to read body %v", err)
}
var response OperationsResponse
if err = json.Unmarshal(responseBody, &response); err != nil {
return nil, fmt.Errorf("failed to unmarshal response: %v", err)
}
return &response, nil
}
func handleProcessedOperation(url string, operation types.Operation) error {
operationBz, err := json.Marshal(operation)
if err != nil {
return fmt.Errorf("failed to marshal operation: %w", err)
}
resp, err := http.Post(url, "application/json", bytes.NewReader(operationBz))
if err != nil {
return fmt.Errorf("failed to handle processed operation %w", err)
}
defer resp.Body.Close()
responseBody, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Fatalf("failed to read body %v", err)
}
var response client.Response
if err = json.Unmarshal(responseBody, &response); err != nil {
return fmt.Errorf("failed to unmarshal response: %w", err)
}
if response.ErrorMessage != "" {
return fmt.Errorf("failed to handle processed operation: %s", response.ErrorMessage)
}
return nil
}
func (n *node) run() {
for {
operationsResponse, err := getOperations(fmt.Sprintf("http://%s/getOperations", n.listenAddr))
if err != nil {
log.Fatalf("failed to get operations: %v", err)
}
operations := operationsResponse.Result
if len(operations) == 0 {
time.Sleep(1 * time.Second)
continue
}
n.client.GetLogger().Log("Got %d Operations from pool", len(operations))
for _, operation := range operations {
n.client.GetLogger().Log("Handling operation %s in airgapped", operation.Type)
processedOperation, err := n.air.HandleOperation(*operation)
if err != nil {
n.client.GetLogger().Log("Failed to handle operation: %v", err)
}
n.client.GetLogger().Log("Got %d Processed Operations from Airgapped", len(operations))
n.client.GetLogger().Log("Operation %s handled in airgapped, result event is %s",
operation.Event, processedOperation.Event)
if err = handleProcessedOperation(fmt.Sprintf("http://%s/handleProcessedOperationJSON", n.listenAddr),
processedOperation); err != nil {
n.client.GetLogger().Log("Failed to handle processed operation: %v", err)
} else {
n.client.GetLogger().Log("Successfully handled processed operation %s", processedOperation.Event)
}
}
}
}
func main() {
var numNodes = 4
var threshold = 3
//var storagePath = "/tmp/dc4bc_storage"
var nodes = make([]*node, 4)
var nodes = make([]*node, numNodes)
startingPort := 8080
for nodeID := 0; nodeID < numNodes; nodeID++ {
var ctx = context.Background()
var userName = fmt.Sprintf("node_%d", nodeID)
@ -71,26 +152,36 @@ func main() {
stg,
keyStore,
qr.NewCameraProcessor(),
airgappedMachine,
)
if err != nil {
log.Fatalf("node %d failed to init client: %v\n", nodeID, err)
}
clt.Airgapped.SetAddress(clt.GetAddr())
airgappedMachine.SetAddress(clt.GetAddr())
nodes[nodeID] = &node{
client: clt,
keyPair: keyPair,
client: clt,
keyPair: keyPair,
air: airgappedMachine,
listenAddr: fmt.Sprintf("localhost:%d", startingPort),
}
startingPort++
}
// Each node starts to Poll().
for nodeID, node := range nodes {
go func(nodeID int, node *client.Client) {
for nodeID, n := range nodes {
go func(nodeID int, node *node) {
if err := node.client.StartHTTPServer(node.listenAddr); err != nil {
log.Fatalf("failed to start HTTP server for nodeID #%d: %v\n", nodeID, err)
}
}(nodeID, n)
time.Sleep(1 * time.Second)
go nodes[nodeID].run()
go func(nodeID int, node client.Poller) {
if err := node.Poll(); err != nil {
log.Fatalf("client %d poller failed: %v\n", nodeID, err)
}
}(nodeID, node.client)
}(nodeID, n.client)
log.Printf("client %d started...\n", nodeID)
}
@ -103,7 +194,7 @@ func main() {
// Node1 tells other participants to start DKG.
var participants []*requests.SignatureProposalParticipantsEntry
for _, node := range nodes {
dkgPubKey, err := node.client.Airgapped.GetPubKey().MarshalBinary()
dkgPubKey, err := node.air.GetPubKey().MarshalBinary()
if err != nil {
log.Fatalln("failed to get DKG pubKey:", err.Error())
}
@ -123,44 +214,34 @@ func main() {
log.Fatalf("failed to marshal SignatureProposalParticipantsListRequest: %v\n", err)
}
dkgRoundID := md5.Sum(messageDataBz)
message := storage.Message{
ID: uuid.New().String(),
DkgRoundID: hex.EncodeToString(dkgRoundID[:]),
Event: string(spf.EventInitProposal),
Data: messageDataBz,
SenderAddr: nodes[0].client.GetAddr(),
}
message.Signature = ed25519.Sign(nodes[0].keyPair.Priv, message.Bytes())
if _, err := stg.Send(message); err != nil {
log.Fatalf("Failed to send %+v to storage: %v\n", message, err)
if _, err := http.Post(fmt.Sprintf("http://localhost:%d/startDKG", startingPort-1),
"application/json", bytes.NewReader(messageDataBz)); err != nil {
log.Fatalf("failed to send HTTP request to start DKG: %v\n", err)
}
time.Sleep(10 * time.Second)
log.Println("Propose message to sign")
dkgRoundID := md5.Sum(messageDataBz)
messageDataSign := requests.SigningProposalStartRequest{
ParticipantId: 0,
ParticipantId: len(nodes) - 1,
SrcPayload: []byte("message to sign"),
CreatedAt: time.Now(),
}
messageDataBz, err = json.Marshal(messageDataSign)
messageDataSignBz, err := json.Marshal(messageDataSign)
if err != nil {
log.Fatalf("failed to marshal SigningProposalStartRequest: %v\n", err)
}
messageDataBz, err = json.Marshal(map[string][]byte{"data": messageDataSignBz,
"dkgID": dkgRoundID[:]})
if err != nil {
log.Fatalf("failed to marshal SignatureProposalParticipantsListRequest: %v\n", err)
}
message = storage.Message{
ID: uuid.New().String(),
DkgRoundID: hex.EncodeToString(dkgRoundID[:]),
Event: string(sif.EventSigningStart),
Data: messageDataBz,
SenderAddr: nodes[0].client.GetAddr(),
}
message.Signature = ed25519.Sign(nodes[0].keyPair.Priv, message.Bytes())
if _, err := stg.Send(message); err != nil {
log.Fatalf("Failed to send %+v to storage: %v\n", message, err)
if _, err := http.Post(fmt.Sprintf("http://localhost:%d/proposeSignMessage", startingPort-1),
"application/json", bytes.NewReader(messageDataBz)); err != nil {
log.Fatalf("failed to send HTTP request to sign message: %v\n", err)
}
var wg = sync.WaitGroup{}

79
qr/chunk.go Normal file
View File

@ -0,0 +1,79 @@
package qr
import (
"bytes"
"encoding/gob"
"fmt"
"math"
)
const chunkSize = 1024
type chunk struct {
Data []byte
IsFinal bool
}
func ReadDataFromQRChunks(p Processor) ([]byte, error) {
var (
fullData, chunkBz []byte
err error
)
for {
chunkBz, err = p.ReadQR()
if err != nil {
return nil, err
}
chunk, err := decodeChunk(chunkBz)
if err != nil {
return nil, fmt.Errorf("failed to decode chunk: %w", err)
}
fullData = append(fullData, chunk.Data...)
if chunk.IsFinal {
return fullData, nil
}
}
}
func DataToChunks(data []byte) ([][]byte, error) {
chunksCount := int(math.Ceil(float64(len(data)) / chunkSize))
chunks := make([][]byte, 0, chunksCount)
for offset := 0; offset < len(data); offset += chunkSize {
offsetEnd := offset + chunkSize
if offsetEnd > len(data) {
offsetEnd = len(data)
}
isFinal := offsetEnd == len(data)
chunkBz, err := encodeChunk(chunk{
Data: data[offset:offsetEnd],
IsFinal: isFinal,
})
if err != nil {
return nil, fmt.Errorf("failed to encode chunk: %w", err)
}
chunks = append(chunks, chunkBz)
}
return chunks, nil
}
func decodeChunk(data []byte) (*chunk, error) {
var (
c chunk
err error
)
dec := gob.NewDecoder(bytes.NewBuffer(data))
if err = dec.Decode(&c); err != nil {
return nil, fmt.Errorf("failed to decode chunk: %w", err)
}
return &c, nil
}
func encodeChunk(c chunk) ([]byte, error) {
buf := bytes.NewBuffer(nil)
enc := gob.NewEncoder(buf)
if err := enc.Encode(c); err != nil {
return nil, fmt.Errorf("failed to encode chunk: %w", err)
}
return buf.Bytes(), nil
}

View File

@ -93,7 +93,7 @@ func ReadDataFromQR(img image.Image) ([]byte, error) {
if err != nil {
return nil, fmt.Errorf("failed to decode the QR-code contents: %w", err)
}
return result.GetRawBytes(), nil
return []byte(result.String()), nil
}
func EncodeQR(data []byte) ([]byte, error) {

94
qr/qr_test.go Normal file
View File

@ -0,0 +1,94 @@
package qr
import (
"fmt"
encoder "github.com/skip2/go-qrcode"
"image"
"math/rand"
"os"
"reflect"
"testing"
)
type TestQrProcessor struct {
qrs []string
}
func NewTestQRProcessor() *TestQrProcessor {
return &TestQrProcessor{}
}
func (p *TestQrProcessor) ReadQR() ([]byte, error) {
if len(p.qrs) == 0 {
return nil, fmt.Errorf("qr not found")
}
qr := p.qrs[0]
file, err := os.Open(qr)
if err != nil {
return nil, err
}
defer file.Close()
img, _, err := image.Decode(file)
if err != nil {
return nil, err
}
data, err := ReadDataFromQR(img)
if err != nil {
return nil, err
}
p.qrs = p.qrs[1:]
if err = os.Remove(qr); err != nil {
return nil, err
}
return data, nil
}
func (p *TestQrProcessor) WriteQR(path string, data []byte) error {
err := encoder.WriteFile(string(data), encoder.Medium, 512, path)
if err != nil {
return fmt.Errorf("failed to encode the data: %w", err)
}
p.qrs = append(p.qrs, path)
return nil
}
func genBytes(n int) []byte {
data := make([]byte, n)
if _, err := rand.Read(data); err != nil {
return nil
}
return data
}
func TestReadDataFromQRChunks(t *testing.T) {
N := 5000
data := genBytes(N)
chunks, err := DataToChunks(data)
if err != nil {
t.Fatalf(err.Error())
}
p := NewTestQRProcessor()
for idx, chunk := range chunks {
path := fmt.Sprintf("/tmp/%d.png", idx)
if err = p.WriteQR(path, chunk); err != nil {
t.Fatalf(err.Error())
}
}
recoveredDataFromQRChunks, err := ReadDataFromQRChunks(p)
if err != nil {
t.Fatalf(err.Error())
}
if !reflect.DeepEqual(data, recoveredDataFromQRChunks) {
t.Fatal("recovered data from chunks and initial data are not equal!")
}
}