Identity management

Signed-off-by: Gustavo Sampaio <[email protected]>

Author: GustavoKatel

crabfs.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	crabfsCrypto "github.com/runletapp/crabfs/crypto"
+	"github.com/runletapp/crabfs/identity"
 	"github.com/runletapp/crabfs/interfaces"
 	"github.com/runletapp/crabfs/options"
 
@@ -50,20 +51,13 @@ func New(opts ...options.Option) (interfaces.Core, error) {
 		return nil, ErrInvalidBlockSize
 	}
 
-	// var privateKey *libp2pCrypto.RsaPrivateKey
-	// var err error
-	// if settings.PrivateKey == nil {
-	// 	privKey, _, err := libp2pCrypto.GenerateRSAKeyPair(2048, rand.Reader)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	privateKey = privKey.(*libp2pCrypto.RsaPrivateKey)
-	// } else {
-	// 	privateKey, err = ReadPrivateKey(settings.PrivateKey)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// }
+	if settings.Identity == nil {
+		var err error
+		settings.Identity, err = identity.CreateIdentity()
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	var rawDatastore ipfsDatastore.Datastore
 	if settings.Root == "" {
@@ -273,3 +267,7 @@ func (fs *crabFS) PublishPublicKey(publicKey crabfsCrypto.PubKey) error {
 
 	return fs.host.PutPublicKey(publicKey)
 }
+
+func (fs *crabFS) GetIdentity() identity.Identity {
+	return fs.settings.Identity
+}

examples/relay/relay.go

@@ -3,13 +3,18 @@ package main
 import (
 	"context"
 	"flag"
+	"io/ioutil"
 	"log"
+	"os"
+	"strings"
+
+	"github.com/runletapp/crabfs/identity"
 
 	"github.com/runletapp/crabfs"
 )
 
-func relayStart(ctx context.Context, bootstrapPeers []string) {
-	relay, err := crabfs.RelayNew(ctx, 1717, bootstrapPeers)
+func relayStart(ctx context.Context, bootstrapPeers []string, id identity.Identity) {
+	relay, err := crabfs.RelayNew(ctx, 1717, bootstrapPeers, id)
 	if err != nil {
 		panic(err)
 	}
@@ -22,11 +27,42 @@ func relayStart(ctx context.Context, bootstrapPeers []string) {
 
 func main() {
 	bootstrapPeer := flag.String("d", "", "bootstrap peer to dial")
+	idFile := flag.String("i", "", "identity file")
 	flag.Parse()
 
 	ctx := context.Background()
 
+	bootstrapPeers := []string{}
+	if strings.TrimSpace(*bootstrapPeer) != "" {
+		bootstrapPeers = append(bootstrapPeers, *bootstrapPeer)
+	}
+
+	var id identity.Identity
+	if strings.TrimSpace(*idFile) != "" {
+		file, err := os.Open(*idFile)
+		if err != nil {
+			id, err = identity.CreateIdentity()
+			if err != nil {
+				panic(err)
+			}
+			data, err := id.Marshal()
+			if err != nil {
+				panic(err)
+			}
+			if err := ioutil.WriteFile(*idFile, data, 0644); err != nil {
+				panic(err)
+			}
+		} else {
+			defer file.Close()
+
+			id, err = identity.UnmarshalIdentity(file)
+			if err != nil {
+				panic(err)
+			}
+		}
+	}
+
 	log.Printf("Starting relay...")
-	relayStart(ctx, []string{*bootstrapPeer})
+	relayStart(ctx, bootstrapPeers, id)
 	<-ctx.Done()
 }

go.mod

@@ -4,29 +4,26 @@ go 1.12
 
 require (
 	github.com/GustavoKatel/SyncEvent v0.0.1
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.0
+	github.com/golang/protobuf v1.3.1
 	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-cid v0.0.1
-	github.com/ipfs/go-datastore v0.0.3
-	github.com/ipfs/go-ds-leveldb v0.0.1
+	github.com/ipfs/go-cid v0.0.2
+	github.com/ipfs/go-datastore v0.0.5
+	github.com/ipfs/go-ds-leveldb v0.0.2
 	github.com/ipfs/go-ipfs-blockstore v0.0.1
-	github.com/libp2p/go-libp2p v0.0.12
-	github.com/libp2p/go-libp2p-circuit v0.0.4
-	github.com/libp2p/go-libp2p-discovery v0.0.1
-	github.com/libp2p/go-libp2p-host v0.0.1
-	github.com/libp2p/go-libp2p-kad-dht v0.0.7
-	github.com/libp2p/go-libp2p-kbucket v0.1.1 // indirect
-	github.com/libp2p/go-libp2p-net v0.0.2
-	github.com/libp2p/go-libp2p-peerstore v0.0.2
-	github.com/libp2p/go-libp2p-record v0.0.1
-	github.com/libp2p/go-libp2p-routing v0.0.1
-	github.com/mr-tron/base58 v1.1.1 // indirect
-	github.com/multiformats/go-multiaddr v0.0.2
-	github.com/multiformats/go-multihash v0.0.1
+	github.com/libp2p/go-libp2p v0.1.0
+	github.com/libp2p/go-libp2p-circuit v0.1.0
+	github.com/libp2p/go-libp2p-core v0.0.2
+	github.com/libp2p/go-libp2p-discovery v0.1.0
+	github.com/libp2p/go-libp2p-host v0.1.0
+	github.com/libp2p/go-libp2p-kad-dht v0.1.0
+	github.com/libp2p/go-libp2p-net v0.1.0
+	github.com/libp2p/go-libp2p-peerstore v0.1.0
+	github.com/libp2p/go-libp2p-record v0.1.0
+	github.com/libp2p/go-libp2p-routing v0.1.0
+	github.com/multiformats/go-multiaddr v0.0.4
+	github.com/multiformats/go-multihash v0.0.5
 	github.com/stretchr/testify v1.3.0
-	golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 // indirect
+	google.golang.org/appengine v1.4.0 // indirect
 )