Merge pull request #28 from libp2p/fix/handle-keygen-errors

don't swallow errors from rand.Read
libp2p · Dec 12, 2019 · 8feb08c · 8feb08c
2 parents fc5d113 + 8a5063a
commit 8feb08c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/p2p/security/noise/integration_test.go b/p2p/security/noise/integration_test.go
@@ -147,7 +147,10 @@ func TestLibp2pIntegration_NoPipes(t *testing.T) {
 func TestLibp2pIntegration_WithPipes(t *testing.T) {
 	ctx := context.Background()
 
-	kpa := GenerateKeypair()
+	kpa, err := GenerateKeypair()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ha, err := makeNodePipes(t, 1, 33333, "", [32]byte{}, kpa)
 	if err != nil {
@@ -201,7 +204,10 @@ func TestLibp2pIntegration_WithPipes(t *testing.T) {
 func TestLibp2pIntegration_XXFallback(t *testing.T) {
 	ctx := context.Background()
 
-	kpa := GenerateKeypair()
+	kpa, err := GenerateKeypair()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ha, err := makeNode(t, 1, 33333, kpa)
 	if err != nil {
@@ -253,7 +259,10 @@ func TestLibp2pIntegration_XXFallback(t *testing.T) {
 }
 
 func TestConstrucingWithMaker(t *testing.T) {
-	kp := GenerateKeypair()
+	kp, err := GenerateKeypair()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	ctx := context.Background()
 	h, err := libp2p.New(ctx,

diff --git a/p2p/security/noise/protocol.go b/p2p/security/noise/protocol.go
@@ -75,7 +75,11 @@ func newSecureSession(ctx context.Context, local peer.ID, privKey crypto.PrivKey
 	}
 
 	if kp == nil {
-		kp = GenerateKeypair()
+		var err error
+		kp, err = GenerateKeypair()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	localPeerInfo := peerInfo{

diff --git a/p2p/security/noise/transport.go b/p2p/security/noise/transport.go
@@ -24,12 +24,15 @@ type Keypair struct {
 }
 
 // GenerateKeypair creates a new ed25519 keypair
-func GenerateKeypair() *Keypair {
+func GenerateKeypair() (*Keypair, error) {
 	var public_key [32]byte
 	var private_key [32]byte
-	_, _ = rand.Read(private_key[:])
+	_, err := rand.Read(private_key[:])
+	if err != nil {
+		return nil, err
+	}
 	curve25519.ScalarBaseMult(&public_key, &private_key)
-	return &Keypair{public_key, private_key}
+	return &Keypair{public_key, private_key}, nil
 }
 
 // Transport implements the interface sec.SecureTransport
@@ -102,7 +105,10 @@ func New(privkey crypto.PrivKey, options ...Option) (*Transport, error) {
 
 	kp := cfg.NoiseKeypair
 	if kp == nil {
-		kp = GenerateKeypair()
+		kp, err = GenerateKeypair()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	// the static key cache is only useful if Noise Pipes is enabled

diff --git a/p2p/security/noise/transport_test.go b/p2p/security/noise/transport_test.go
@@ -219,7 +219,11 @@ func TestHandshakeIK(t *testing.T) {
 	respTransport := newTestTransportPipes(t, crypto.Ed25519, 2048)
 
 	// add responder's static key to initiator's key cache
-	respTransport.NoiseKeypair = GenerateKeypair()
+	kp, err := GenerateKeypair()
+	if err != nil {
+		t.Fatal(err)
+	}
+	respTransport.NoiseKeypair = kp
 	keycache := NewKeyCache()
 	keycache.Store(respTransport.LocalID, respTransport.NoiseKeypair.public_key)
 	initTransport.NoiseStaticKeyCache = keycache
@@ -230,7 +234,7 @@ func TestHandshakeIK(t *testing.T) {
 	defer respConn.Close()
 
 	before := []byte("hello world")
-	_, err := initConn.Write(before)
+	_, err = initConn.Write(before)
 	if err != nil {
 		t.Fatal(err)
 	}