[Improvement-16258][Registry] Add ZK authorization yaml control & add digest auth UT #16277
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
pegasas
requested review from
caishunfeng,
SbloodyS,
ruanwenjun and
Gallardot
as code owners
pegasas
force-pushed
the
issues/16276
branch
2 times, most recently
from
d8dcb83
to
a2db653
Compare
ruanwenjun
reviewed
Jul 5, 2024
.../java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistryProperties.java
Outdated
Show resolved
Hide resolved
SbloodyS
reviewed
Jul 5, 2024
Thanks, Done. |
SbloodyS
changed the title
ruanwenjun
reviewed
Jul 6, 2024
Comment on lines
+79
to
+82
| zk = new ZooKeeper("localhost:" + zookeeperContainer.getMappedPort(2181), | ||
| 30000, new DumbWatcher(), new ZKClientConfig()); |
It works now. |
ruanwenjun
changed the title
ruanwenjun
reviewed
Jul 8, 2024
Comment on lines
69
to
70
| public static void setupRootACLForDigest(final ZooKeeper zk) throws Exception { | ||
| final String digest = DigestAuthenticationProvider.generateDigest(ID_PASSWORD); | ||
| final ACL acl = new ACL(ZooDefs.Perms.ALL, new Id("digest", digest)); | ||
| zk.setACL("/", Collections.singletonList(acl), -1); | ||
| } |
There was a problem hiding this comment.
Why this method should be public?
Comment on lines
102
to
103
| zk.addAuthInfo("digest", ID_PASSWORD.getBytes(StandardCharsets.UTF_8)); | ||
| resetRootACL(zk); |
| @@ -80,7 +80,7 @@ final class ZookeeperRegistry implements Registry { | |||
| .sessionTimeoutMs(DurationUtils.toMillisInt(properties.getSessionTimeout())) | |||
| .connectionTimeoutMs(DurationUtils.toMillisInt(properties.getConnectionTimeout())); | |||
|
|
|||
| final String digest = properties.getDigest(); | |||
| final String digest = properties.getAuthorization().get(ZookeeperRegistryProperties.ZookeeperProperties.DIGEST); | |||
There was a problem hiding this comment.
Can we directly use the key as authorization key, value as authorization value ? otherwise you need to handle multiple authorization type.
|
pegasas
force-pushed
the
issues/16276
branch
2 times, most recently
from
d53076a
to
e4ee663
Compare
ruanwenjun
reviewed
Jul 10, 2024
Comment on lines
3
to
5
| public enum ZookeeperAuthSchema { | ||
| DIGEST, | ||
| } |
There was a problem hiding this comment.
Missing license, and can we removed this enum? We don't need to maintain a enum here.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| if (properties.getAuthorization().size() > 0) { | ||
| final String schema = properties.getAuthorization().keySet().stream().findFirst().get(); | ||
| final String schemaValue = properties.getAuthorization().get(schema); | ||
| builder.authorization(schema.toString().toLowerCase(), schemaValue.getBytes(StandardCharsets.UTF_8)) |
Check notice
Code scanning / CodeQL
Useless toString on String
…t auth UT Update dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/src/main/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistryProperties.java Co-authored-by: Wenjun Ruan <[email protected]>
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.
…t auth UT
Purpose of the pull request
fix: Improvement
Brief change log
add digest UT and small refactor on ZK registry yaml for future authentication support like #16271 (comment)
Verify this pull request
Pull Request Notice
Pull Request Notice
If your pull request contain incompatible change, you should also add it to
docs/docs/en/guide/upgrede/incompatible.md