Merge branch 'master' of git://gitorious.org/electrum/electrum
This commit is contained in:
commit
235088d83f
|
@ -0,0 +1,24 @@
|
||||||
|
<?
|
||||||
|
require_once 'jsonrpcphp/includes/jsonRPCClient.php';
|
||||||
|
|
||||||
|
echo "<pre>\n";
|
||||||
|
echo "This page demonstrates the generation of new addresses by a neutralized Electrum wallet.\n\n";
|
||||||
|
echo "A neutralized wallet does not contain the seed that allows to generate private keys.\nIt contains a master public key that allows to create new addresses.\n\n";
|
||||||
|
echo "An attacker getting access to the neutralized wallet cannot steal the bitcoins.\n";
|
||||||
|
echo "The full wallet (with seed) is not stored on the webserver.\n\n";
|
||||||
|
echo "<form action=\"\" method=\"post\"><input type=\"submit\" name=\"submit\" value=\"Get new address\"/></form> ";
|
||||||
|
|
||||||
|
if($_POST['submit']) {
|
||||||
|
$daemon = new jsonRPCClient('http://foo:bar@ecdsa.org:8444/');
|
||||||
|
try{
|
||||||
|
$r = $daemon->getnewaddress();
|
||||||
|
if($r) {
|
||||||
|
echo '<br/>';
|
||||||
|
echo "<a href='bitcoin:$r'>bitcoin:$r</a>\n\n";
|
||||||
|
}
|
||||||
|
} catch(Exception $e) {
|
||||||
|
echo "error: cannot reach wallet daemon";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
echo "</pre>";
|
||||||
|
?>
|
|
@ -38,31 +38,48 @@ todo:
|
||||||
|
|
||||||
host = 'ecdsa.org'
|
host = 'ecdsa.org'
|
||||||
port = 8444
|
port = 8444
|
||||||
password = 'my_password'
|
|
||||||
wallet_path = 'wallet_path'
|
wallet_path = 'wallet_path'
|
||||||
|
username = 'foo'
|
||||||
|
password = 'bar'
|
||||||
interface = Interface()
|
interface = Interface()
|
||||||
wallet = Wallet(interface)
|
wallet = Wallet(interface)
|
||||||
stopping = False
|
stopping = False
|
||||||
|
|
||||||
|
|
||||||
def do_stop(pw):
|
|
||||||
if pw != password: return False
|
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCRequestHandler
|
||||||
|
import SimpleXMLRPCServer
|
||||||
|
|
||||||
|
class authHandler(SimpleJSONRPCRequestHandler):
|
||||||
|
def parse_request(self):
|
||||||
|
if SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.parse_request(self):
|
||||||
|
if self.authenticate(self.headers):
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
self.send_error(401, 'Authentication failed')
|
||||||
|
return False
|
||||||
|
|
||||||
|
def authenticate(self, headers):
|
||||||
|
from base64 import b64decode
|
||||||
|
basic, _, encoded = headers.get('Authorization').partition(' ')
|
||||||
|
assert basic == 'Basic', 'Only basic authentication supported'
|
||||||
|
x_username, _, x_password = b64decode(encoded).partition(':')
|
||||||
|
return username == x_username and password == x_password
|
||||||
|
|
||||||
|
|
||||||
|
def do_stop():
|
||||||
global stopping
|
global stopping
|
||||||
stopping = True
|
stopping = True
|
||||||
|
|
||||||
def get_new_address(pw):
|
def get_new_address():
|
||||||
if pw != password: return False
|
|
||||||
a = wallet.create_new_address(False)
|
a = wallet.create_new_address(False)
|
||||||
wallet.save()
|
wallet.save()
|
||||||
return a
|
return a
|
||||||
|
|
||||||
def get_num(pw):
|
def get_num():
|
||||||
if pw != password: return False
|
|
||||||
return len(wallet.addresses)
|
return len(wallet.addresses)
|
||||||
|
|
||||||
def get_mpk(pw):
|
def get_mpk():
|
||||||
if pw != password: return False
|
|
||||||
return wallet.master_public_key.encode('hex')
|
return wallet.master_public_key.encode('hex')
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,13 +93,13 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if cmd == 'getnum':
|
if cmd == 'getnum':
|
||||||
out = server.getnum(password)
|
out = server.getnum()
|
||||||
elif cmd == 'getkey':
|
elif cmd == 'getkey':
|
||||||
out = server.getkey(password)
|
out = server.getkey()
|
||||||
elif cmd == 'getnewaddress':
|
elif cmd == 'getnewaddress':
|
||||||
out = server.getnewaddress(password)
|
out = server.getnewaddress()
|
||||||
elif cmd == 'stop':
|
elif cmd == 'stop':
|
||||||
out = server.stop(password)
|
out = server.stop()
|
||||||
except socket.error:
|
except socket.error:
|
||||||
print "server not running"
|
print "server not running"
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
@ -97,7 +114,7 @@ if __name__ == '__main__':
|
||||||
def server_thread():
|
def server_thread():
|
||||||
from SocketServer import ThreadingMixIn
|
from SocketServer import ThreadingMixIn
|
||||||
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
|
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
|
||||||
server = SimpleJSONRPCServer(( host, port))
|
server = SimpleJSONRPCServer(( host, port), requestHandler=authHandler)
|
||||||
server.register_function(get_new_address, 'getnewaddress')
|
server.register_function(get_new_address, 'getnewaddress')
|
||||||
server.register_function(get_num, 'getnum')
|
server.register_function(get_num, 'getnum')
|
||||||
server.register_function(get_mpk, 'getkey')
|
server.register_function(get_mpk, 'getkey')
|
Loading…
Reference in New Issue