aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/api
diff options
context:
space:
mode:
Diffstat (limited to 'rpc/api')
-rw-r--r--rpc/api/admin.go8
-rw-r--r--rpc/api/api_test.go8
-rw-r--r--rpc/api/personal.go17
-rw-r--r--rpc/api/personal_args.go17
-rw-r--r--rpc/api/utils.go11
5 files changed, 41 insertions, 20 deletions
diff --git a/rpc/api/admin.go b/rpc/api/admin.go
index 6aa04e667..eed8d8366 100644
--- a/rpc/api/admin.go
+++ b/rpc/api/admin.go
@@ -84,17 +84,19 @@ type adminApi struct {
ethereum *eth.Ethereum
codec codec.Codec
coder codec.ApiCoder
+ docRoot string
ds *docserver.DocServer
}
// create a new admin api instance
-func NewAdminApi(xeth *xeth.XEth, ethereum *eth.Ethereum, codec codec.Codec) *adminApi {
+func NewAdminApi(xeth *xeth.XEth, ethereum *eth.Ethereum, codec codec.Codec, docRoot string) *adminApi {
return &adminApi{
xeth: xeth,
ethereum: ethereum,
codec: codec,
coder: codec.New(nil),
- ds: docserver.New("/"),
+ docRoot: docRoot,
+ ds: docserver.New(docRoot),
}
}
@@ -256,7 +258,7 @@ func (self *adminApi) StartRPC(req *shared.Request) (interface{}, error) {
CorsDomain: args.CorsDomain,
}
- apis, err := ParseApiString(args.Apis, self.codec, self.xeth, self.ethereum)
+ apis, err := ParseApiString(args.Apis, self.codec, self.xeth, self.ethereum, self.docRoot)
if err != nil {
return false, err
}
diff --git a/rpc/api/api_test.go b/rpc/api/api_test.go
index 131ef68f8..a4efb09c1 100644
--- a/rpc/api/api_test.go
+++ b/rpc/api/api_test.go
@@ -30,7 +30,7 @@ import (
)
func TestParseApiString(t *testing.T) {
- apis, err := ParseApiString("", codec.JSON, nil, nil)
+ apis, err := ParseApiString("", codec.JSON, nil, nil, "")
if err == nil {
t.Errorf("Expected an err from parsing empty API string but got nil")
}
@@ -39,7 +39,7 @@ func TestParseApiString(t *testing.T) {
t.Errorf("Expected 0 apis from empty API string")
}
- apis, err = ParseApiString("eth", codec.JSON, nil, nil)
+ apis, err = ParseApiString("eth", codec.JSON, nil, nil, "")
if err != nil {
t.Errorf("Expected nil err from parsing empty API string but got %v", err)
}
@@ -48,7 +48,7 @@ func TestParseApiString(t *testing.T) {
t.Errorf("Expected 1 apis but got %d - %v", apis, apis)
}
- apis, err = ParseApiString("eth,eth", codec.JSON, nil, nil)
+ apis, err = ParseApiString("eth,eth", codec.JSON, nil, nil, "")
if err != nil {
t.Errorf("Expected nil err from parsing empty API string but got \"%v\"", err)
}
@@ -57,7 +57,7 @@ func TestParseApiString(t *testing.T) {
t.Errorf("Expected 2 apis but got %d - %v", apis, apis)
}
- apis, err = ParseApiString("eth,invalid", codec.JSON, nil, nil)
+ apis, err = ParseApiString("eth,invalid", codec.JSON, nil, nil, "")
if err == nil {
t.Errorf("Expected an err but got no err")
}
diff --git a/rpc/api/personal.go b/rpc/api/personal.go
index 1fb412612..4f347c610 100644
--- a/rpc/api/personal.go
+++ b/rpc/api/personal.go
@@ -98,9 +98,22 @@ func (self *personalApi) NewAccount(req *shared.Request) (interface{}, error) {
if err := self.codec.Decode(req.Params, &args); err != nil {
return nil, shared.NewDecodeParamError(err.Error())
}
-
+ var passwd string
+ if args.Passphrase == nil {
+ fe := self.xeth.Frontend()
+ if fe == nil {
+ return false, fmt.Errorf("unable to create account: unable to interact with user")
+ }
+ var ok bool
+ passwd, ok = fe.AskPassword()
+ if !ok {
+ return false, fmt.Errorf("unable to create account: no password given")
+ }
+ } else {
+ passwd = *args.Passphrase
+ }
am := self.ethereum.AccountManager()
- acc, err := am.NewAccount(args.Passphrase)
+ acc, err := am.NewAccount(passwd)
return acc.Address.Hex(), err
}
diff --git a/rpc/api/personal_args.go b/rpc/api/personal_args.go
index 73dc6285e..5d215c71d 100644
--- a/rpc/api/personal_args.go
+++ b/rpc/api/personal_args.go
@@ -23,7 +23,7 @@ import (
)
type NewAccountArgs struct {
- Passphrase string
+ Passphrase *string
}
func (args *NewAccountArgs) UnmarshalJSON(b []byte) (err error) {
@@ -32,16 +32,15 @@ func (args *NewAccountArgs) UnmarshalJSON(b []byte) (err error) {
return shared.NewDecodeParamError(err.Error())
}
- if len(obj) < 1 {
- return shared.NewInsufficientParamsError(len(obj), 1)
- }
-
- if passhrase, ok := obj[0].(string); ok {
- args.Passphrase = passhrase
- return nil
+ if len(obj) >= 1 && obj[0] != nil {
+ if passphrasestr, ok := obj[0].(string); ok {
+ args.Passphrase = &passphrasestr
+ } else {
+ return shared.NewInvalidTypeError("passphrase", "not a string")
+ }
}
- return shared.NewInvalidTypeError("passhrase", "not a string")
+ return nil
}
type UnlockAccountArgs struct {
diff --git a/rpc/api/utils.go b/rpc/api/utils.go
index 76b2c531d..719cb8074 100644
--- a/rpc/api/utils.go
+++ b/rpc/api/utils.go
@@ -33,14 +33,21 @@ var (
"admin": []string{
"addPeer",
"datadir",
+ "enableUserAgent",
"exportChain",
"getContractInfo",
+ "httpGet",
"importChain",
"nodeInfo",
"peers",
"register",
"registerUrl",
+ "saveInfo",
+ "setGlobalRegistrar",
+ "setHashReg",
+ "setUrlHint",
"setSolc",
+ "sleep",
"sleepBlocks",
"startNatSpec",
"startRPC",
@@ -146,7 +153,7 @@ var (
)
// Parse a comma separated API string to individual api's
-func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.Ethereum) ([]shared.EthereumApi, error) {
+func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.Ethereum, docRoot string) ([]shared.EthereumApi, error) {
if len(strings.TrimSpace(apistr)) == 0 {
return nil, fmt.Errorf("Empty apistr provided")
}
@@ -157,7 +164,7 @@ func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.
for i, name := range names {
switch strings.ToLower(strings.TrimSpace(name)) {
case shared.AdminApiName:
- apis[i] = NewAdminApi(xeth, eth, codec)
+ apis[i] = NewAdminApi(xeth, eth, codec, docRoot)
case shared.DebugApiName:
apis[i] = NewDebugApi(xeth, eth, codec)
case shared.DbApiName:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:57:24 +0800