aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

pylightning: make sure UTF-8 gets passed intact.

Browse Source 
1. We need to read in as a byte string, then decode into utf8 once we
   have a marker.  Otherwise we seem to mangle it horribly, and we
   might have a bad utf8 string anyway.

2. We need to suppress the JSON \u escapes on output.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-03-04 13:30:35 +10:30
committed by Christian Decker
parent 5f437de771
commit cc342fda83
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/pylightning/lightning/plugin.py
View File

@@ -378,9 +378,11 @@ class Plugin(object):
self.log(traceback.format_exc()) self.log(traceback.format_exc())
def _write_locked(self, obj): def _write_locked(self, obj):
s = json.dumps(obj, cls=LightningRpc.LightningJSONEncoder) + "\n\n" # ensure_ascii turns UTF-8 into \uXXXX so we need to suppress that,
# then utf8 ourselves.
s = bytes(json.dumps(obj, cls=LightningRpc.LightningJSONEncoder, ensure_ascii=False) + "\n\n", encoding='utf-8')
with self.write_lock: with self.write_lock:
self.stdout.write(s) self.stdout.buffer.write(s)
self.stdout.flush() self.stdout.flush()
def notify(self, method, params): def notify(self, method, params):
@@ -415,7 +417,7 @@ class Plugin(object):
for payload in msgs[:-1]: for payload in msgs[:-1]:
# Note that we use function annotations to do Millisatoshi conversions # Note that we use function annotations to do Millisatoshi conversions
# in _exec_func, so we don't use LightningJSONDecoder here. # in _exec_func, so we don't use LightningJSONDecoder here.
request = self._parse_request(json.loads(payload)) request = self._parse_request(json.loads(payload.decode('utf8')))
# If this has an 'id'-field, it's a request and returns a # If this has an 'id'-field, it's a request and returns a
# result. Otherwise it's a notification and it doesn't # result. Otherwise it's a notification and it doesn't
@@ -428,11 +430,11 @@ class Plugin(object):
return msgs[-1] return msgs[-1]
def run(self): def run(self):
partial = "" partial = b""
for l in self.stdin: for l in self.stdin.buffer:
partial += l partial += l
msgs = partial.split('\n\n') msgs = partial.split(b'\n\n')
if len(msgs) < 2: if len(msgs) < 2:
continue continue

1
tests/test_plugin.py
View File

@@ -190,7 +190,6 @@ def test_async_rpcmethod(node_factory, executor):
assert [r.result() for r in results] == [42] * len(results) assert [r.result() for r in results] == [42] * len(results)
@pytest.mark.xfail(strict=True)
def test_utf8_passthrough(node_factory, executor): def test_utf8_passthrough(node_factory, executor):
l1 = node_factory.get_node(options={'plugin': 'tests/plugins/utf8.py', l1 = node_factory.get_node(options={'plugin': 'tests/plugins/utf8.py',
'log-level': 'io'}) 'log-level': 'io'})