opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 12:20:03 +08:00
Code Issues Projects Releases Wiki Activity

no longer worry about moving key out of config file

Browse Source
This commit is contained in:
Jeromy
2015-04-08 23:16:40 -07:00
committed by Juan Batiz-Benet
parent 2c79e5ddb5
commit f3fbedf312
3 changed files with 54 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ipfs/daemon.go
View File

@ -119,7 +119,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
// sure we are permitted to access the resources (datastore, etc.)
repo, err := fsrepo.Open(req.Context().ConfigRoot)
if err != nil {
res.SetError(fmt.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
res.SetError(err, cmds.ErrNormal)
return
}

26
repo/fsrepo/fsrepo.go
View File

@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"path"
"strconv"
@ -18,6 +19,7 @@ import (
"github.com/ipfs/go-ipfs/repo/common"
config "github.com/ipfs/go-ipfs/repo/config"
lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
mfsr "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
dir "github.com/ipfs/go-ipfs/thirdparty/dir"
"github.com/ipfs/go-ipfs/thirdparty/eventlog"
@ -26,6 +28,8 @@ import (
ds2 "github.com/ipfs/go-ipfs/util/datastore2"
)
var RepoVersion = "2"
const (
leveldbDirectory = "datastore"
flatfsDirectory = "blocks"
@ -107,6 +111,24 @@ func open(repoPath string) (repo.Repo, error) {
if !isInitializedUnsynced(r.path) {
return nil, errors.New("ipfs not initialized, please run 'ipfs init'")
}
// Check version, and error out if not matching
ver, err := ioutil.ReadFile(path.Join(expPath, "version"))
if err != nil {
if os.IsNotExist(err) {
return nil, errors.New("version check failed, no version file found, please run 0-to-1 migration tool.")
}
return nil, err
}
vers := string(ver)[:1]
if vers != RepoVersion {
return nil, fmt.Errorf("Repo has incorrect version: '%s'\nProgram version is: '%s'\nPlease run the appropriate migration tool before continuing",
vers, RepoVersion)
}
// check repo path, then check all constituent parts.
// TODO acquire repo lock
// TODO if err := initCheckDir(logpath); err != nil { // }
@ -208,6 +230,10 @@ func Init(repoPath string, conf *config.Config) error {
return err
}
if err := mfsr.RepoPath(repoPath).WriteVersion(RepoVersion); err != nil {
return err
}
return nil
}

172
repo/fsrepo/migrations/1-to-2/main.go
View File

@ -2,9 +2,7 @@ package main
import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"os"
"path"
"strings"
@ -14,7 +12,6 @@ import (
leveldb "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/leveldb"
dsq "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
migrate "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-migrate"
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
mfsr "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
@ -41,8 +38,8 @@ func (m migration) Apply(opts migrate.Options) error {
return err
}
// 1) move key out of config, into its own path
err := moveKeyOutOfConfig(opts.Path)
// 1) run some sanity checks to make sure we should even bother
err := sanityChecks(opts)
if err != nil {
return err
}
@ -87,13 +84,7 @@ func (m migration) Revert(opts migrate.Options) error {
return err
}
// 3) move key back into config
err = moveKeyIntoConfig(npath)
if err != nil {
return err
}
// 4) change version number back down
// 3) change version number back down
repo = mfsr.RepoPath(npath)
err = repo.WriteVersion("1")
if err != nil {
@ -103,8 +94,30 @@ func (m migration) Revert(opts migrate.Options) error {
return nil
}
// sanityChecks performs a set of tests to make sure the migration will go
// smoothly
func sanityChecks(opts migrate.Options) error {
npath := strings.Replace(opts.Path, ".go-ipfs", ".ipfs", 1)
// make sure we can move the repo from .go-ipfs to .ipfs
err := os.Mkdir(npath, 0777)
if err != nil {
return err
}
// we can? good, remove it now
err = os.Remove(npath)
if err != nil {
// this is weird... not worth continuing
return err
}
return nil
}
func transferBlocksToFlatDB(repopath string) error {
r, err := fsrepo.Open(repopath)
ldbpath := path.Join(repopath, "datastore")
ldb, err := leveldb.NewDatastore(ldbpath, nil)
if err != nil {
return err
}
@ -120,7 +133,7 @@ func transferBlocksToFlatDB(repopath string) error {
return err
}
return transferBlocks(r.Datastore(), fds, "/b/", "")
return transferBlocks(ldb, fds, "/b/", "")
}
func transferBlocksFromFlatDB(repopath string) error {
@ -183,98 +196,6 @@ func transferBlocks(from, to dstore.Datastore, fpref, tpref string) error {
return nil
}
func moveKeyOutOfConfig(repopath string) error {
// Make keys directory
keypath := path.Join(repopath, "keys")
err := os.Mkdir(keypath, 0777)
if err != nil {
return err
}
// Grab the config
cfg, err := loadConfigJSON(repopath)
if err != nil {
return err
}
// get the private key from it
privKey, err := getPrivateKeyFromConfig(cfg)
if err != nil {
return err
}
keyfilepath := path.Join(keypath, peerKeyName)
fi, err := os.OpenFile(keyfilepath, os.O_CREATE|os.O_WRONLY, 0600)
if err != nil {
return err
}
// Write our b64-protobuf encoded key
_, err = fi.WriteString(privKey)
if err != nil {
return err
}
err = fi.Close()
if err != nil {
return err
}
// Now that the key is safely in its own file, remove it from the config
err = clearPrivateKeyFromConfig(cfg)
if err != nil {
return err
}
err = saveConfigJSON(repopath, cfg)
if err != nil {
return err
}
return nil
}
// Part of the 2-to-1 revert process
func moveKeyIntoConfig(repopath string) error {
// Make keys directory
keypath := path.Join(repopath, "keys")
// Grab the config
cfg, err := loadConfigJSON(repopath)
if err != nil {
return err
}
keyfilepath := path.Join(keypath, peerKeyName)
pkey, err := ioutil.ReadFile(keyfilepath)
if err != nil {
return err
}
id, ok := cfg["Identity"]
if !ok {
return errors.New("expected to find an identity object in config")
}
identity, ok := id.(map[string]interface{})
if !ok {
return errors.New("expected Identity in config to be an object")
}
identity["PrivKey"] = string(pkey)
err = saveConfigJSON(repopath, cfg)
if err != nil {
return err
}
// Now that the key is safely in the config, delete the file
err = os.RemoveAll(keypath)
if err != nil {
return err
}
return nil
}
func moveIpfsDir(curpath string) (string, error) {
newpath := strings.Replace(curpath, ".go-ipfs", ".ipfs", 1)
return newpath, os.Rename(curpath, newpath)
@ -321,45 +242,6 @@ func saveConfigJSON(repoPath string, cfg map[string]interface{}) error {
return nil
}
func getPrivateKeyFromConfig(cfg map[string]interface{}) (string, error) {
ident, ok := cfg["Identity"]
if !ok {
return "", errors.New("no identity found in config")
}
identMap, ok := ident.(map[string]interface{})
if !ok {
return "", errors.New("expected Identity to be object (map)")
}
privkey, ok := identMap["PrivKey"]
if !ok {
return "", errors.New("no PrivKey field found in Identity")
}
privkeyStr, ok := privkey.(string)
if !ok {
return "", errors.New("expected PrivKey to be a string")
}
return privkeyStr, nil
}
func clearPrivateKeyFromConfig(cfg map[string]interface{}) error {
ident, ok := cfg["Identity"]
if !ok {
return errors.New("no identity found in config")
}
identMap, ok := ident.(map[string]interface{})
if !ok {
return errors.New("expected Identity to be object (map)")
}
delete(identMap, "PrivKey")
return nil
}
func main() {
m := migration{}
migrate.Main(&m)