10542e0573
Since we already have the specific username and password we want to strip from errors, use a specific search string rather than a generic regular expression. This is quite a bit more efficient than using regular expressions and also has the benefit of being more accurate. Also, rather than using the added overhead of fmt to convert the error to a string, just call Error() directly on it to get the string. Finally, instead of just stripping it, replace it with the literal string "<username>:<password>" to avoid any possible confusion in the error messages where it might otherwise appear the url was being constructed incorrectly. ok jcv@
60 lines
1.8 KiB
Go
60 lines
1.8 KiB
Go
// Copyright (c) 2013 Conformal Systems LLC.
|
|
// Use of this source code is governed by an ISC
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package btcjson
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
)
|
|
|
|
// MarshallAndSend takes the reply structure, marshalls it to json, and
|
|
// sends it back to the io.Writer (most likely an http.ResponseWriter).
|
|
// returning a log message and an error if there is one.
|
|
func MarshallAndSend(rawReply Reply, w io.Writer) (string, error) {
|
|
finalReply, err := json.Marshal(rawReply)
|
|
if err != nil {
|
|
msg := fmt.Sprintf("[RPCS] Error Marshalling reply: %v", err)
|
|
return msg, err
|
|
}
|
|
fmt.Fprintf(w, "%s\n", finalReply)
|
|
msg := fmt.Sprintf("[RPCS] reply: %v", rawReply)
|
|
return msg, nil
|
|
}
|
|
|
|
// jsonRpcSend connects to the daemon with the specified username, password,
|
|
// and ip/port and then send the supplied message. This uses net/http rather
|
|
// than net/rpc/jsonrpc since that one doesn't support http connections and is
|
|
// therefore useless.
|
|
func jsonRpcSend(user string, password string, server string, message []byte) (*http.Response, error) {
|
|
credentials := user + ":" + password
|
|
resp, err := http.Post("http://"+credentials+"@"+server,
|
|
"application/json", bytes.NewBuffer(message))
|
|
if err != nil {
|
|
// We do not want to log the username/password in the errors.
|
|
replaceStr := "<username>:<password>"
|
|
str := strings.Replace(err.Error(), credentials, replaceStr, -1)
|
|
err = fmt.Errorf("%v", str)
|
|
}
|
|
return resp, err
|
|
}
|
|
|
|
// GetRaw should be called after JsonRpcSend. It reads and returns
|
|
// the reply (which you can then call readResult() on) and closes the
|
|
// connection.
|
|
func GetRaw(resp io.ReadCloser) ([]byte, error) {
|
|
body, err := ioutil.ReadAll(resp)
|
|
resp.Close()
|
|
if err != nil {
|
|
err = fmt.Errorf("Error reading json reply: %v", err)
|
|
return body, err
|
|
}
|
|
return body, nil
|
|
}
|