AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3659 from mithrandi/patch-1

Browse Source 
Stop allowing CORS for the JSON-RPC server
This commit is contained in:
ThomasV
2018-01-06 20:51:55 +01:00
committed by GitHub
parent 1fe18ab1ce 0cf67997c0
commit 6be7bda023
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/daemon.py
View File

@@ -28,7 +28,7 @@ import time
# from jsonrpc import JSONRPCResponseManager # from jsonrpc import JSONRPCResponseManager
import jsonrpclib import jsonrpclib
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
from .version import ELECTRUM_VERSION from .version import ELECTRUM_VERSION
from .network import Network from .network import Network
@@ -87,19 +87,6 @@ def get_server(config):
time.sleep(1.0) time.sleep(1.0)
class RequestHandler(SimpleJSONRPCRequestHandler):
def do_OPTIONS(self):
self.send_response(200)
self.end_headers()
def end_headers(self):
self.send_header("Access-Control-Allow-Headers",
"Origin, X-Requested-With, Content-Type, Accept")
self.send_header("Access-Control-Allow-Origin", "*")
SimpleJSONRPCRequestHandler.end_headers(self)
class Daemon(DaemonThread): class Daemon(DaemonThread):
def __init__(self, config, fd): def __init__(self, config, fd):
@@ -124,7 +111,7 @@ class Daemon(DaemonThread):
host = config.get('rpchost', '127.0.0.1') host = config.get('rpchost', '127.0.0.1')
port = config.get('rpcport', 0) port = config.get('rpcport', 0)
try: try:
server = SimpleJSONRPCServer((host, port), logRequests=False, requestHandler=RequestHandler) server = SimpleJSONRPCServer((host, port), logRequests=False)
except Exception as e: except Exception as e:
self.print_error('Warning: cannot initialize RPC server on host', host, e) self.print_error('Warning: cannot initialize RPC server on host', host, e)
self.server = None self.server = None