opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-24 14:08:13 +08:00
Code Issues Projects Releases Wiki Activity

do init id offline, only dont parse keys

Browse Source 
(test was failing)
This commit is contained in:
Juan Batiz-Benet
2014-09-30 03:31:11 -07:00
parent 7492a708a3
commit c054619827
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/core.go
View File

@ -86,6 +86,11 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
peerstore := peer.NewPeerstore()
local, err := initIdentity(cfg, online)
if err != nil {
return nil, err
}
// FIXME(brian): This is a bit dangerous. If any of the vars declared in
// this block are assigned inside of the "if online" block using the ":="
// declaration syntax, the compiler permits re-declaration. This is rather
@ -95,17 +100,10 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
// TODO: refactor so we can use IpfsRouting interface instead of being DHT-specific
route *dht.IpfsDHT
exchangeSession exchange.Interface
local *peer.Peer
)
if online {
// when not online, don't need to parse private keys (yet)
local, err := initIdentity(cfg)
if err != nil {
return nil, err
}
dhtService := netservice.NewService(nil) // nil handler for now, need to patch it
exchangeService := netservice.NewService(nil) // nil handler for now, need to patch it
@ -159,7 +157,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
}, nil
}
func initIdentity(cfg *config.Config) (*peer.Peer, error) {
func initIdentity(cfg *config.Config, online bool) (*peer.Peer, error) {
if cfg.Identity.PeerID == "" {
return nil, errors.New("Identity was not set in config (was ipfs init run?)")
}
@ -179,21 +177,31 @@ func initIdentity(cfg *config.Config) (*peer.Peer, error) {
addresses = []*ma.Multiaddr{maddr}
}
skb, err := base64.StdEncoding.DecodeString(cfg.Identity.PrivKey)
if err != nil {
return nil, err
}
var (
sk ci.PrivKey
pk ci.PubKey
)
sk, err := ci.UnmarshalPrivateKey(skb)
if err != nil {
return nil, err
// when not online, don't need to parse private keys (yet)
if !online {
skb, err := base64.StdEncoding.DecodeString(cfg.Identity.PrivKey)
if err != nil {
return nil, err
}
sk, err = ci.UnmarshalPrivateKey(skb)
if err != nil {
return nil, err
}
pk = sk.GetPublic()
}
return &peer.Peer{
ID: peer.ID(b58.Decode(cfg.Identity.PeerID)),
Addresses: addresses,
PrivKey: sk,
PubKey: sk.GetPublic(),
PubKey: pk,
}, nil
}