Skip to content

Commit

Permalink
deps: update cas to 7.1.0
Browse files Browse the repository at this point in the history
Changement de la cas.tgc.crypto.encryption.key car la taille par défaut est passée de 256 à 512 octets
Suppression de la modification du RedisTicketRegistry car fixé dans le code de CAS de base
  • Loading branch information
nathancailbourdin committed Sep 12, 2024
1 parent c9fb430 commit a638b02
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 831 deletions.
21 changes: 9 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ This CAS server uses the following modules :
- **cas-server-support-pac4j-webflow** to enable delegated authentication

And has a number of custom enhancements :
- Bugfix for the redis ticket registry (metaspace leak, see this [commit](https://github.com/GIP-RECIA/cas-war-overlay/commit/3d5f61cdf4edcece7cf2c6ced70f1203f689b246))
- CI pipeline with end-to-end tests using **puppeteer** and **docker**
- Multidomain and dynamic redirection on a specific domain
- Time and attribute service access strategy chaining
- Dynamic API call during attribute release (externalid)
- Soft/Hard timeout expiration policy **per service**

Current CAS Base version : **7.0.7**
Current CAS Base version : **7.1.0**

# Project Structure

Expand Down Expand Up @@ -64,20 +63,18 @@ All the important parts of the project are listed below:
│ │ └── apereo
│ │ └── cas
│ │ ├── config
│ │ │ ├── CustomInterruptConfiguration.java
│ │ │ └── RedisTicketRegistryConfiguration.java
│ │ │ └── CustomInterruptConfiguration.java
│ │ ├── interrupt
│ │ │ └── DomainChangeInterruptInquirer.java
│ │ ├── services
│ │ │ ├── HardAndSoftTimeoutRegisteredServiceTicketGrantingTicketExpirationPolicy
│ │ │ ├── ReturnExternalIDAttributeReleasePolicy.java
│ │ │ └── TimeBasedRegisteredServiceAccessStrategy.java
│ │ └── ticket
│ │ └── RedisTicketRegistry.java
│ │ └── services
│ │ ├── HardAndSoftTimeoutRegisteredServiceTicketGrantingTicketExpirationPolicy
│ │ ├── ReturnExternalIDAttributeReleasePolicy.java
│ │ └── TimeBasedRegisteredServiceAccessStrategy.java
| |
| └── resources
| ├── META-INF
| └── spring
| └── org.springframework.boot.autoconfigure.AutoConfiguration.imports
| | └── spring
| | └── org.springframework.boot.autoconfigure.AutoConfiguration.imports
| ├── application-test.yml
| └── application.yml
|
Expand Down
12 changes: 3 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -307,17 +307,11 @@ dependencies {
// Custom interrupt
compileOnly "org.apereo.cas:cas-server-support-interrupt-core"
compileOnly "org.apereo.cas:cas-server-support-interrupt-api"
// Custom redis ticket registry
compileOnly "org.apereo.cas:cas-server-core-util-api"
compileOnly "org.apereo.cas:cas-server-support-redis-core"
compileOnly "org.apereo.cas:cas-server-core-authentication-api"
compileOnly "org.apereo.cas:cas-server-core-tickets-api"
compileOnly "org.springframework.data:spring-data-redis"
compileOnly "org.springframework.integration:spring-integration-redis"
compileOnly "com.redis:lettucemod"
// Custom TimeBasedRegisteredServiceAccessStrategy
compileOnly "org.apereo.cas:cas-server-core-services-api"
compileOnly "org.apereo.cas:cas-server-core-util-api"
// Custom ReturnExternalIDAttributeReleasePolicy
compileOnly "org.apereo.cas:cas-server-core-authentication-attributes"

// Custom HardSoftTimeoutExpirationPolicy
compileOnly "org.apereo.cas:cas-server-core-tickets-api"
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This overlay project's version
# For consistency and with no other effect, this is set to the CAS version itself.
version=7.0.7
version=7.1.0

# This is the CAS server version that will be deployed.
# Versions typically are in the format of:
# [Major].[Minor].[Patch].[Security]
# For patch and security releases and unless explicitly stated otherwise, the below property
# and NOTHING ELSE is the only change you usually need to make to upgrade your CAS deployment.
cas.version=7.0.7
cas.version=7.1.0

# The Spring Boot version is very much tied to the CAS release 7.0.7
# The Spring Boot version is very much tied to the CAS release 7.1.0
# and must not be modified or upgraded out of band, as doing so would most likely
# jeopardize the stability of your CAS deployment leading to unpredictable behavior.
springBootVersion=3.2.1
springBootVersion=3.3.3

# The coordinates of this overlay project
group=org.apereo.cas
Expand Down
2 changes: 1 addition & 1 deletion puppeteer/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ echo "Cleaning last deployment..."
casGradlePropertiesFile="${ROOT_DIRECTORY}/gradle.properties"
if grep -q 'appServer=' "$casGradlePropertiesFile"; then
echo "Replacing 'appServer=' with 'appServer=-tomcat' in $casGradlePropertiesFile"
sed -i 's/appServer=/appServer=-tomcat/' "$casGradlePropertiesFile"
sed -i '/^appServer=/c\appServer=-tomcat' "$casGradlePropertiesFile"
else
echo "'appServer=' not found or already replaced in $casGradlePropertiesFile"
fi
Expand Down
Loading

0 comments on commit a638b02

Please sign in to comment.