From f7b7aab4fe6a88f3d284323b066eebb6f3fd94b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 08:44:56 +0100 Subject: [PATCH] Bump bouncycastle.version from 1.76 to 1.77 (#551) * Bump bouncycastle.version from 1.76 to 1.77 Bumps `bouncycastle.version` from 1.76 to 1.77. Updates `org.bouncycastle:bcpkix-jdk18on` from 1.76 to 1.77 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcprov-jdk18on` from 1.76 to 1.77 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../logic/oidc/NoOpSessionLogoutHandler.java | 46 ------------------- .../core/logic/oidc/OIDCClientCache.java | 1 - .../logic/saml2/NoOpSessionLogoutHandler.java | 46 ------------------- .../core/logic/saml2/SAML2ClientCache.java | 1 - pom.xml | 2 +- .../apache/syncope/sra/SecurityConfig.java | 2 - .../pac4j/NoOpSessionLogoutHandler.java | 46 ------------------- 7 files changed, 1 insertion(+), 143 deletions(-) delete mode 100644 ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/NoOpSessionLogoutHandler.java delete mode 100644 ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionLogoutHandler.java delete mode 100644 sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionLogoutHandler.java diff --git a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/NoOpSessionLogoutHandler.java b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/NoOpSessionLogoutHandler.java deleted file mode 100644 index 14f73fa138..0000000000 --- a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/NoOpSessionLogoutHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.syncope.core.logic.oidc; - -import java.util.Optional; -import org.pac4j.core.context.CallContext; -import org.pac4j.core.logout.handler.SessionLogoutHandler; - -public class NoOpSessionLogoutHandler implements SessionLogoutHandler { - - @Override - public void recordSession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void destroySession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void renewSession(final CallContext ctx, final String oldSessionId) { - // nothing to do - } - - @Override - public Optional cleanRecord(final String sessionId) { - return Optional.empty(); - } -} diff --git a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java index d4a87f8097..4799bdc549 100644 --- a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java +++ b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java @@ -112,7 +112,6 @@ public OidcClient add(final OIDCC4UIProvider op, final String callbackUrl) { client.setName(op.getName()); client.setCallbackUrlResolver(new NoParameterCallbackUrlResolver()); client.setCallbackUrl(callbackUrl); - client.getConfig().setSessionLogoutHandler(new NoOpSessionLogoutHandler()); client.init(); cache.add(client); diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionLogoutHandler.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionLogoutHandler.java deleted file mode 100644 index d79f624ef5..0000000000 --- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionLogoutHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.syncope.core.logic.saml2; - -import java.util.Optional; -import org.pac4j.core.context.CallContext; -import org.pac4j.core.logout.handler.SessionLogoutHandler; - -public class NoOpSessionLogoutHandler implements SessionLogoutHandler { - - @Override - public void recordSession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void destroySession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void renewSession(final CallContext ctx, final String oldSessionId) { - // nothing to do - } - - @Override - public Optional cleanRecord(final String sessionId) { - return Optional.empty(); - } -} diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java index 65ce4952e6..bbab15e69c 100644 --- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java +++ b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java @@ -134,7 +134,6 @@ public SAML2Client add( SAML2Client saml2Client = new SAML2Client(cfg); saml2Client.setCallbackUrlResolver(new NoParameterCallbackUrlResolver()); saml2Client.setCallbackUrl(callbackUrl); - saml2Client.getConfig().setSessionLogoutHandler(new NoOpSessionLogoutHandler()); saml2Client.init(); cache.add(saml2Client); diff --git a/pom.xml b/pom.xml index 8f7d4f1f80..c1c7fe89dd 100644 --- a/pom.xml +++ b/pom.xml @@ -410,7 +410,7 @@ under the License. 0.5 4.0.3 - 1.76 + 1.77 9.37.1 3.2.0-RC2 diff --git a/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java b/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java index 1543cda469..604c3ce3a2 100644 --- a/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java +++ b/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java @@ -33,7 +33,6 @@ import org.apache.syncope.sra.security.PublicRouteMatcher; import org.apache.syncope.sra.security.cas.CASSecurityConfigUtils; import org.apache.syncope.sra.security.oauth2.OAuth2SecurityConfigUtils; -import org.apache.syncope.sra.security.pac4j.NoOpSessionLogoutHandler; import org.apache.syncope.sra.security.saml2.SAML2MetadataEndpoint; import org.apache.syncope.sra.security.saml2.SAML2SecurityConfigUtils; import org.apache.syncope.sra.security.saml2.SAML2WebSsoAuthenticationWebFilter; @@ -295,7 +294,6 @@ public InputStream retrieve() throws Exception { saml2Client.setCallbackUrl(props.getSaml2().getEntityId() + SAML2WebSsoAuthenticationWebFilter.FILTER_PROCESSES_URI); saml2Client.setCallbackUrlResolver(new NoParameterCallbackUrlResolver()); - saml2Client.getConfig().setSessionLogoutHandler(new NoOpSessionLogoutHandler()); saml2Client.init(); return saml2Client; diff --git a/sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionLogoutHandler.java b/sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionLogoutHandler.java deleted file mode 100644 index 0d086e73e3..0000000000 --- a/sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionLogoutHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.syncope.sra.security.pac4j; - -import java.util.Optional; -import org.pac4j.core.context.CallContext; -import org.pac4j.core.logout.handler.SessionLogoutHandler; - -public class NoOpSessionLogoutHandler implements SessionLogoutHandler { - - @Override - public void recordSession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void destroySession(final CallContext ctx, final String key) { - // nothing to do - } - - @Override - public void renewSession(final CallContext ctx, final String oldSessionId) { - // nothing to do - } - - @Override - public Optional cleanRecord(final String sessionId) { - return Optional.empty(); - } -}