bool CMyApp::Initialize(int& argc, wxChar** argv)
{
- if (argc > 1 && argv[1][0] != '-' && (!fWindows || argv[1][0] != '/') &&
- wxString(argv[1]) != "start")
- {
- fCommandLine = true;
- }
- else if (!fGUI)
- {
- fDaemon = true;
- }
- else
+ for (int i = 1; i < argc; i++)
+ if (!IsSwitchChar(argv[i][0]))
+ fCommandLine = true;
+
+ if (!fCommandLine)
{
- // wxApp::Initialize will remove environment-specific parameters,
- // so it's too early to call ParseParameters yet
- for (int i = 1; i < argc; i++)
+ if (!fGUI)
+ {
+ fDaemon = true;
+ }
+ else
{
- wxString str = argv[i];
- #ifdef __WXMSW__
- if (str.size() >= 1 && str[0] == '/')
- str[0] = '-';
- char pszLower[MAX_PATH];
- strlcpy(pszLower, str.c_str(), sizeof(pszLower));
- strlwr(pszLower);
- str = pszLower;
- #endif
- // haven't decided which argument to use for this yet
- if (str == "-daemon" || str == "-d" || str == "start")
- fDaemon = true;
+ // wxApp::Initialize will remove environment-specific parameters,
+ // so it's too early to call ParseParameters yet
+ for (int i = 1; i < argc; i++)
+ {
+ wxString str = argv[i];
+ #ifdef __WXMSW__
+ if (str.size() >= 1 && str[0] == '/')
+ str[0] = '-';
+ char pszLower[MAX_PATH];
+ strlcpy(pszLower, str.c_str(), sizeof(pszLower));
+ strlwr(pszLower);
+ str = pszLower;
+ #endif
+ if (str == "-daemon")
+ fDaemon = true;
+ }
}
}
//
// Parameters
//
- if (fCommandLine)
- {
- int ret = CommandLineRPC(argc, argv);
- exit(ret);
- }
-
ParseParameters(argc, argv);
+
+ if (mapArgs.count("-datadir"))
+ strlcpy(pszSetDataDir, mapArgs["-datadir"].c_str(), sizeof(pszSetDataDir));
+
+ ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
+
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
wxString strUsage = string() +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
- " bitcoin [options] \t" + "\n" +
- " bitcoin [command] \t" + _("Send command to bitcoin running with -server or -daemon\n") +
- " bitcoin [command] -? \t" + _("Get help for a command\n") +
- " bitcoin help <pw> \t" + _("List commands\n") +
+ " bitcoin [options] \t " + "\n" +
+ " bitcoin [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
+ " bitcoin [options] <command> -? \t\t " + _("Get help for a command\n") +
+ " bitcoin help \t\t\t " + _("List commands\n") +
_("Options:\n") +
+ " -conf=<file> \t " + _("Specify configuration file (default: bitcoin.conf)\n") +
" -gen \t " + _("Generate coins\n") +
" -gen=0 \t " + _("Don't generate coins\n") +
" -min \t " + _("Start minimized\n") +
" -proxy=<ip:port>\t " + _("Connect through socks4 proxy\n") +
" -addnode=<ip> \t " + _("Add a node to connect to\n") +
" -connect=<ip> \t " + _("Connect only to the specified node\n") +
- " -rpcpw=<pw> \t " + _("Accept command line and JSON-RPC commands with the given password\n") +
+ " -server \t " + _("Accept command line and JSON-RPC commands\n") +
" -daemon \t " + _("Run in the background as a daemon and accept commands\n") +
" -? \t " + _("This help message\n");
return false;
}
- if (mapArgs.count("-datadir"))
- strlcpy(pszSetDataDir, mapArgs["-datadir"].c_str(), sizeof(pszSetDataDir));
-
if (mapArgs.count("-debug"))
fDebug = true;
if (mapArgs.count("-printtodebugger"))
fPrintToDebugger = true;
+ if (fCommandLine)
+ {
+ int ret = CommandLineRPC(argc, argv);
+ exit(ret);
+ }
+
if (!fDebug && !pszSetDataDir[0])
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
if (!CreateThread(StartNode, NULL))
wxMessageBox("Error: CreateThread(StartNode) failed", "Bitcoin");
- if (mapArgs.count("-server") || mapArgs.count("-rpcpw") || fDaemon)
+ if (mapArgs.count("-server") || fDaemon)
CreateThread(ThreadRPCServer, NULL);
if (fFirstRun)
typedef Value(*rpcfn_type)(const Array& params, bool fHelp);
extern map<string, rpcfn_type> mapCallTable;
-static string strRPCPassword;
+
+
+void PrintConsole(const char* format, ...)
+{
+ char buffer[50000];
+ int limit = sizeof(buffer);
+ va_list arg_ptr;
+ va_start(arg_ptr, format);
+ int ret = _vsnprintf(buffer, limit, format, arg_ptr);
+ va_end(arg_ptr);
+ if (ret < 0 || ret >= limit)
+ {
+ ret = limit - 1;
+ buffer[limit-1] = 0;
+ }
+#if defined(__WXMSW__) && wxUSE_GUI
+ MyMessageBox(buffer, "Bitcoin", wxOK | wxICON_EXCLAMATION);
+#else
+ fprintf(stdout, buffer);
+#endif
+}
///
-
Value help(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "help <pw>\n"
+ "help\n"
"List commands.");
string strRet;
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "stop <pw>\n"
+ "stop\n"
"Stop bitcoin server.");
// Shutdown will take long enough that the response should get back
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getblockcount <pw>\n"
+ "getblockcount\n"
"Returns the number of blocks in the longest block chain.");
return nBestHeight + 1;
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getblocknumber <pw>\n"
+ "getblocknumber\n"
"Returns the block number of the latest block in the longest block chain.");
return nBestHeight;
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getconnectioncount <pw>\n"
+ "getconnectioncount\n"
"Returns the number of connections to other nodes.");
return (int)vNodes.size();
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getdifficulty <pw>\n"
+ "getdifficulty\n"
"Returns the proof-of-work difficulty as a multiple of the minimum difficulty.");
return GetDifficulty();
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getbalance <pw>\n"
+ "getbalance\n"
"Returns the server's available balance.");
return ((double)GetBalance() / (double)COIN);
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getgenerate <pw>\n"
+ "getgenerate\n"
"Returns true or false.");
return (bool)fGenerateBitcoins;
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
- "setgenerate <pw> <generate> [genproclimit]\n"
+ "setgenerate <generate> [genproclimit]\n"
"<generate> is true or false to turn generation on or off.\n"
"Generation is limited to [genproclimit] processors, -1 is unlimited.");
{
if (fHelp || params.size() != 0)
throw runtime_error(
- "getinfo <pw>");
+ "getinfo");
Object obj;
obj.push_back(Pair("balance", (double)GetBalance() / (double)COIN));
{
if (fHelp || params.size() > 1)
throw runtime_error(
- "getnewaddress <pw> [label]\n"
+ "getnewaddress [label]\n"
"Returns a new bitcoin address for receiving payments. "
"If [label] is specified (recommended), it is added to the address book "
"so payments received with the address will be labeled.");
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
- "setlabel <pw> <bitcoinaddress> <label>\n"
+ "setlabel <bitcoinaddress> <label>\n"
"Sets the label associated with the given address.");
string strAddress = params[0].get_str();
{
if (fHelp || params.size() != 1)
throw runtime_error(
- "getlabel <pw> <bitcoinaddress>\n"
+ "getlabel <bitcoinaddress>\n"
"Returns the label associated with the given address.");
string strAddress = params[0].get_str();
{
if (fHelp || params.size() != 1)
throw runtime_error(
- "getaddressesbylabel <pw> <label>\n"
+ "getaddressesbylabel <label>\n"
"Returns the list of addresses with the given label.");
string strLabel = params[0].get_str();
{
if (fHelp || params.size() < 2 || params.size() > 4)
throw runtime_error(
- "sendtoaddress <pw> <bitcoinaddress> <amount> [comment] [comment-to]\n"
+ "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
"<amount> is a real and is rounded to the nearest 0.01");
string strAddress = params[0].get_str();
{
if (fHelp || params.size() > 2)
throw runtime_error(
- "listtransactions <pw> [count=10] [includegenerated=false]\n"
+ "listtransactions [count=10] [includegenerated=false]\n"
"Returns up to [count] most recent transactions.");
int64 nCount = 10;
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
- "getreceivedbyaddress <pw> <bitcoinaddress> [minconf=1]\n"
+ "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
"Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
// Bitcoin address
{
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
- "getreceivedbylabel <pw> <label> [minconf=1]\n"
+ "getreceivedbylabel <label> [minconf=1]\n"
"Returns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.");
// Get the set of pub keys that have the label
{
if (fHelp || params.size() > 2)
throw runtime_error(
- "listreceivedbyaddress <pw> [minconf=1] [includeempty=false]\n"
+ "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
"[minconf] is the minimum number of confirmations before payments are included.\n"
"[includeempty] whether to include addresses that haven't received any payments.\n"
"Returns an array of objects containing:\n"
{
if (fHelp || params.size() > 2)
throw runtime_error(
- "listreceivedbylabel <pw> [minconf=1] [includeempty=false]\n"
+ "listreceivedbylabel [minconf=1] [includeempty=false]\n"
"[minconf] is the minimum number of confirmations before payments are included.\n"
"[includeempty] whether to include labels that haven't received any payments.\n"
"Returns an array of objects containing:\n"
// and to be compatible with other JSON-RPC implementations.
//
-string HTTPPost(const string& strMsg)
+string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeaders)
{
- return strprintf(
- "POST / HTTP/1.1\r\n"
- "User-Agent: json-rpc/1.0\r\n"
- "Host: 127.0.0.1\r\n"
- "Content-Type: application/json\r\n"
- "Content-Length: %d\r\n"
- "Accept: application/json\r\n"
- "\r\n"
- "%s",
- strMsg.size(),
- strMsg.c_str());
+ ostringstream s;
+ s << "POST / HTTP/1.1\r\n"
+ << "User-Agent: json-rpc/1.0\r\n"
+ << "Host: 127.0.0.1\r\n"
+ << "Content-Type: application/json\r\n"
+ << "Content-Length: " << strMsg.size() << "\r\n"
+ << "Accept: application/json\r\n";
+ for (map<string,string>::const_iterator it = mapRequestHeaders.begin(); it != mapRequestHeaders.end(); ++it)
+ s << it->first << ": " << it->second << "\r\n";
+ s << "\r\n" << strMsg;
+
+ return s.str();
}
string HTTPReply(const string& strMsg, int nStatus=200)
{
+ if (nStatus == 401)
+ return "HTTP/1.0 401 Authorization Required\r\n"
+ "Server: HTTPd/1.0\r\n"
+ "Date: Sat, 08 Jul 2006 12:04:08 GMT\r\n"
+ "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
+ "Content-Type: text/html\r\n"
+ "Content-Length: 311\r\n"
+ "\r\n"
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
+ "\"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd\">\r\n"
+ "<HTML>\r\n"
+ "<HEAD>\r\n"
+ "<TITLE>Error</TITLE>\r\n"
+ "<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>\r\n"
+ "</HEAD>\r\n"
+ "<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
+ "</HTML>\r\n";
string strStatus;
if (nStatus == 200) strStatus = "OK";
if (nStatus == 500) strStatus = "Internal Server Error";
strMsg.c_str());
}
-int ReadHTTPHeader(tcp::iostream& stream)
+int ReadHTTPStatus(tcp::iostream& stream)
+{
+ string str;
+ getline(stream, str);
+ vector<string> vWords;
+ boost::split(vWords, str, boost::is_any_of(" "));
+ int nStatus = atoi(vWords[1].c_str());
+ return nStatus;
+}
+
+int ReadHTTPHeader(tcp::iostream& stream, map<string, string>& mapHeadersRet)
{
int nLen = 0;
loop
std::getline(stream, str);
if (str.empty() || str == "\r")
break;
- if (str.substr(0,15) == "Content-Length:")
- nLen = atoi(str.substr(15));
+ string::size_type nColon = str.find(":");
+ if (nColon != string::npos)
+ {
+ string strHeader = str.substr(0, nColon);
+ boost::trim(strHeader);
+ string strValue = str.substr(nColon+1);
+ boost::trim(strValue);
+ mapHeadersRet[strHeader] = strValue;
+ if (strHeader == "Content-Length")
+ nLen = atoi(strValue.c_str());
+ }
}
return nLen;
}
-inline string ReadHTTP(tcp::iostream& stream)
+int ReadHTTP(tcp::iostream& stream, map<string, string>& mapHeadersRet, string& strMessageRet)
{
+ mapHeadersRet.clear();
+ strMessageRet = "";
+
+ // Read status
+ int nStatus = ReadHTTPStatus(stream);
+
// Read header
- int nLen = ReadHTTPHeader(stream);
+ int nLen = ReadHTTPHeader(stream, mapHeadersRet);
if (nLen <= 0)
- return string();
+ return 500;
// Read message
vector<char> vch(nLen);
stream.read(&vch[0], nLen);
- return string(vch.begin(), vch.end());
+ strMessageRet = string(vch.begin(), vch.end());
+
+ return nStatus;
}
+string EncodeBase64(string s)
+{
+ BIO *b64, *bmem;
+ BUF_MEM *bptr;
+
+ b64 = BIO_new(BIO_f_base64());
+ bmem = BIO_new(BIO_s_mem());
+ b64 = BIO_push(b64, bmem);
+ BIO_write(b64, s.c_str(), s.size());
+ BIO_flush(b64);
+ BIO_get_mem_ptr(b64, &bptr);
+ string result(bptr->data, bptr->length-1);
+ BIO_free_all(b64);
+
+ return result;
+}
+
+string DecodeBase64(string s)
+{
+ BIO *b64, *bmem;
+
+ char* buffer = static_cast<char*>(calloc(s.size(), sizeof(char)));
+
+ b64 = BIO_new(BIO_f_base64());
+ BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+ bmem = BIO_new_mem_buf(const_cast<char*>(s.c_str()), s.size());
+ bmem = BIO_push(b64, bmem);
+ BIO_read(bmem, buffer, s.size());
+ BIO_free_all(bmem);
+
+ string result(buffer);
+ free(buffer);
+ return result;
+}
+
+bool HTTPAuthorized(map<string, string>& mapHeaders)
+{
+ string strAuth = mapHeaders["Authorization"];
+ if (strAuth.substr(0,6) != "Basic ")
+ return false;
+ string strUserPass64 = strAuth.substr(6); boost::trim(strUserPass64);
+ string strUserPass = DecodeBase64(strUserPass64);
+ string::size_type nColon = strUserPass.find(":");
+ if (nColon == string::npos)
+ return false;
+ string strUser = strUserPass.substr(0, nColon);
+ string strPassword = strUserPass.substr(nColon+1);
+ return (strUser == mapArgs["-rpcuser"] && strPassword == mapArgs["-rpcpassword"]);
+}
//
// JSON-RPC protocol
{
printf("ThreadRPCServer started\n");
- if (mapArgs.count("-rpcpw"))
- strRPCPassword = mapArgs["-rpcpw"];
- if (strRPCPassword == "")
+ if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
{
-#if defined(__WXMSW__) && wxUSE_GUI
- MyMessageBox("Warning: rpc password is blank, use -rpcpw=<password>\n", "Bitcoin", wxOK | wxICON_EXCLAMATION);
-#else
- fprintf(stdout, "Warning: rpc password is blank, use -rpcpw=<password>\n");
-#endif
+ string strWhatAmI = "To use bitcoind";
+ if (mapArgs.count("-server"))
+ strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
+ else if (mapArgs.count("-daemon"))
+ strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
+ PrintConsole(
+ _("Warning: %s, you must set rpcpassword=<password>\nin the configuration file: %s\n"
+ "If the file does not exist, create it with owner-readable-only file permissions.\n"),
+ strWhatAmI.c_str(),
+ GetConfigFile().c_str());
+ CreateThread(Shutdown, NULL);
+ return;
}
// Bind to loopback 127.0.0.1 so the socket can only be accessed locally
continue;
// Receive request
- string strRequest = ReadHTTP(stream);
+ map<string, string> mapHeaders;
+ string strRequest;
+ ReadHTTP(stream, mapHeaders, strRequest);
+
+ // Check authorization
+ if (mapHeaders.count("Authorization") == 0)
+ {
+ stream << HTTPReply("", 401) << std::flush;
+ continue;
+ }
+ if (!HTTPAuthorized(mapHeaders))
+ {
+ // Deter brute-forcing short passwords
+ if (mapArgs["-rpcpassword"].size() < 15)
+ Sleep(50);
+
+ stream << HTTPReply("", 401) << std::flush;
+ printf("ThreadRPCServer incorrect password attempt\n");
+ continue;
+ }
// Handle multiple invocations per request
string::iterator begin = strRequest.begin();
printf("ThreadRPCServer method=%s\n", strMethod.c_str());
- // Check password
- if (params.size() < 1 || params[0].type() != str_type)
- throw runtime_error("First parameter must be the password.");
- if (params[0].get_str() != strRPCPassword)
- {
- if (strRPCPassword.size() < 15)
- Sleep(50);
- begin = strRequest.end();
- printf("ThreadRPCServer incorrect password attempt\n");
- throw runtime_error("Incorrect password.");
- }
-
// Execute
map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
if (mi == mapCallTable.end())
throw runtime_error("Method not found.");
- Value result = (*(*mi).second)(Array(params.begin()+1, params.end()), false);
+ Value result = (*(*mi).second)(params, false);
// Send reply
string strReply = JSONRPCReply(result, Value::null, id);
Value CallRPC(const string& strMethod, const Array& params)
{
+ if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
+ throw runtime_error(strprintf(
+ _("You must set rpcpassword=<password> in the configuration file:\n%s\n"
+ "If the file does not exist, create it with owner-readable-only file permissions."),
+ GetConfigFile().c_str()));
+
// Connect to localhost
tcp::iostream stream("127.0.0.1", "8332");
if (stream.fail())
throw runtime_error("couldn't connect to server");
+ // HTTP basic authentication
+ string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]);
+ map<string, string> mapRequestHeaders;
+ mapRequestHeaders["Authorization"] = string("Basic ") + strUserPass64;
+
// Send request
string strRequest = JSONRPCRequest(strMethod, params, 1);
- stream << HTTPPost(strRequest) << std::flush;
+ string strPost = HTTPPost(strRequest, mapRequestHeaders);
+ stream << strPost << std::flush;
// Receive reply
- string strReply = ReadHTTP(stream);
- if (strReply.empty())
+ map<string, string> mapHeaders;
+ string strReply;
+ int nStatus = ReadHTTP(stream, mapHeaders, strReply);
+ if (nStatus == 401)
+ throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
+ else if (nStatus >= 400 && nStatus != 500)
+ throw runtime_error(strprintf("server returned HTTP error %d", nStatus));
+ else if (strReply.empty())
throw runtime_error("no response from server");
// Parse reply
{
try
{
- // Check that method exists
+ // Skip switches
+ while (argc > 1 && IsSwitchChar(argv[1][0]))
+ {
+ argc--;
+ argv++;
+ }
+
+ // Check that the method exists
if (argc < 2)
throw runtime_error("too few parameters");
string strMethod = argv[1];
git://git.novaco.in / novacoin.git / commitdiff