Skip to content
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

fix: allow key exchange port configuration #3453

Merged
merged 3 commits into from
Mar 12, 2024

Conversation

achmelo
Copy link
Member

@achmelo achmelo commented Mar 8, 2024

Description

Allow users to configure Infinispan SSL key exchange port from external configuration, e.g. zowe.yaml.

Linked to #3450
Part of the # (epic)

Type of change

Please delete options that are not relevant.

  • fix: Bug fix (non-breaking change which fixes an issue)
  • feat: New feature (non-breaking change which adds functionality)
  • docs: Change in a documentation
  • refactor: Refactor the code
  • chore: Chore, repository cleanup, updates the dependencies.
  • BREAKING CHANGE or !: Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the style guidelines of this project
  • PR title conforms to commit message guideline ## Commit Message Structure Guideline
  • I have commented my code, particularly in hard-to-understand areas. In JS I did provide JSDoc
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • The java tests in the area I was working on leverage @nested annotations
  • Any dependent changes have been merged and published in downstream modules

For more details about how should the code look like read the Contributing guideline

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Copy link

sonarcloud bot commented Mar 8, 2024

@pablocarle
Copy link
Contributor

Does this property need to be added to the schema for zowe.yaml?

@achmelo
Copy link
Member Author

achmelo commented Mar 12, 2024

Does this property need to be added to the schema for zowe.yaml?

We need to add many configuration parameters in the caching-schema.json so I would propose to have a separate issue/PR to address this.

@achmelo achmelo merged commit d82322e into v2.x.x Mar 12, 2024
31 checks passed
@delete-merged-branch delete-merged-branch bot deleted the reboot/gh3450/conf-key-ex-port branch March 12, 2024 12:52
achmelo added a commit that referenced this pull request Apr 23, 2024
* allow key exchange port configuration

Signed-off-by: achmelo <a.chmelo@gmail.com>

* explain different defaults for the port

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same default port number

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit d82322e)
achmelo added a commit that referenced this pull request Apr 24, 2024
* fix: allow key exchange port configuration (#3453)

* allow key exchange port configuration

Signed-off-by: achmelo <a.chmelo@gmail.com>

* explain different defaults for the port

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same default port number

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit d82322e)

* chore: Change log levels for WS and Identity Mapper and add service info (#3344)

* add info about the southbound service request for authsource

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* add debug msg for websocket routing

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address pr comments

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
(cherry picked from commit 0a888f8)

* fix: Respect configuration enabling JWT Token Refresh Functionality #3468 (#3474)

* Respect JWT Refresh Configuration from zowe.yaml

Signed-off-by: Jakub Balhar <jakub@balhar.net>

* Fix the default in shell.

Signed-off-by: Jakub Balhar <jakub@balhar.net>

---------

Signed-off-by: Jakub Balhar <jakub@balhar.net>
(cherry picked from commit b4146be)

* feat: include OIDC JWKSet in the gateway JWKs (#3499)

* use the same JWK format, include OIDC keys in the response

Signed-off-by: achmelo <a.chmelo@gmail.com>

* cleanup, update tests

Signed-off-by: achmelo <a.chmelo@gmail.com>

* integration test for local validation

Signed-off-by: achmelo <a.chmelo@gmail.com>

* set default ssl factory

Signed-off-by: achmelo <a.chmelo@gmail.com>

* change debug message

Signed-off-by: achmelo <a.chmelo@gmail.com>

* test coverage

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>

(cherry picked from commit a588a8f)
Signed-off-by: achmelo <a.chmelo@gmail.com>

* feat: forward valid OIDC token to southbound service in case of distributed ID is not mapped (#3497)

* forward token and message in case of missing mapping

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* fix test

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* add unit test

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* small refactoring

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* updating integration tests

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* add test

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* add exception to the error handler to return correct response code

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* fix styles

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
Co-authored-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit 60777c1)

* fix: check for nullpointer exception when jwk key can't be retrieved (#3503)

* check for nullpointer ex when jwk key can't be retrieved

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* add test

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

* address comment

Signed-off-by: at670475 <andrea.tabone@broadcom.com>

---------

Signed-off-by: at670475 <andrea.tabone@broadcom.com>
(cherry picked from commit 7c00dba)

* revert

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use current methods

Signed-off-by: achmelo <a.chmelo@gmail.com>

* feat: Move OIDC access token from cookie to special header (#3513)

* POC

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* fix

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* replace old constructors

Signed-off-by: achmelo <a.chmelo@gmail.com>

* update IT

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* update IT

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix IT

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* exception handler for no MF ID, unit test

Signed-off-by: achmelo <a.chmelo@gmail.com>

* unit tests for request modification

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* license

Signed-off-by: achmelo <a.chmelo@gmail.com>

* minor changes

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* lowercase header

Signed-off-by: achmelo <a.chmelo@gmail.com>

* remove import

Signed-off-by: achmelo <a.chmelo@gmail.com>

* remove authorization header from httpservletrequest

Signed-off-by: achmelo <a.chmelo@gmail.com>

* test no ID and invalid token

Signed-off-by: achmelo <a.chmelo@gmail.com>

* ignore cookies if auth cookie only remains

Signed-off-by: achmelo <a.chmelo@gmail.com>

* expect no cookie in request

Signed-off-by: achmelo <a.chmelo@gmail.com>

* fix sonar

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

---------

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Signed-off-by: achmelo <a.chmelo@gmail.com>
Co-authored-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit 6248308)

* url without default

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same jwk uri

Signed-off-by: achmelo <a.chmelo@gmail.com>

* attempt to fix IT

Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>

* Revert "attempt to fix IT"

This reverts commit cf35400.

* use keyLocator for JWK set

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
Signed-off-by: Pavel Jares <Pavel.Jares@broadcom.com>
Co-authored-by: Andrea Tabone <39694626+taban03@users.noreply.github.com>
Co-authored-by: Jakub Balhar <jakub@balhar.net>
Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
Co-authored-by: Pavel Jares <Pavel.Jares@broadcom.com>
achmelo added a commit that referenced this pull request May 27, 2024
* fix: allow key exchange port configuration (#3453)

* allow key exchange port configuration

Signed-off-by: achmelo <a.chmelo@gmail.com>

* explain different defaults for the port

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same default port number

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit d82322e)

* configure external protocol from zowe yaml

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
pj892031 pushed a commit that referenced this pull request May 27, 2024
* fix: allow key exchange port configuration (#3453)

* allow key exchange port configuration

Signed-off-by: achmelo <a.chmelo@gmail.com>

* explain different defaults for the port

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same default port number

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit d82322e)

* configure external protocol from zowe yaml

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
achmelo added a commit that referenced this pull request Jun 10, 2024
* fix: allow key exchange port configuration (#3453)

* allow key exchange port configuration

Signed-off-by: achmelo <a.chmelo@gmail.com>

* explain different defaults for the port

Signed-off-by: achmelo <a.chmelo@gmail.com>

* use the same default port number

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
(cherry picked from commit d82322e)

* convert App to function

Signed-off-by: achmelo <a.chmelo@gmail.com>

---------

Signed-off-by: achmelo <a.chmelo@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants