mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-09 11:27:28 -03:00
contrib: rpcauth.py - Add new option (-j/--json) to output text in json format
-j/--json update and remove un-needed parens Update README to reflect new -j/--json options
This commit is contained in:
parent
baed5edeb6
commit
9adf949d2a
2 changed files with 10 additions and 3 deletions
|
@ -15,4 +15,5 @@ positional arguments:
|
||||||
|
|
||||||
optional arguments:
|
optional arguments:
|
||||||
-h, --help show this help message and exit
|
-h, --help show this help message and exit
|
||||||
|
-j, --json output data in json format
|
||||||
```
|
```
|
||||||
|
|
|
@ -7,6 +7,7 @@ from argparse import ArgumentParser
|
||||||
from getpass import getpass
|
from getpass import getpass
|
||||||
from secrets import token_hex, token_urlsafe
|
from secrets import token_hex, token_urlsafe
|
||||||
import hmac
|
import hmac
|
||||||
|
import json
|
||||||
|
|
||||||
def generate_salt(size):
|
def generate_salt(size):
|
||||||
"""Create size byte hex salt"""
|
"""Create size byte hex salt"""
|
||||||
|
@ -24,6 +25,7 @@ def main():
|
||||||
parser = ArgumentParser(description='Create login credentials for a JSON-RPC user')
|
parser = ArgumentParser(description='Create login credentials for a JSON-RPC user')
|
||||||
parser.add_argument('username', help='the username for authentication')
|
parser.add_argument('username', help='the username for authentication')
|
||||||
parser.add_argument('password', help='leave empty to generate a random password or specify "-" to prompt for password', nargs='?')
|
parser.add_argument('password', help='leave empty to generate a random password or specify "-" to prompt for password', nargs='?')
|
||||||
|
parser.add_argument("-j", "--json", help="output to json instead of plain-text", action='store_true')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if not args.password:
|
if not args.password:
|
||||||
|
@ -35,9 +37,13 @@ def main():
|
||||||
salt = generate_salt(16)
|
salt = generate_salt(16)
|
||||||
password_hmac = password_to_hmac(salt, args.password)
|
password_hmac = password_to_hmac(salt, args.password)
|
||||||
|
|
||||||
print('String to be appended to bitcoin.conf:')
|
if args.json:
|
||||||
print(f'rpcauth={args.username}:{salt}${password_hmac}')
|
odict={'username':args.username, 'password':args.password, 'rpcauth':f'{args.username}:{salt}${password_hmac}'}
|
||||||
print(f'Your password:\n{args.password}')
|
print(json.dumps(odict))
|
||||||
|
else:
|
||||||
|
print('String to be appended to bitcoin.conf:')
|
||||||
|
print(f'rpcauth={args.username}:{salt}${password_hmac}')
|
||||||
|
print(f'Your password:\n{args.password}')
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in a new issue