Skip to content

Remove RPC over SSL support #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petertodd merged 1 commit into from
May 20, 2016
Merged

Remove RPC over SSL support #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 5 additions & 37 deletions bitcoin/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,65 +109,33 @@ def __init__(self,
if service_port is None:
service_port = bitcoin.params.RPC_PORT
conf['rpcport'] = int(conf.get('rpcport', service_port))
conf['rpcssl'] = conf.get('rpcssl', '0')
conf['rpchost'] = conf.get('rpcconnect', 'localhost')

if conf['rpcssl'].lower() in ('0', 'false'):
conf['rpcssl'] = False
elif conf['rpcssl'].lower() in ('1', 'true'):
conf['rpcssl'] = True
else:
raise ValueError('Unknown rpcssl value %r' % conf['rpcssl'])

if conf['rpcssl'] and 'rpcsslcertificatechainfile' in conf and 'rpcsslprivatekeyfile' in conf:
self.__ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
if os.path.exists(conf['rpcsslcertificatechainfile']):
certificate = conf['rpcsslcertificatechainfile']
elif os.path.exists(os.path.join(os.path.dirname(btc_conf_file), conf['rpcsslcertificatechainfile'])):
certificate = os.path.join(os.path.dirname(btc_conf_file), conf['rpcsslcertificatechainfile'])
else:
raise ValueError('The value of rpcsslcertificatechainfile is not correctly specified in the configuration file: %s' % btc_conf_file)
if os.path.exists(conf['rpcsslprivatekeyfile']):
private_key = conf['rpcsslprivatekeyfile']
elif os.path.exists(os.path.join(os.path.dirname(btc_conf_file), conf['rpcsslprivatekeyfile'])):
private_key = os.path.join(os.path.dirname(btc_conf_file), conf['rpcsslprivatekeyfile'])
else:
raise ValueError('The value of rpcsslprivatekeyfile is not correctly specified in the configuration file: %s' % btc_conf_file)
self.__ssl_context.load_cert_chain(certificate, private_key)

if 'rpcpassword' not in conf:
raise ValueError('The value of rpcpassword not specified in the configuration file: %s' % btc_conf_file)

service_url = ('%s://%s:%s@%s:%d' %
('https' if conf['rpcssl'] else 'http',
('http',
conf['rpcuser'], conf['rpcpassword'],
conf['rpchost'], conf['rpcport']))

self.__service_url = service_url
self.__url = urlparse.urlparse(service_url)

if self.__url.scheme not in ('https', 'http'):
if self.__url.scheme not in ('http',):
raise ValueError('Unsupported URL scheme %r' % self.__url.scheme)

if self.__url.port is None:
if self.__url.scheme == 'https':
port = httplib.HTTPS_PORT
else:
port = httplib.HTTP_PORT
port = httplib.HTTP_PORT
else:
port = self.__url.port
self.__id_count = 0
authpair = "%s:%s" % (self.__url.username, self.__url.password)
authpair = authpair.encode('utf8')
self.__auth_header = b"Basic " + base64.b64encode(authpair)

if self.__url.scheme == 'https':
self.__conn = httplib.HTTPSConnection(self.__url.hostname, port=port,
context=self.__ssl_context,
timeout=timeout)
else:
self.__conn = httplib.HTTPConnection(self.__url.hostname, port=port,
timeout=timeout)
self.__conn = httplib.HTTPConnection(self.__url.hostname, port=port,
timeout=timeout)


def _call(self, service_name, *args):
Expand Down
4 changes: 4 additions & 0 deletions release-notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ v0.6.0-SNAPSHOT (not yet released!)

Breaking API changes:

* RPC over SSL support removed to match Bitcoin Core's removal of RPC SSL
support in v0.12.0 If you need this, use an alternative such as a stunnel or
a SSH tunnel.

* Removed SCRIPT_VERIFY constants ``bitcoin.core.script``, leaving just the
constants in ``bitcoin.core.scripteval``; being singletons the redundant
constants were broken anyway.
Expand Down