setconfig rpcpassword: don't try to evaluate or reencode

This commit is contained in:
SomberNight 2018-01-13 22:43:57 +01:00 committed by ThomasV
parent 7b4b6b8f98
commit a58d01ed54
2 changed files with 5 additions and 6 deletions

View File

@ -278,7 +278,8 @@ def run_offline_command(config, config_options):
# arguments passed to function
args = [config.get(x) for x in cmd.params]
# decode json arguments
args = list(map(json_decode, args))
if cmdname not in ('setconfig',):
args = list(map(json_decode, args))
# options
kwargs = {}
for x in cmd.options:

View File

@ -34,7 +34,7 @@ from functools import wraps
from decimal import Decimal
from .import util
from .util import bfh, bh2u, format_satoshis
from .util import bfh, bh2u, format_satoshis, json_decode
from .import bitcoin
from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS
from .i18n import _
@ -151,10 +151,8 @@ class Commands:
@command('')
def setconfig(self, key, value):
"""Set a configuration variable. 'value' may be a string or a Python expression."""
try:
value = ast.literal_eval(value)
except:
pass
if key not in ('rpcuser', 'rpcpassword'):
value = json_decode(value)
self.config.set_key(key, value)
return True