-
Notifications
You must be signed in to change notification settings - Fork 5
NMS-9350: Add support for Kerberos message encryption #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dino2gnt
wants to merge
5
commits into
release-1.x
Choose a base branch
from
dcy/KerberosMessageEncryption
base: release-1.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
07e00c1
Add support for Kerberos message encryption
dino2gnt 5f6d4ed
Fixes after rebasing to release-1.x for cxf 3.6.6
dino2gnt 8741ddd
Rework Kerberos message encryption, make connections session-owned an…
dino2gnt 615d5b8
additional hardening and tests
dino2gnt 2eec24d
Fix TGT expiry re-login, Fix Kerberos conduit scoping, fix idle sessi…
dino2gnt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,9 @@ public enum WSManOperation { | |
| @Option(name="-gssAuth", usage="GSS authentication") | ||
| private boolean gssAuth = false; | ||
|
|
||
| @Option(name="-kerberosEncryption", usage="Kerberos message encryption (MS-WSMV §2.2.9.1)") | ||
| private boolean kerberosEncryption = false; | ||
|
|
||
| @Option(name="-o", usage="operation") | ||
| WSManOperation operation = WSManOperation.ENUM; | ||
|
|
||
|
|
@@ -145,15 +148,28 @@ public void doMain(String[] args) { | |
| .withStrictSSL(strictSSL) | ||
| .withServerVersion(serverVersion) | ||
| .withMaxElements(100); | ||
| if (username != null && password != null) { | ||
| if (kerberosEncryption) { | ||
| if (username != null && password != null) { | ||
| builder.withBasicAuth(username, password); | ||
| } | ||
| builder.withKerberosEncryption(); | ||
| } else if (username != null && password != null) { | ||
| builder.withBasicAuth(username, password); | ||
| } else if (gssAuth) { | ||
| builder.withGSSAuth(); | ||
| } | ||
| WSManEndpoint endpoint = builder.build(); | ||
| LOG.info("Using endpoint: {}", endpoint); | ||
| WSManClient client = clientFactory.getClient(endpoint); | ||
| try { | ||
| runOperation(client); | ||
| } finally { | ||
| // Release any long-lived transport resources (e.g. the Kerberos-encrypted session) | ||
| client.close(); | ||
| } | ||
| } | ||
|
|
||
| private void runOperation(WSManClient client) { | ||
| if (operation == WSManOperation.ENUM) { | ||
| List<Node> nodes = new LinkedList<>(); | ||
| if (arguments.isEmpty()) { | ||
|
|
@@ -199,6 +215,8 @@ public void doMain(String[] args) { | |
| System.out.print(result.stdout()); | ||
| System.err.print(result.stderr()); | ||
| LOG.info("Command exited with code {}", result.exitCode()); | ||
| // Close before exiting so the transport session is torn down cleanly | ||
| client.close(); | ||
| System.exit(result.exitCode()); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. |
||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
javax.xml.bind:jaxb-api:2.3.1 and javax.xml.ws:jaxws-api:2.3.1 are now declared twice