Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' into bugfix/v2/multiple-discovery
Browse files Browse the repository at this point in the history
Signed-off-by: 1000TurquoisePogs <[email protected]>
  • Loading branch information
1000TurquoisePogs authored Jan 9, 2024
2 parents 15eca84 + 565283d commit 33d0e55
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ All notable changes to the Zlux Server Framework package will be documented in t
This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.

## 2.14.0
- Bugfix: App-server would not correctly detect when it was running in a high-availability configuration environment.
- Bugfix: App-server could not load when multiple discovery servers were present and the app-server was unable to reach the first one specified. Now, the app-server will iterate through the list of servers until an accessible one is reached.

- Bugfix: App-server could not load when multiple discovery servers were present and the app-server was unable to reach the first one specified. Now, the app-server will iterate through the list of servers until an accessible one is reached. (#522)
- Bugfix: App-server would not correctly detect when it was running in a high-availability configuration environment. (#521)
- Bugfix: A call to GET /plugins would trigger an authorization check regardless of if rbac was set on or off (#523)

## 2.13.0
- Added support for using zowe.network and components.app-server.zowe.network to set listener IP and TLS properties including max and min version, ciphers, and ECDH curves. (#511)
- Enhanced cipher customization to allow for ciphers to be specified in IANA format in addition to the existing OpenSSL format. (#511)
Expand Down
2 changes: 1 addition & 1 deletion lib/webauth.js
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ module.exports = function(authManager, cookieIdentifier, isSecurePort) {
authLogger.debug(`${req.session.id}: Initiating isAuthorized check with ${handler.pluginID}`);
result = yield handler.authorized(req, authPluginSession, {
syncOnly: isWebsocket,
bypassAuthorizatonCheck: !authManager.isRbacEnabled
bypassAuthorizatonCheck: !authManager.isRbacEnabled()
});
next();
return;
Expand Down

0 comments on commit 33d0e55

Please sign in to comment.