8b81ad1fc4
* lines with leading space are ommitted from history * exit processed even with whitespace around * all whitespace lines (not only empty ones) are ignored add 7 missing commands to admin api autocomplete registrar: methods now return proper error if reg addresses are not set. fixes #1457 rpc/console: fix personal.newAccount() regression. Now all comms accept interactive password registrar: add registrar tests for errors crypto: catch AES decryption error on presale wallet import + fix error msg format. fixes #1580 CLI: improve error message when starting a second instance of geth. fixes #1564 cli/accounts: unlock multiple accounts. fixes #1785 * make unlocking multiple accounts work with inline <() fd * passwdfile now correctly read only once * improve logs * fix CLI help text for unlocking fix regression with docRoot / admin API * docRoot/jspath passed to rpc/api ParseApis, which passes onto adminApi * docRoot field for JS console in order to pass when RPC is (re)started * improve flag desc for jspath common/docserver: catch http errors from response fix rpc/api tests common/natspec: fix end to end test (skipped because takes 8s) registrar: fix major regression: * deploy registrars on frontier * register HashsReg and UrlHint in GlobalRegistrar. * set all 3 contract addresses in code * zero out addresses first in tests
121 lines
2.9 KiB
Go
121 lines
2.9 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library 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 Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package docserver
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"path/filepath"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
)
|
|
|
|
type DocServer struct {
|
|
*http.Transport
|
|
DocRoot string
|
|
schemes []string
|
|
}
|
|
|
|
func New(docRoot string) (self *DocServer) {
|
|
self = &DocServer{
|
|
Transport: &http.Transport{},
|
|
DocRoot: docRoot,
|
|
schemes: []string{"file"},
|
|
}
|
|
self.RegisterProtocol("file", http.NewFileTransport(http.Dir(self.DocRoot)))
|
|
return
|
|
}
|
|
|
|
// Clients should be reused instead of created as needed. Clients are safe for concurrent use by multiple goroutines.
|
|
|
|
// A Client is higher-level than a RoundTripper (such as Transport) and additionally handles HTTP details such as cookies and redirects.
|
|
|
|
func (self *DocServer) Client() *http.Client {
|
|
return &http.Client{
|
|
Transport: self,
|
|
}
|
|
}
|
|
|
|
func (self *DocServer) RegisterScheme(scheme string, rt http.RoundTripper) {
|
|
self.schemes = append(self.schemes, scheme)
|
|
self.RegisterProtocol(scheme, rt)
|
|
}
|
|
|
|
func (self *DocServer) HasScheme(scheme string) bool {
|
|
for _, s := range self.schemes {
|
|
if s == scheme {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (self *DocServer) GetAuthContent(uri string, hash common.Hash) (content []byte, err error) {
|
|
// retrieve content
|
|
content, err = self.Get(uri, "")
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
// check hash to authenticate content
|
|
chash := crypto.Sha3Hash(content)
|
|
if chash != hash {
|
|
content = nil
|
|
err = fmt.Errorf("content hash mismatch %x != %x (exp)", hash[:], chash[:])
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
// Get(uri, path) downloads the document at uri, if path is non-empty it
|
|
// is interpreted as a filepath to which the contents are saved
|
|
func (self *DocServer) Get(uri, path string) (content []byte, err error) {
|
|
// retrieve content
|
|
resp, err := self.Client().Get(uri)
|
|
|
|
defer func() {
|
|
if resp != nil {
|
|
resp.Body.Close()
|
|
}
|
|
}()
|
|
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
content, err = ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
if resp.StatusCode/100 != 2 {
|
|
return content, fmt.Errorf("HTTP error: %s", resp.Status)
|
|
}
|
|
|
|
if path != "" {
|
|
var abspath string
|
|
abspath, err = filepath.Abs(path)
|
|
ioutil.WriteFile(abspath, content, 0700)
|
|
}
|
|
|
|
return
|
|
|
|
}
|