smolnar82 commented on code in PR #797:
URL: https://github.com/apache/knox/pull/797#discussion_r1342884637
##########
gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java:
##########
@@ -188,8 +194,25 @@ private void sendRedirectToLoginURL(HttpServletRequest
request, HttpServletRespo
}
@Override
- protected void handleValidationError(HttpServletRequest request,
HttpServletResponse response,
- int status, String error) throws
IOException {
+ protected void handleValidationError(HttpServletRequest request,
HttpServletResponse response, int status, String error) throws IOException {
+ if (error != null && error.startsWith("Token") &&
error.endsWith("disabled")) {
+ LOGGER.invalidSsoCookie();
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ removeAuthenticationToken(request, response);
+
SessionInvalidators.KNOX_SSO_INVALIDATOR.getSessionInvalidators().forEach(sessionInvalidator
-> {
+ sessionInvalidator.onAuthenticationError(request, response);
+ });
+ final boolean doGlobalLogout = request.getAttribute("doGlobalLogout") ==
null ? false
Review Comment:
Fixed.
##########
gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateService.java:
##########
@@ -224,6 +224,20 @@ protected void evictExpiredTokens() {
} catch (SQLException e) {
log.errorRemovingTokensFromDatabase(e.getMessage(), e);
}
+
+ //removing disabled KnoxSSO cookies since they are no longer needed
+ try {
+ final Set<String> disabledKnoxSsoCookies =
tokenDatabase.getDisabledKnoxSsoCookies();
+ if (!disabledKnoxSsoCookies.isEmpty()) {
+
log.removingDisabledKnoxSsoCookiesFromDatabase(disabledKnoxSsoCookies.size(),
+ String.join(", ", disabledKnoxSsoCookies.stream().map(tokenId ->
Tokens.getTokenIDDisplayText(tokenId)).collect(Collectors.toSet())));
+ for (String tokenId : disabledKnoxSsoCookies) {
Review Comment:
Fixed.
##########
gateway-spi/src/main/java/org/apache/knox/gateway/session/SessionInvalidators.java:
##########
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.knox.gateway.session;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public enum SessionInvalidators {
+
+ KNOX_SSO_INVALIDATOR;
+
+ private final Set<SessionInvalidator> sessionInvalidators = new HashSet<>();
+
+ public void registerSessionInvalidator(SessionInvalidator
sessionInvalidator) {
Review Comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
