improve did parser for port and path #24
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
Signed-off-by: 2byrds <[email protected]>
peacekeeper
reviewed
Oct 16, 2023
src/dkr/core/didding.py
Outdated
| @@ -16,12 +16,12 @@ | |||
| from keri.core import coring | |||
|
|
|||
| DID_KERI_RE = re.compile('\\Adid:keri:(?P<aid>[^:]+)\\Z', re.IGNORECASE) | |||
| DID_WEBS_RE = re.compile('\\Adid:webs:(?P<domain>[^:]+):((?P<path>.+):)?(?P<aid>[^:]+)\\Z', re.IGNORECASE) | |||
| DID_WEBS_RE = re.compile('\\Adid:webs:(?P<domain>[^:]+)(:(?P<port>\d+))?(:(?P<path>.+))?(:(?P<aid>[^:]+)+)\\Z', re.IGNORECASE) | |||
There was a problem hiding this comment.
Hmm according to the spec:
A port MAY be included and the colon MUST be percent encoded to prevent a conflict with paths.
Maybe the regex should use %3A instead of : for parsing the port and avoiding a conflict with the path?
There was a problem hiding this comment.
Great catch @peacekeeper ! I have updated it per the spec (and fixed my assertions in the unit test) in commit 6f3ce57
Signed-off-by: 2byrds <[email protected]>
peacekeeper
approved these changes
Oct 16, 2023
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.
Improve regex for did:webs to include port group and added unit tests.