Skip to content

Commit f00d53a

Browse files
committed
WA: following CAS 7.3 deprecations
1 parent 76e8eab commit f00d53a

File tree

4 files changed

+22
-92
lines changed

4 files changed

+22
-92
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,7 @@ under the License.
18531853
<plugin>
18541854
<groupId>io.fabric8</groupId>
18551855
<artifactId>docker-maven-plugin</artifactId>
1856-
<version>0.48.0</version>
1856+
<version>0.48.1</version>
18571857
</plugin>
18581858

18591859
<plugin>

wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/mapping/AuthModulePropertySourceMapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.apache.syncope.common.lib.types.AuthModuleState;
5252
import org.apache.syncope.wa.bootstrap.WARestClient;
5353
import org.apereo.cas.configuration.model.core.authentication.AuthenticationHandlerStates;
54+
import org.apereo.cas.configuration.model.core.web.session.SessionStorageTypes;
5455
import org.apereo.cas.configuration.model.support.azuread.AzureActiveDirectoryAuthenticationProperties;
5556
import org.apereo.cas.configuration.model.support.generic.AcceptAuthenticationProperties;
5657
import org.apereo.cas.configuration.model.support.jaas.JaasAuthenticationProperties;
@@ -467,6 +468,7 @@ public Map<String, Object> map(final AuthModuleTO authModuleTO, final DuoMfaAuth
467468
props.setDuoApiHost(conf.getApiHost());
468469
props.setDuoIntegrationKey(conf.getIntegrationKey());
469470
props.setDuoSecretKey(conf.getSecretKey());
471+
props.setSessionStorageType(SessionStorageTypes.HTTP);
470472

471473
return prefix("cas.authn.mfa.duo.", WAConfUtils.asMap(props));
472474
}

wa/starter/pom.xml

Lines changed: 15 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ under the License.
6767
<groupId>org.apereo.cas</groupId>
6868
<artifactId>cas-server-core-audit</artifactId>
6969
</dependency>
70+
<dependency>
71+
<groupId>org.apereo.cas</groupId>
72+
<artifactId>cas-server-core-audit-api</artifactId>
73+
</dependency>
7074
<dependency>
7175
<groupId>org.apereo.cas</groupId>
7276
<artifactId>cas-server-core-scripting</artifactId>
@@ -115,6 +119,10 @@ under the License.
115119
<groupId>org.apereo.cas</groupId>
116120
<artifactId>cas-server-core-tickets</artifactId>
117121
</dependency>
122+
<dependency>
123+
<groupId>org.apereo.cas</groupId>
124+
<artifactId>cas-server-support-session-ticket-registry</artifactId>
125+
</dependency>
118126
<dependency>
119127
<groupId>org.apereo.cas</groupId>
120128
<artifactId>cas-server-core-util</artifactId>
@@ -172,12 +180,6 @@ under the License.
172180
<dependency>
173181
<groupId>org.apereo.cas</groupId>
174182
<artifactId>cas-server-support-syncope-authentication</artifactId>
175-
<exclusions>
176-
<exclusion>
177-
<groupId>com.github.mmoayyed.cxf</groupId>
178-
<artifactId>cxf-rt-rs-extension-search</artifactId>
179-
</exclusion>
180-
</exclusions>
181183
</dependency>
182184
<dependency>
183185
<groupId>org.apereo.cas</groupId>
@@ -190,16 +192,6 @@ under the License.
190192
<dependency>
191193
<groupId>org.apereo.cas</groupId>
192194
<artifactId>cas-server-support-saml</artifactId>
193-
<exclusions>
194-
<exclusion>
195-
<groupId>org.bouncycastle</groupId>
196-
<artifactId>bcpkix-jdk15on</artifactId>
197-
</exclusion>
198-
<exclusion>
199-
<groupId>org.bouncycastle</groupId>
200-
<artifactId>bcprov-jdk15on</artifactId>
201-
</exclusion>
202-
</exclusions>
203195
</dependency>
204196
<dependency>
205197
<groupId>org.apereo.cas</groupId>
@@ -213,19 +205,9 @@ under the License.
213205
<groupId>org.apereo.cas</groupId>
214206
<artifactId>cas-server-support-themes-bootstrap</artifactId>
215207
</dependency>
216-
<dependency>
217-
<groupId>org.apereo.cas</groupId>
218-
<artifactId>cas-server-core-audit-api</artifactId>
219-
</dependency>
220208
<dependency>
221209
<groupId>org.apereo.cas</groupId>
222210
<artifactId>cas-server-support-saml-idp</artifactId>
223-
<exclusions>
224-
<exclusion>
225-
<groupId>com.google.code.findbugs</groupId>
226-
<artifactId>findbugs-annotations</artifactId>
227-
</exclusion>
228-
</exclusions>
229211
</dependency>
230212
<dependency>
231213
<groupId>org.apereo.cas</groupId>
@@ -234,36 +216,22 @@ under the License.
234216
<dependency>
235217
<groupId>org.apereo.cas</groupId>
236218
<artifactId>cas-server-support-oidc</artifactId>
237-
<exclusions>
238-
<exclusion>
239-
<groupId>org.bouncycastle</groupId>
240-
<artifactId>bcpkix-jdk15on</artifactId>
241-
</exclusion>
242-
<exclusion>
243-
<groupId>org.bouncycastle</groupId>
244-
<artifactId>bcprov-jdk15on</artifactId>
245-
</exclusion>
246-
<exclusion>
247-
<groupId>com.google.code.findbugs</groupId>
248-
<artifactId>findbugs-annotations</artifactId>
249-
</exclusion>
250-
</exclusions>
251219
</dependency>
252220
<dependency>
253221
<groupId>org.apereo.cas</groupId>
254222
<artifactId>cas-server-support-oidc-core-api</artifactId>
255223
</dependency>
256224
<dependency>
257225
<groupId>org.apereo.cas</groupId>
258-
<artifactId>cas-server-support-oauth-services</artifactId>
226+
<artifactId>cas-server-support-oidc-services</artifactId>
259227
</dependency>
260228
<dependency>
261229
<groupId>org.apereo.cas</groupId>
262-
<artifactId>cas-server-support-validation</artifactId>
230+
<artifactId>cas-server-support-oauth-services</artifactId>
263231
</dependency>
264232
<dependency>
265233
<groupId>org.apereo.cas</groupId>
266-
<artifactId>cas-server-support-pm-webflow</artifactId>
234+
<artifactId>cas-server-support-validation</artifactId>
267235
</dependency>
268236
<dependency>
269237
<groupId>org.apereo.cas</groupId>
@@ -284,42 +252,10 @@ under the License.
284252
<dependency>
285253
<groupId>org.apereo.cas</groupId>
286254
<artifactId>cas-server-support-webauthn</artifactId>
287-
<exclusions>
288-
<exclusion>
289-
<groupId>javax.ws.rs</groupId>
290-
<artifactId>javax.ws.rs-api</artifactId>
291-
</exclusion>
292-
<exclusion>
293-
<groupId>org.eclipse.jetty</groupId>
294-
<artifactId>jetty-servlet</artifactId>
295-
</exclusion>
296-
<exclusion>
297-
<groupId>org.glassfish.jersey.containers</groupId>
298-
<artifactId>jersey-container-servlet-core</artifactId>
299-
</exclusion>
300-
</exclusions>
301255
</dependency>
302256
<dependency>
303257
<groupId>org.apereo.cas</groupId>
304258
<artifactId>cas-server-support-webauthn-core</artifactId>
305-
<exclusions>
306-
<exclusion>
307-
<groupId>javax.ws.rs</groupId>
308-
<artifactId>javax.ws.rs-api</artifactId>
309-
</exclusion>
310-
<exclusion>
311-
<groupId>org.eclipse.jetty</groupId>
312-
<artifactId>jetty-servlet</artifactId>
313-
</exclusion>
314-
<exclusion>
315-
<groupId>org.glassfish.jersey.containers</groupId>
316-
<artifactId>jersey-container-servlet-core</artifactId>
317-
</exclusion>
318-
<exclusion>
319-
<groupId>com.google.code.findbugs</groupId>
320-
<artifactId>jsr305</artifactId>
321-
</exclusion>
322-
</exclusions>
323259
</dependency>
324260
<dependency>
325261
<groupId>org.apereo.cas</groupId>
@@ -361,10 +297,6 @@ under the License.
361297
<groupId>org.apereo.cas</groupId>
362298
<artifactId>cas-server-support-trusted-mfa-core</artifactId>
363299
</dependency>
364-
<dependency>
365-
<groupId>org.apereo.cas</groupId>
366-
<artifactId>cas-server-support-oidc-services</artifactId>
367-
</dependency>
368300
<dependency>
369301
<groupId>org.apereo.cas</groupId>
370302
<artifactId>cas-server-support-swagger</artifactId>
@@ -402,12 +334,6 @@ under the License.
402334
<dependency>
403335
<groupId>org.apereo.cas</groupId>
404336
<artifactId>cas-server-support-pac4j-oidc</artifactId>
405-
<exclusions>
406-
<exclusion>
407-
<groupId>com.google.code.findbugs</groupId>
408-
<artifactId>findbugs-annotations</artifactId>
409-
</exclusion>
410-
</exclusions>
411337
</dependency>
412338
<dependency>
413339
<groupId>org.pac4j</groupId>
@@ -418,6 +344,10 @@ under the License.
418344
<groupId>org.apereo.cas</groupId>
419345
<artifactId>cas-server-support-pm-core</artifactId>
420346
</dependency>
347+
<dependency>
348+
<groupId>org.apereo.cas</groupId>
349+
<artifactId>cas-server-support-pm-webflow</artifactId>
350+
</dependency>
421351
<dependency>
422352
<groupId>org.apereo.cas</groupId>
423353
<artifactId>cas-server-support-pm-ldap</artifactId>

wa/starter/src/main/resources/wa.properties

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,17 @@ cas.server.scope=syncope.apache.org
7777
cas.logout.follow-service-redirects=true
7878

7979
cas.authn.saml-idp.core.entity-id=${cas.server.prefix}/saml
80+
cas.authn.saml-idp.core.session-replication.replicate-sessions=false
81+
cas.authn.saml-idp.core.session-storage-type=HTTP
8082
cas.authn.saml-idp.metadata.http.metadata-backup-location=file:${syncope.conf.dir}/saml
8183

8284
cas.authn.oidc.core.issuer=${cas.server.prefix}/oidc
8385
cas.authn.oidc.discovery.id-token-signing-alg-values-supported=RS256,RS384,RS512,PS256,PS384,PS512,ES256,ES384,ES512,HS256,HS384,HS512
8486
cas.authn.oidc.discovery.user-info-signing-alg-values-supported=RS256,RS384,RS512,PS256,PS384,PS512,ES256,ES384,ES512,HS256,HS384,HS512
8587
cas.authn.oidc.discovery.scopes=openid,profile,email,address,phone,syncope
8688
cas.authn.oauth.core.user-profile-view-type=FLAT
89+
cas.authn.oauth.session-replication.replicate-sessions=false
90+
cas.authn.pac4j.core.session-replication.replicate-sessions=false
8791

8892
# Disable access to the login endpoint
8993
# if no target application is specified.
@@ -103,12 +107,6 @@ cas.authn.mfa.web-authn.core.application-id=https://localhost:8443
103107
cas.authn.mfa.web-authn.core.relying-party-name=Syncope
104108
cas.authn.mfa.web-authn.core.relying-party-id=syncope.apache.org
105109

106-
#
107-
cas.authn.pac4j.core.session-replication.replicate-sessions=true
108-
cas.authn.pac4j.core.session-replication.cookie.crypto.enabled=true
109-
cas.authn.oauth.session-replication.replicate-sessions=true
110-
cas.authn.oauth.session-replication.cookie.crypto.enabled=true
111-
112110
##
113111
# Default strategy for matching request paths against
114112
# registered Spring MVC handler mappings

0 commit comments

Comments
 (0)