@@ -26,7 +26,7 @@ def rpccall(node, user, method):
26
26
27
27
28
28
def get_permissions (whitelist ):
29
- return [perm for perm in whitelist .replace ( " " , "" ). split ("," ) if perm ]
29
+ return [perm for perm in whitelist .split ("," ) if perm ]
30
30
31
31
32
32
class RPCWhitelistTest (BitcoinTestFramework ):
@@ -56,7 +56,7 @@ def run_test(self):
56
56
# Testing the same permission twice
57
57
["strangedude5" , "d12c6e962d47a454f962eb41225e6ec8$2dd39635b155536d3c1a2e95d05feff87d5ba55f2d5ff975e6e997a836b717c9" , ":getblockcount,getblockcount" , "s7R4nG3R7H1nGZ" ],
58
58
# Test non-whitelisted user
59
- ["strangedude6" , "ab02e4fb22ef4ab004cca217a49ee8d2$90dd09b08edd12d552d9d8a5ada838dcef2ac587789fa7e9c47f5990e80cdf93 " , None , "password123 " ]
59
+ ["strangedude6" , "67e5583538958883291f6917883eca64$8a866953ef9c5b7d078a62c64754a4eb74f47c2c17821eb4237021d7ef44f991 " , None , "N4SziYbHmhC1 " ]
60
60
]
61
61
# These commands shouldn't be allowed for any user to test failures
62
62
self .never_allowed = ["getnetworkinfo" ]
@@ -74,7 +74,7 @@ def run_test(self):
74
74
75
75
for user in self .users :
76
76
for permission in self .never_allowed :
77
- self .log .info ("[" + user [0 ] + " ]: Testing a non permitted permission (" + permission + " )" )
77
+ self .log .info (f"[ { user [0 ]} ]: Testing a non permitted permission ({ permission } )" )
78
78
assert_equal (403 , rpccall (self .nodes [0 ], user , permission ).status )
79
79
# Now test the strange users
80
80
for permission in self .never_allowed :
@@ -113,9 +113,9 @@ def test_users_permissions(self):
113
113
for user in self .users :
114
114
permissions = get_permissions (user [2 ])
115
115
for permission in permissions :
116
- self .log .info ("[" + user [0 ] + " ]: Testing whitelisted user permission (" + permission + " )" )
116
+ self .log .info (f"[ { user [0 ]} ]: Testing whitelisted user permission ({ permission } )" )
117
117
assert_equal (200 , rpccall (self .nodes [0 ], user , permission ).status )
118
- self .log .info ("[" + user [0 ] + " ]: Testing non-permitted permission: getblockchaininfo" )
118
+ self .log .info (f"[ { user [0 ]} ]: Testing non-permitted permission: getblockchaininfo" )
119
119
assert_equal (403 , rpccall (self .nodes [0 ], user , "getblockchaininfo" ).status )
120
120
121
121
def test_rpcwhitelistdefault_0_no_permissions (self ):
@@ -126,7 +126,7 @@ def test_rpcwhitelistdefault_0_no_permissions(self):
126
126
"""
127
127
unrestricted_user = self .strange_users [6 ]
128
128
for permission in ["getbestblockhash" , "getblockchaininfo" ]:
129
- self .log .info ("[" + unrestricted_user [0 ] + " ]: Testing unrestricted user permission (" + permission + " )" )
129
+ self .log .info (f"[ { unrestricted_user [0 ]} ]: Testing unrestricted user permission ({ permission } )" )
130
130
assert_equal (200 , rpccall (self .nodes [0 ], unrestricted_user , permission ).status )
131
131
132
132
def test_rpcwhitelistdefault_1_no_permissions (self ):
@@ -137,7 +137,7 @@ def test_rpcwhitelistdefault_1_no_permissions(self):
137
137
"""
138
138
139
139
for permission in ["getbestblockhash" , "getblockchaininfo" ]:
140
- self .log .info ("[" + self .strange_users [6 ][0 ] + " ]: Testing rpcwhitelistdefault=1 no specified permission (" + permission + " )" )
140
+ self .log .info (f"[ { self .strange_users [6 ][0 ]} ]: Testing rpcwhitelistdefault=1 no specified permission ({ permission } )" )
141
141
assert_equal (403 , rpccall (self .nodes [0 ], self .strange_users [6 ], permission ).status )
142
142
143
143
0 commit comments