AaronFiore/electrum
1
0
Fork 0
Code Activity

read password once

Browse Source
This commit is contained in:
ThomasV
2011-12-22 22:30:54 +03:00
parent 789639ff74
commit cba7983b66
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/server.py
View File

@@ -56,6 +56,8 @@ try:
except: except:
print "Could not read electrum.conf. I will use the default values." print "Could not read electrum.conf. I will use the default values."
password = config.get('server','password')
stopping = False stopping = False
block_number = -1 block_number = -1
sessions = {} sessions = {}
@@ -502,7 +504,7 @@ def do_command(cmd, data, ipaddr):
out = repr( store.get_history( address ) ) out = repr( store.get_history( address ) )
elif cmd == 'load': elif cmd == 'load':
if config.get('server','password') == data: if password == data:
out = repr( len(sessions) ) out = repr( len(sessions) )
else: else:
out = 'wrong password' out = 'wrong password'
@@ -512,7 +514,7 @@ def do_command(cmd, data, ipaddr):
print "sent tx:", out print "sent tx:", out
elif cmd =='clear_cache': elif cmd =='clear_cache':
if config.get('server','password') == data: if password == data:
store.tx_cache = {} store.tx_cache = {}
out = 'ok' out = 'ok'
else: else:
@@ -524,7 +526,7 @@ def do_command(cmd, data, ipaddr):
except: except:
addr = None addr = None
if addr: if addr:
if config.get('server','password') == pw: if password == pw:
out = store.tx_cache.get(addr) out = store.tx_cache.get(addr)
out = repr(out) out = repr(out)
else: else:
@@ -534,7 +536,7 @@ def do_command(cmd, data, ipaddr):
elif cmd == 'stop': elif cmd == 'stop':
global stopping global stopping
if config.get('server','password') == data: if password == data:
stopping = True stopping = True
out = 'ok' out = 'ok'
else: else:
@@ -639,17 +641,16 @@ if __name__ == '__main__':
if len(sys.argv)>1: if len(sys.argv)>1:
cmd = sys.argv[1] cmd = sys.argv[1]
pw = config.get('server','password')
if cmd == 'load': if cmd == 'load':
request = "('load','%s')#"%pw request = "('load','%s')#"%password
elif cmd == 'peers': elif cmd == 'peers':
request = "('peers','')#" request = "('peers','')#"
elif cmd == 'stop': elif cmd == 'stop':
request = "('stop','%s')#"%pw request = "('stop','%s')#"%password
elif cmd == 'clear_cache': elif cmd == 'clear_cache':
request = "('clear_cache','%s')#"%pw request = "('clear_cache','%s')#"%password
elif cmd == 'get_cache': elif cmd == 'get_cache':
request = "('get_cache',('%s','%s'))#"%(pw,sys.argv[2]) request = "('get_cache',('%s','%s'))#"%(password,sys.argv[2])
elif cmd == 'h': elif cmd == 'h':
request = "('h','%s')#"%sys.argv[2] request = "('h','%s')#"%sys.argv[2]
elif cmd == 'b': elif cmd == 'b':