mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-01 17:34:50 +08:00
adjusted to byte buffer
This commit is contained in:
parent
b8a1522845
commit
7be2b0e09d
4 changed files with 23 additions and 14 deletions
|
@ -87,7 +87,7 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object)
|
|||
|
||||
node.TrafficKeys = models.TrafficKeys{
|
||||
Mine: node.TrafficKeys.Mine,
|
||||
Server: key.PublicKey,
|
||||
Server: key,
|
||||
}
|
||||
|
||||
fmt.Printf("finished created node: %v \n", node)
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
package database
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"crypto/rsa"
|
||||
"encoding/gob"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
|
@ -216,11 +217,12 @@ func initializeUUID() error {
|
|||
if keyErr != nil {
|
||||
return keyErr
|
||||
}
|
||||
var rsaKey bytes.Buffer
|
||||
if err = gob.NewEncoder(&rsaKey).Encode(rsaPrivKey); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("key generated: %v \n", rsaPrivKey)
|
||||
fmt.Printf("pub key generate: %v \n", rsaPrivKey.PublicKey)
|
||||
|
||||
telemetry := models.Telemetry{UUID: uuid.NewString(), TrafficKey: *rsaPrivKey}
|
||||
telemetry := models.Telemetry{UUID: uuid.NewString(), TrafficKey: rsaKey}
|
||||
telJSON, err := json.Marshal(&telemetry)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
@ -2,15 +2,21 @@ package logic
|
|||
|
||||
import (
|
||||
"crypto/rsa"
|
||||
"encoding/gob"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
// RetrieveTrafficKey - retrieves key based on node
|
||||
func RetrieveTrafficKey() (rsa.PrivateKey, error) {
|
||||
// RetrieveTrafficKey - retrieves public key based on node
|
||||
func RetrieveTrafficKey() (rsa.PublicKey, error) {
|
||||
var telRecord, err = fetchTelemetryRecord()
|
||||
if err != nil {
|
||||
return rsa.PrivateKey{}, err
|
||||
return rsa.PublicKey{}, err
|
||||
}
|
||||
fmt.Printf("retrieved key: %v \n", telRecord.TrafficKey)
|
||||
return telRecord.TrafficKey, nil
|
||||
var key = rsa.PrivateKey{}
|
||||
if err = gob.NewDecoder(&telRecord.TrafficKey).Decode(&key); err != nil {
|
||||
return rsa.PublicKey{}, err
|
||||
}
|
||||
fmt.Printf("retrieved key: %v \n", key.PublicKey)
|
||||
|
||||
return key.PublicKey, nil
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package models
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/rsa"
|
||||
|
||||
jwt "github.com/golang-jwt/jwt/v4"
|
||||
|
@ -170,9 +171,9 @@ type ServerUpdateData struct {
|
|||
|
||||
// Telemetry - contains UUID of the server and timestamp of last send to posthog
|
||||
type Telemetry struct {
|
||||
UUID string `json:"uuid" bson:"uuid"`
|
||||
LastSend int64 `json:"lastsend" bson:"lastsend"`
|
||||
TrafficKey rsa.PrivateKey `json:"traffickey" bson:"traffickey"`
|
||||
UUID string `json:"uuid" bson:"uuid"`
|
||||
LastSend int64 `json:"lastsend" bson:"lastsend"`
|
||||
TrafficKey bytes.Buffer `json:"traffickey" bson:"traffickey"`
|
||||
}
|
||||
|
||||
// ServerAddr - to pass to clients to tell server addresses and if it's the leader or not
|
||||
|
|
Loading…
Add table
Reference in a new issue