If you keep writing weird runes, I'll be back... #5539
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustyrussell
changed the title
|
interesting workaround... was a bit confusing at first but works for me! |
|
I was worried about some of the videos I have out on commando being invalidated by this... but I'm putting together a web tool for constructing runes (https://jb55.com/runes) so perhaps it's not a big deal and people can just use that. |
cdecker
force-pushed
the
guilt/commando-weird-rune
branch
from
5a23870
to
9ecaa28
Compare
|
Rebased on top of |
1. It depends on both request and reply schemas. 2. Wildcards aren't natively expanded in make, so use $(wildcard). Signed-off-by: Rusty Russell <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
We didn't handle \ in fields properly, unless they were one-char long. Signed-off-by: Rusty Russell <[email protected]>
JSON needs to escape \, since it can't be in front of anything unexpected, so no \|. So we need to return \\ to \, and in theory handle \n etc. Changelog-Fixed: JSON-RPC: `commando-rune` now handles \\ escapes properly. Signed-off-by: Rusty Russell <[email protected]>
This avoids having to escape | or &, though we still allow that for the deprecation period. To detect deprecated usage, we insist that alternatives are *always* an array (which could be loosened later), but that also means that restrictions must *always* be an array for now. Before: ``` # invoice, description either A or B lightning-cli commando-rune '["method=invoice","pnamedescription=A|pnamedescription=B"]' # invoice, description literally 'A|B' lightning-cli commando-rune '["method=invoice","pnamedescription=A\\|B"]' ``` After: ``` # invoice, description either A or B lightning-cli commando-rune '[["method=invoice"],["pnamedescription=A", "pnamedescription=B"]]' # invoice, description literally 'A|B' lightning-cli commando-rune '[["method=invoice"],["pnamedescription=A|B"]]' ``` Changelog-Deprecated: JSON-RPC: `commando-rune` restrictions is always an array, each element an array of alternatives. Replaces a string with `|`-separators, so no escaping necessary except for `\\`.
They also have 6 months, ideally... |
rustyrussell
force-pushed
the
guilt/commando-weird-rune
branch
from
9ecaa28
to
1d53827
Compare
|
Rebased again... |
|
ACK 1d53827 |
|
thanks!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First commit is a drive-by fix for msggen Makefiles @cdecker (since it doesn't cover commando-rune yet, it's not required, but I was trying to figure out why msggen didn't re-run before I understtood that).
Fixes #5474
The last commit deprecates the specification of alternatives in restrictions as "a|b", requiring a ["a", "b"] JSON array. This also means no more having to escape | and &, but means you we had to require arrays for the transition so we can detect deprecated usage. @jb55 WDYT?