1 files changed, 57 insertions, 5 deletions
diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py
index 01f68344ae..1ef59da5ad 100755
--- a/test/functional/rpc_users.py
+++ b/test/functional/rpc_users.py
@@ -5,13 +5,22 @@
 """Test multiple RPC users."""
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import str_to_b64str, assert_equal
+from test_framework.util import (
+    assert_equal,
+    get_datadir_path,
+    str_to_b64str,
+)
 
 import os
 import http.client
 import urllib.parse
+import subprocess
+from random import SystemRandom
+import string
+import configparser
 
-class HTTPBasicsTest (BitcoinTestFramework):
+
+class HTTPBasicsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
 
@@ -22,10 +31,21 @@ class HTTPBasicsTest (BitcoinTestFramework):
         rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
         rpcuser = "rpcuser=rpcuser💻"
         rpcpassword = "rpcpassword=rpcpassword🔑"
-        with open(os.path.join(self.options.tmpdir+"/node0", "bitcoin.conf"), 'a', encoding='utf8') as f:
+
+        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([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")
-        with open(os.path.join(self.options.tmpdir+"/node1", "bitcoin.conf"), 'a', encoding='utf8') as f:
+            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")
 
@@ -46,6 +66,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
         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)
@@ -54,8 +75,9 @@ class HTTPBasicsTest (BitcoinTestFramework):
         resp = conn.getresponse()
         assert_equal(resp.status, 200)
         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)
@@ -66,6 +88,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)}
 
@@ -77,6 +100,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)}
 
@@ -88,6 +112,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
         conn.close()
 
         #Correct for rt2
+        self.log.info('Correct...')
         authpairnew = "rt2:"+password2
         headers = {"Authorization": "Basic " + str_to_b64str(authpairnew)}
 
@@ -99,6 +124,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)}
 
@@ -109,12 +135,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)}
@@ -138,6 +189,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
         conn.close()
 
         #Wrong password for rpcuser
+        self.log.info('Wrong...')
         rpcuserauthpair = "rpcuser:rpcpasswordwrong"
         headers = {"Authorization": "Basic " + str_to_b64str(rpcuserauthpair)}