7669c5b5ec
fixes #3444 fixes #3494 networkid override Added comments to explain why test against 0 appears twice * Command line overrides saved config, saved config overrides system default --- fixes #3476 bzzr get with path Finally a hopefully clean commit for this PR Added check for empty path to avoid SIGSEGV in path parser and resolver Added requested tests for empty path and non-existing manifest. However signature for StartHTTPServer had changed. Now it's hacked as so: StartHttpServer(api.API, &Server{Addr: "127.0.0.1:8504", CorsString: ""}) * Parse url before resolve when path and ENS is supplied, example * swarm/api/http proxy server test for retrieval of subpath through get * Removed nil entry assignment on subtrie leaf in recursive key retrieval * Cleaned up path-or-no-path condition in proxy server get handler * swarm: processed with gofmt refers to lash/go-ethereum@90daa7a * swarm: Added public access method Parse alias to parse * swarm: processed with gofmt References nolash/go-ethereum@2ec3fd7 * Rename parse to Parse, removed alias
345 lines
10 KiB
Go
345 lines
10 KiB
Go
// Copyright 2016 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"crypto/ecdsa"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/ethereum/go-ethereum/accounts"
|
|
"github.com/ethereum/go-ethereum/cmd/utils"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/console"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/ethclient"
|
|
"github.com/ethereum/go-ethereum/internal/debug"
|
|
"github.com/ethereum/go-ethereum/logger"
|
|
"github.com/ethereum/go-ethereum/logger/glog"
|
|
"github.com/ethereum/go-ethereum/node"
|
|
"github.com/ethereum/go-ethereum/p2p"
|
|
"github.com/ethereum/go-ethereum/p2p/discover"
|
|
"github.com/ethereum/go-ethereum/swarm"
|
|
bzzapi "github.com/ethereum/go-ethereum/swarm/api"
|
|
"gopkg.in/urfave/cli.v1"
|
|
)
|
|
|
|
const (
|
|
clientIdentifier = "swarm"
|
|
versionString = "0.2"
|
|
)
|
|
|
|
var (
|
|
gitCommit string // Git SHA1 commit hash of the release (set via linker flags)
|
|
app = utils.NewApp(gitCommit, "Ethereum Swarm")
|
|
testbetBootNodes = []string{
|
|
"enode://ec8ae764f7cb0417bdfb009b9d0f18ab3818a3a4e8e7c67dd5f18971a93510a2e6f43cd0b69a27e439a9629457ea804104f37c85e41eed057d3faabbf7744cdf@13.74.157.139:30429",
|
|
"enode://c2e1fceb3bf3be19dff71eec6cccf19f2dbf7567ee017d130240c670be8594bc9163353ca55dd8df7a4f161dd94b36d0615c17418b5a3cdcbb4e9d99dfa4de37@13.74.157.139:30430",
|
|
"enode://fe29b82319b734ce1ec68b84657d57145fee237387e63273989d354486731e59f78858e452ef800a020559da22dcca759536e6aa5517c53930d29ce0b1029286@13.74.157.139:30431",
|
|
"enode://1d7187e7bde45cf0bee489ce9852dd6d1a0d9aa67a33a6b8e6db8a4fbc6fcfa6f0f1a5419343671521b863b187d1c73bad3603bae66421d157ffef357669ddb8@13.74.157.139:30432",
|
|
"enode://0e4cba800f7b1ee73673afa6a4acead4018f0149d2e3216be3f133318fd165b324cd71b81fbe1e80deac8dbf56e57a49db7be67f8b9bc81bd2b7ee496434fb5d@13.74.157.139:30433",
|
|
}
|
|
)
|
|
|
|
var (
|
|
ChequebookAddrFlag = cli.StringFlag{
|
|
Name: "chequebook",
|
|
Usage: "chequebook contract address",
|
|
}
|
|
SwarmAccountFlag = cli.StringFlag{
|
|
Name: "bzzaccount",
|
|
Usage: "Swarm account key file",
|
|
}
|
|
SwarmPortFlag = cli.StringFlag{
|
|
Name: "bzzport",
|
|
Usage: "Swarm local http api port",
|
|
}
|
|
SwarmNetworkIdFlag = cli.IntFlag{
|
|
Name: "bzznetworkid",
|
|
Usage: "Network identifier (integer, default 3=swarm testnet)",
|
|
}
|
|
SwarmConfigPathFlag = cli.StringFlag{
|
|
Name: "bzzconfig",
|
|
Usage: "Swarm config file path (datadir/bzz)",
|
|
}
|
|
SwarmSwapEnabledFlag = cli.BoolFlag{
|
|
Name: "swap",
|
|
Usage: "Swarm SWAP enabled (default false)",
|
|
}
|
|
SwarmSyncEnabledFlag = cli.BoolTFlag{
|
|
Name: "sync",
|
|
Usage: "Swarm Syncing enabled (default true)",
|
|
}
|
|
EthAPIFlag = cli.StringFlag{
|
|
Name: "ethapi",
|
|
Usage: "URL of the Ethereum API provider",
|
|
Value: node.DefaultIPCEndpoint("geth"),
|
|
}
|
|
SwarmApiFlag = cli.StringFlag{
|
|
Name: "bzzapi",
|
|
Usage: "Swarm HTTP endpoint",
|
|
Value: "http://127.0.0.1:8500",
|
|
}
|
|
SwarmRecursiveUploadFlag = cli.BoolFlag{
|
|
Name: "recursive",
|
|
Usage: "Upload directories recursively",
|
|
}
|
|
SwarmWantManifestFlag = cli.BoolTFlag{
|
|
Name: "manifest",
|
|
Usage: "Automatic manifest upload",
|
|
}
|
|
SwarmUploadDefaultPath = cli.StringFlag{
|
|
Name: "defaultpath",
|
|
Usage: "path to file served for empty url path (none)",
|
|
}
|
|
CorsStringFlag = cli.StringFlag{
|
|
Name: "corsdomain",
|
|
Usage: "Domain on which to send Access-Control-Allow-Origin header (multiple domains can be supplied separated by a ',')",
|
|
}
|
|
)
|
|
|
|
func init() {
|
|
// Override flag defaults so bzzd can run alongside geth.
|
|
utils.ListenPortFlag.Value = 30399
|
|
utils.IPCPathFlag.Value = utils.DirectoryString{Value: "bzzd.ipc"}
|
|
utils.IPCApiFlag.Value = "admin, bzz, chequebook, debug, rpc, web3"
|
|
|
|
// Set up the cli app.
|
|
app.Action = bzzd
|
|
app.HideVersion = true // we have a command to print the version
|
|
app.Copyright = "Copyright 2013-2016 The go-ethereum Authors"
|
|
app.Commands = []cli.Command{
|
|
{
|
|
Action: version,
|
|
Name: "version",
|
|
Usage: "Print version numbers",
|
|
ArgsUsage: " ",
|
|
Description: `
|
|
The output of this command is supposed to be machine-readable.
|
|
`,
|
|
},
|
|
{
|
|
Action: upload,
|
|
Name: "up",
|
|
Usage: "upload a file or directory to swarm using the HTTP API",
|
|
ArgsUsage: " <file>",
|
|
Description: `
|
|
"upload a file or directory to swarm using the HTTP API and prints the root hash",
|
|
`,
|
|
},
|
|
{
|
|
Action: hash,
|
|
Name: "hash",
|
|
Usage: "print the swarm hash of a file or directory",
|
|
ArgsUsage: " <file>",
|
|
Description: `
|
|
Prints the swarm hash of file or directory.
|
|
`,
|
|
},
|
|
}
|
|
|
|
app.Flags = []cli.Flag{
|
|
utils.IdentityFlag,
|
|
utils.DataDirFlag,
|
|
utils.BootnodesFlag,
|
|
utils.KeyStoreDirFlag,
|
|
utils.ListenPortFlag,
|
|
utils.NoDiscoverFlag,
|
|
utils.DiscoveryV5Flag,
|
|
utils.NetrestrictFlag,
|
|
utils.NodeKeyFileFlag,
|
|
utils.NodeKeyHexFlag,
|
|
utils.MaxPeersFlag,
|
|
utils.NATFlag,
|
|
utils.IPCDisabledFlag,
|
|
utils.IPCApiFlag,
|
|
utils.IPCPathFlag,
|
|
// bzzd-specific flags
|
|
CorsStringFlag,
|
|
EthAPIFlag,
|
|
SwarmConfigPathFlag,
|
|
SwarmSwapEnabledFlag,
|
|
SwarmSyncEnabledFlag,
|
|
SwarmPortFlag,
|
|
SwarmAccountFlag,
|
|
SwarmNetworkIdFlag,
|
|
ChequebookAddrFlag,
|
|
// upload flags
|
|
SwarmApiFlag,
|
|
SwarmRecursiveUploadFlag,
|
|
SwarmWantManifestFlag,
|
|
SwarmUploadDefaultPath,
|
|
}
|
|
app.Flags = append(app.Flags, debug.Flags...)
|
|
app.Before = func(ctx *cli.Context) error {
|
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
|
return debug.Setup(ctx)
|
|
}
|
|
app.After = func(ctx *cli.Context) error {
|
|
debug.Exit()
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func main() {
|
|
if err := app.Run(os.Args); err != nil {
|
|
fmt.Fprintln(os.Stderr, err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
func version(ctx *cli.Context) error {
|
|
fmt.Println(strings.Title(clientIdentifier))
|
|
fmt.Println("Version:", versionString)
|
|
if gitCommit != "" {
|
|
fmt.Println("Git Commit:", gitCommit)
|
|
}
|
|
fmt.Println("Network Id:", ctx.GlobalInt(utils.NetworkIdFlag.Name))
|
|
fmt.Println("Go Version:", runtime.Version())
|
|
fmt.Println("OS:", runtime.GOOS)
|
|
fmt.Printf("GOPATH=%s\n", os.Getenv("GOPATH"))
|
|
fmt.Printf("GOROOT=%s\n", runtime.GOROOT())
|
|
return nil
|
|
}
|
|
|
|
func bzzd(ctx *cli.Context) error {
|
|
stack := utils.MakeNode(ctx, clientIdentifier, gitCommit)
|
|
registerBzzService(ctx, stack)
|
|
utils.StartNode(stack)
|
|
networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name)
|
|
// Add bootnodes as initial peers.
|
|
if ctx.GlobalIsSet(utils.BootnodesFlag.Name) {
|
|
bootnodes := strings.Split(ctx.GlobalString(utils.BootnodesFlag.Name), ",")
|
|
injectBootnodes(stack.Server(), bootnodes)
|
|
} else {
|
|
if networkId == 3 {
|
|
injectBootnodes(stack.Server(), testbetBootNodes)
|
|
}
|
|
}
|
|
|
|
stack.Wait()
|
|
return nil
|
|
}
|
|
|
|
func registerBzzService(ctx *cli.Context, stack *node.Node) {
|
|
|
|
prvkey := getAccount(ctx, stack)
|
|
|
|
chbookaddr := common.HexToAddress(ctx.GlobalString(ChequebookAddrFlag.Name))
|
|
bzzdir := ctx.GlobalString(SwarmConfigPathFlag.Name)
|
|
if bzzdir == "" {
|
|
bzzdir = stack.InstanceDir()
|
|
}
|
|
|
|
bzzconfig, err := bzzapi.NewConfig(bzzdir, chbookaddr, prvkey, ctx.GlobalUint64(SwarmNetworkIdFlag.Name))
|
|
if err != nil {
|
|
utils.Fatalf("unable to configure swarm: %v", err)
|
|
}
|
|
bzzport := ctx.GlobalString(SwarmPortFlag.Name)
|
|
if len(bzzport) > 0 {
|
|
bzzconfig.Port = bzzport
|
|
}
|
|
swapEnabled := ctx.GlobalBool(SwarmSwapEnabledFlag.Name)
|
|
syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabledFlag.Name)
|
|
|
|
ethapi := ctx.GlobalString(EthAPIFlag.Name)
|
|
cors := ctx.GlobalString(CorsStringFlag.Name)
|
|
|
|
boot := func(ctx *node.ServiceContext) (node.Service, error) {
|
|
var client *ethclient.Client
|
|
if len(ethapi) > 0 {
|
|
client, err = ethclient.Dial(ethapi)
|
|
if err != nil {
|
|
utils.Fatalf("Can't connect: %v", err)
|
|
}
|
|
}
|
|
return swarm.NewSwarm(ctx, client, bzzconfig, swapEnabled, syncEnabled, cors)
|
|
}
|
|
if err := stack.Register(boot); err != nil {
|
|
utils.Fatalf("Failed to register the Swarm service: %v", err)
|
|
}
|
|
}
|
|
|
|
func getAccount(ctx *cli.Context, stack *node.Node) *ecdsa.PrivateKey {
|
|
keyid := ctx.GlobalString(SwarmAccountFlag.Name)
|
|
|
|
if keyid == "" {
|
|
utils.Fatalf("Option %q is required", SwarmAccountFlag.Name)
|
|
}
|
|
// Try to load the arg as a hex key file.
|
|
if key, err := crypto.LoadECDSA(keyid); err == nil {
|
|
glog.V(logger.Info).Infof("swarm account key loaded: %#x", crypto.PubkeyToAddress(key.PublicKey))
|
|
return key
|
|
}
|
|
// Otherwise try getting it from the keystore.
|
|
return decryptStoreAccount(stack.AccountManager(), keyid)
|
|
}
|
|
|
|
func decryptStoreAccount(accman *accounts.Manager, account string) *ecdsa.PrivateKey {
|
|
var a accounts.Account
|
|
var err error
|
|
if common.IsHexAddress(account) {
|
|
a, err = accman.Find(accounts.Account{Address: common.HexToAddress(account)})
|
|
} else if ix, ixerr := strconv.Atoi(account); ixerr == nil {
|
|
a, err = accman.AccountByIndex(ix)
|
|
} else {
|
|
utils.Fatalf("Can't find swarm account key %s", account)
|
|
}
|
|
if err != nil {
|
|
utils.Fatalf("Can't find swarm account key: %v", err)
|
|
}
|
|
keyjson, err := ioutil.ReadFile(a.File)
|
|
if err != nil {
|
|
utils.Fatalf("Can't load swarm account key: %v", err)
|
|
}
|
|
for i := 1; i <= 3; i++ {
|
|
passphrase := promptPassphrase(fmt.Sprintf("Unlocking swarm account %s [%d/3]", a.Address.Hex(), i))
|
|
key, err := accounts.DecryptKey(keyjson, passphrase)
|
|
if err == nil {
|
|
return key.PrivateKey
|
|
}
|
|
}
|
|
utils.Fatalf("Can't decrypt swarm account key")
|
|
return nil
|
|
}
|
|
|
|
func promptPassphrase(prompt string) string {
|
|
if prompt != "" {
|
|
fmt.Println(prompt)
|
|
}
|
|
password, err := console.Stdin.PromptPassword("Passphrase: ")
|
|
if err != nil {
|
|
utils.Fatalf("Failed to read passphrase: %v", err)
|
|
}
|
|
return password
|
|
}
|
|
|
|
func injectBootnodes(srv *p2p.Server, nodes []string) {
|
|
for _, url := range nodes {
|
|
n, err := discover.ParseNode(url)
|
|
if err != nil {
|
|
glog.Errorf("invalid bootnode %q", err)
|
|
continue
|
|
}
|
|
srv.AddPeer(n)
|
|
}
|
|
}
|