Improvements to authenticated JSON-RPC permissions checking #1144
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: Sally MacFarlane <sally.macfarlane@consensys.net>
…missions-check-1118
…missions-check-1118
mark-terry
reviewed
Jun 25, 2020
| @@ -69,7 +69,7 @@ public void shouldReturnFalseWhenNetworkIsNotListening() { | |||
| @Test | |||
| public void getPermissions() { | |||
| List<String> permissions = method.getPermissions(); | |||
| assertThat(permissions).containsExactlyInAnyOrder("net:*", "net:listening", "*:*"); | |||
| assertThat(permissions).containsExactly("*:*", "net:*", "net:listening"); | |||
There was a problem hiding this comment.
What's the reason for this change?
There was a problem hiding this comment.
it just made sense to have the items in order of granularity from widest to narrowest
There was a problem hiding this comment.
also if the permissions are checked in that order then the log.debug messages will make sense
.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java
Show resolved
Hide resolved
jframe
reviewed
Jun 25, 2020
.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
mark-terry
reviewed
Jun 25, 2020
| @@ -53,6 +53,10 @@ public static boolean isPermitted( | |||
| foundMatchingPermission.set(true); | |||
| } | |||
| }); | |||
| // exit if a matching permission was found, no need to keep checking | |||
| if (foundMatchingPermission.get()) { | |||
There was a problem hiding this comment.
The more I read this code the more I think setting a flag async is not ideal...
There was a problem hiding this comment.
I don't love it either but it's not simple to change so it's not going to happen as part of this PR
Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
…missions-check-1118
jframe
approved these changes
Jun 25, 2020
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.
Exit early when checking user permissions, ie if matching permission is found, don't keep checking.
Also reordered permissions produced by JsonRpcMethod to be in descending order of granularity
Added unit test for : permission
See #1118