Merge #144: Add support for cookie file authentication

4f5bca8 Add support for cookie file authentication (Hielke Christian Braun)

Pull request description:

  Use the .cookie file from the bitcoin config folder if there is no rpcpassword specified in the bitcoin.conf file. Also removes username/password from service url. Credentials are already in the authorization field. Sending them via both methods should not be necessary

  https://en.wikipedia.org/wiki/Basic_access_authentication

Tree-SHA512: cdf74f62b9918a6c8da237e6a95ceb1a6e8ab3b05e392f7f67c34f6c574a5dff5acf20a20f1564cb7746432460e7fcdc64cd3586adba6a291479872ad38071de

Author: petertodd

bitcoin/rpc.py

@@ -158,13 +158,19 @@ def __init__(self,
                 conf['rpcport'] = int(conf.get('rpcport', service_port))
                 conf['rpchost'] = conf.get('rpcconnect', 'localhost')
 
-                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:%d' %
+                    ('http', conf['rpchost'], conf['rpcport']))
+
+                cookie_file = os.path.dirname(btc_conf_file)
+                cookie_file = os.path.join(cookie_file, ".cookie")
+                with open(cookie_file, 'r') as fd:
+                    authpair = fd.read()
 
-                service_url = ('%s://%s:%s@%s:%d' %
-                    ('http',
-                     conf['rpcuser'], conf['rpcpassword'],
-                     conf['rpchost'], conf['rpcport']))
+                if 'rpcpassword' in conf:
+                    authpair = "%s:%s" % (conf['rpcuser'], conf['rpcpassword'])
+
+                if authpair is None:
+                    raise ValueError('The value of rpcpassword not specified in the configuration file: %s' % btc_conf_file)
 
         self.__service_url = service_url
         self.__url = urlparse.urlparse(service_url)
@@ -177,7 +183,6 @@ def __init__(self,
         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)