1 files changed, 50 insertions, 2 deletions
diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py
index 0ce412f74a..102dd22594 100755
--- a/test/functional/rpc_users.py
+++ b/test/functional/rpc_users.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2017 The Bitcoin Core developers
+# Copyright (c) 2015-2018 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test multiple RPC users."""
@@ -14,6 +14,11 @@ from test_framework.util import (
 import os
 import http.client
 import urllib.parse
+import subprocess
+from random import SystemRandom
+import string
+import configparser
+import sys
 
 
 class HTTPBasicsTest(BitcoinTestFramework):
@@ -27,9 +32,20 @@ class HTTPBasicsTest(BitcoinTestFramework):
         rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
         rpcuser = "rpcuser=rpcuser💻"
         rpcpassword = "rpcpassword=rpcpassword🔑"
+
+        self.user = ''.join(SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(10))
+        config = configparser.ConfigParser()
+        config.read_file(open(self.options.configfile))
+        gen_rpcauth = config['environment']['RPCAUTH']
+        p = subprocess.Popen([sys.executable, gen_rpcauth, self.user], stdout=subprocess.PIPE, universal_newlines=True)
+        lines = p.stdout.read().splitlines()
+        rpcauth3 = lines[1]
+        self.password = lines[3]
+
         with open(os.path.join(get_datadir_path(self.options.tmpdir, 0), "bitcoin.conf"), 'a', encoding='utf8') as f:
             f.write(rpcauth+"\n")
             f.write(rpcauth2+"\n")
+            f.write(rpcauth3+"\n")
         with open(os.path.join(get_datadir_path(self.options.tmpdir, 1), "bitcoin.conf"), 'a', encoding='utf8') as f:
             f.write(rpcuser+"\n")
             f.write(rpcpassword+"\n")
@@ -44,13 +60,14 @@ class HTTPBasicsTest(BitcoinTestFramework):
         #Old authpair
         authpair = url.username + ':' + url.password
 
-        #New authpair generated via share/rpcuser tool
+        #New authpair generated via share/rpcauth tool
         password = "cA773lm788buwYe4g4WT+05pKyNruVKjQ25x3n0DQcM="
 
         #Second authpair with different username
         password2 = "8/F3uMDw4KSEbw96U3CA1C4X05dkHDN2BPFjTgZW4KI="
         authpairnew = "rt:"+password
 
+        self.log.info('Correct...')
         headers = {"Authorization": "Basic " + str_to_b64str(authpair)}
 
         conn = http.client.HTTPConnection(url.hostname, url.port)
@@ -61,6 +78,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Use new authpair to confirm both work
+        self.log.info('Correct...')
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
         conn = http.client.HTTPConnection(url.hostname, url.port)
@@ -71,6 +89,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Wrong login name with rt's password
+        self.log.info('Wrong...')
         authpairnew = "rtwrong:"+password
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -82,6 +101,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Wrong password for rt
+        self.log.info('Wrong...')
         authpairnew = "rt:"+password+"wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -93,6 +113,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Correct for rt2
+        self.log.info('Correct...')
         authpairnew = "rt2:"+password2
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -104,6 +125,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Wrong password for rt2
+        self.log.info('Wrong...')
         authpairnew = "rt2:"+password2+"wrong"
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -114,12 +136,37 @@ class HTTPBasicsTest(BitcoinTestFramework):
         assert_equal(resp.status, 401)
         conn.close()
 
+        #Correct for randomly generated user
+        self.log.info('Correct...')
+        authpairnew = self.user+":"+self.password
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
+
+        conn = http.client.HTTPConnection(url.hostname, url.port)
+        conn.connect()
+        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
+        resp = conn.getresponse()
+        assert_equal(resp.status, 200)
+        conn.close()
+
+        #Wrong password for randomly generated user
+        self.log.info('Wrong...')
+        authpairnew = self.user+":"+self.password+"Wrong"
+        headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
+
+        conn = http.client.HTTPConnection(url.hostname, url.port)
+        conn.connect()
+        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
+        resp = conn.getresponse()
+        assert_equal(resp.status, 401)
+        conn.close()
+
         ###############################################################
         # Check correctness of the rpcuser/rpcpassword config options #
         ###############################################################
         url = urllib.parse.urlparse(self.nodes[1].url)
 
         # rpcuser and rpcpassword authpair
+        self.log.info('Correct...')
         rpcuserauthpair = "rpcuser💻:rpcpassword🔑"
 
         headers = {"Authorization": "Basic " + str_to_b64str(rpcuserauthpair)}
@@ -143,6 +190,7 @@ class HTTPBasicsTest(BitcoinTestFramework):
         conn.close()
 
         #Wrong password for rpcuser
+        self.log.info('Wrong...')
         rpcuserauthpair = "rpcuser:rpcpasswordwrong"
         headers = {"Authorization": "Basic " + str_to_b64str(rpcuserauthpair)}