This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_1_X by this push:
new 8abdcbd817 Upgrading Swagger Core
8abdcbd817 is described below
commit 8abdcbd817066f63421b9aecddfd9e2c109d0b12
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Aug 31 11:27:49 2026 +0200
Upgrading Swagger Core
---
.../org/apache/syncope/client/ui/commons/pages/BaseLogin.java | 6 ++++++
.../java/org/apache/syncope/client/console/pages/Login.java | 4 ----
.../apache/syncope/client/console/pages/OIDCClientLogin.java | 10 +++++-----
.../apache/syncope/client/enduser/pages/OIDCClientLogin.java | 10 +++++-----
.../org/apache/syncope/client/console/pages/SAML2SPLogin.java | 10 +++++-----
.../org/apache/syncope/client/enduser/pages/SAML2SPLogin.java | 10 +++++-----
pom.xml | 2 +-
7 files changed, 27 insertions(+), 25 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
index 15d2785ffb..20e5448b0d 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/pages/BaseLogin.java
@@ -42,6 +42,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebPage;
@@ -111,6 +112,11 @@ public abstract class BaseLogin extends WebPage {
public BaseLogin(final PageParameters parameters) {
super(parameters);
+
+ if (AuthenticatedWebSession.get().isSignedIn()) {
+ AuthenticatedWebSession.get().invalidate();
+ }
+
setStatelessHint(true);
notificationPanel = new NotificationPanel(Constants.FEEDBACK);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
index 7768c2ae11..dee5257909 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
@@ -28,7 +28,6 @@ import org.apache.syncope.client.ui.commons.pages.BaseLogin;
import org.apache.syncope.client.ui.commons.pages.BaseMfaEnroll;
import org.apache.syncope.client.ui.commons.panels.BaseSSOLoginFormPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -72,8 +71,6 @@ public class Login extends BaseLogin {
throw new NotAuthorizedException("Illegal username");
}
- IAuthenticationStrategy strategy =
getApplication().getSecuritySettings().getAuthenticationStrategy();
-
if (AuthenticatedWebSession.get().signIn(username, password)) {
// If login has been called because the user was not yet logged
in, than continue to the
// original destination, otherwise to the Home page
@@ -83,6 +80,5 @@ public class Login extends BaseLogin {
SyncopeConsoleSession.get().error(getString("login-error"));
notificationPanel.refresh(target);
}
- strategy.remove();
}
}
diff --git
a/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
b/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
index b50ca1ca6a..22b081fbbc 100644
---
a/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
+++
b/ext/oidcc4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.panels.OIDCC4UIConstants;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.slf4j.Logger;
@@ -41,6 +41,10 @@ public class OIDCClientLogin extends WebPage {
public OIDCClientLogin(final PageParameters parameters) {
super(parameters);
+ if (AuthenticatedWebSession.get().isSignedIn()) {
+ AuthenticatedWebSession.get().invalidate();
+ }
+
String jwt =
parameters.get(OIDCC4UIConstants.OIDCC4UI_JWT).toOptionalString();
Instant jwtExpiration =
parameters.get(OIDCC4UIConstants.OIDCC4UI_JWT_EXPIRATION).toOptional(Instant.class);
if (StringUtils.isBlank(jwt)) {
@@ -52,8 +56,6 @@ public class OIDCClientLogin extends WebPage {
setResponsePage(Login.class, loginParameters);
}
- IAuthenticationStrategy strategy =
getApplication().getSecuritySettings().getAuthenticationStrategy();
-
if (SyncopeConsoleSession.get().authenticate(jwt, jwtExpiration)) {
if
(parameters.get(OIDCC4UIConstants.OIDCC4UI_SLO_SUPPORTED).toBoolean(false)) {
SyncopeConsoleSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE,
OIDCClientBeforeLogout.class);
@@ -69,7 +71,5 @@ public class OIDCClientLogin extends WebPage {
loginParameters.add(Constants.NOTIFICATION_LEVEL_PARAM,
Notification.ERROR);
setResponsePage(Login.class, loginParameters);
}
-
- strategy.remove();
}
}
diff --git
a/ext/oidcc4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/OIDCClientLogin.java
b/ext/oidcc4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/OIDCClientLogin.java
index 89f801a4ba..67c70f81f5 100644
---
a/ext/oidcc4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/OIDCClientLogin.java
+++
b/ext/oidcc4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/OIDCClientLogin.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.panels.OIDCC4UIConstants;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.slf4j.Logger;
@@ -41,6 +41,10 @@ public class OIDCClientLogin extends WebPage {
public OIDCClientLogin(final PageParameters parameters) {
super(parameters);
+ if (AuthenticatedWebSession.get().isSignedIn()) {
+ AuthenticatedWebSession.get().invalidate();
+ }
+
String jwt =
parameters.get(OIDCC4UIConstants.OIDCC4UI_JWT).toOptionalString();
Instant jwtExpiration =
parameters.get(OIDCC4UIConstants.OIDCC4UI_JWT_EXPIRATION).toOptional(Instant.class);
if (StringUtils.isBlank(jwt)) {
@@ -52,8 +56,6 @@ public class OIDCClientLogin extends WebPage {
setResponsePage(Login.class, loginParameters);
}
- IAuthenticationStrategy strategy =
getApplication().getSecuritySettings().getAuthenticationStrategy();
-
if (SyncopeEnduserSession.get().authenticate(jwt, jwtExpiration)) {
if
(parameters.get(OIDCC4UIConstants.OIDCC4UI_SLO_SUPPORTED).toBoolean(false)) {
SyncopeEnduserSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE,
OIDCClientBeforeLogout.class);
@@ -71,7 +73,5 @@ public class OIDCClientLogin extends WebPage {
loginParameters.add(Constants.NOTIFICATION_LEVEL_PARAM,
Notification.ERROR);
setResponsePage(Login.class, loginParameters);
}
-
- strategy.remove();
}
}
diff --git
a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
index 9a10c973ee..2755c491a2 100644
---
a/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
+++
b/ext/saml2sp4ui/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.slf4j.Logger;
@@ -41,6 +41,10 @@ public class SAML2SPLogin extends WebPage {
public SAML2SPLogin(final PageParameters parameters) {
super(parameters);
+ if (AuthenticatedWebSession.get().isSignedIn()) {
+ AuthenticatedWebSession.get().invalidate();
+ }
+
String jwt =
parameters.get(SAML2SP4UIConstants.SAML2SP4UI_JWT).toOptionalString();
Instant jwtExpiration =
parameters.get(SAML2SP4UIConstants.SAML2SP4UI_JWT_EXPIRATION).toOptional(Instant.class);
if (StringUtils.isBlank(jwt)) {
@@ -52,8 +56,6 @@ public class SAML2SPLogin extends WebPage {
setResponsePage(Login.class, loginParameters);
}
- IAuthenticationStrategy strategy =
getApplication().getSecuritySettings().getAuthenticationStrategy();
-
if (SyncopeConsoleSession.get().authenticate(jwt, jwtExpiration)) {
if
(parameters.get(SAML2SP4UIConstants.SAML2SP4UI_SLO_SUPPORTED).toBoolean(false))
{
SyncopeConsoleSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE,
SAML2SPBeforeLogout.class);
@@ -69,7 +71,5 @@ public class SAML2SPLogin extends WebPage {
loginParameters.add(Constants.NOTIFICATION_LEVEL_PARAM,
Notification.ERROR);
setResponsePage(Login.class, loginParameters);
}
-
- strategy.remove();
}
}
diff --git
a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/SAML2SPLogin.java
b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/SAML2SPLogin.java
index 7ab88953b2..eed59d83bc 100644
---
a/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/SAML2SPLogin.java
+++
b/ext/saml2sp4ui/client-enduser/src/main/java/org/apache/syncope/client/enduser/pages/SAML2SPLogin.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.enduser.SyncopeEnduserSession;
import org.apache.syncope.client.ui.commons.Constants;
import org.apache.syncope.client.ui.commons.SAML2SP4UIConstants;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.slf4j.Logger;
@@ -41,6 +41,10 @@ public class SAML2SPLogin extends WebPage {
public SAML2SPLogin(final PageParameters parameters) {
super(parameters);
+ if (AuthenticatedWebSession.get().isSignedIn()) {
+ AuthenticatedWebSession.get().invalidate();
+ }
+
String jwt =
parameters.get(SAML2SP4UIConstants.SAML2SP4UI_JWT).toOptionalString();
Instant jwtExpiration =
parameters.get(SAML2SP4UIConstants.SAML2SP4UI_JWT_EXPIRATION).toOptional(Instant.class);
if (StringUtils.isBlank(jwt)) {
@@ -52,8 +56,6 @@ public class SAML2SPLogin extends WebPage {
setResponsePage(Login.class, loginParameters);
}
- IAuthenticationStrategy strategy =
getApplication().getSecuritySettings().getAuthenticationStrategy();
-
if (SyncopeEnduserSession.get().authenticate(jwt, jwtExpiration)) {
if
(parameters.get(SAML2SP4UIConstants.SAML2SP4UI_SLO_SUPPORTED).toBoolean(false))
{
SyncopeEnduserSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE,
SAML2SPBeforeLogout.class);
@@ -71,7 +73,5 @@ public class SAML2SPLogin extends WebPage {
loginParameters.add(Constants.NOTIFICATION_LEVEL_PARAM,
Notification.ERROR);
setResponsePage(Login.class, loginParameters);
}
-
- strategy.remove();
}
}
diff --git a/pom.xml b/pom.xml
index f4d0f8a4c9..1a04c4a3cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,7 +470,7 @@ under the License.
<cas.version>7.3.8.2</cas.version>
<cas-client.version>4.1.1</cas-client.version>
- <swagger-core.version>2.2.54</swagger-core.version>
+ <swagger-core.version>2.2.55</swagger-core.version>
<swagger-ui.version>5.32.14</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
