georchestra · pmauduit · Apr 24, 2024 · Oct 28, 2022 · Oct 28, 2022 · Mar 29, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
           check-latest: true
 
       - name: build the exploded CAS webapp

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetty:9.4-jre11
+FROM jetty:9.4-jre17
 
 LABEL "Organization"="geOrchestra"
 LABEL "Description"="CAS server webapp"

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ $ ./gradlew explodeWarOnly
 Then Build a docker image using:
 
 ```
-$ docker build -t georchestra/cas:6.3 .
+$ docker build -t georchestra/cas:6.6 .
 ```
 
 Contrary to upstream, we don't make use of the jib gradle plugin to build the docker image.

diff --git a/gradle.properties b/gradle.properties
@@ -1,27 +1,27 @@
 # Versions
-cas.version=6.3.7.4
-springBootVersion=2.4.5
+cas.version=6.6.15
+springBootVersion=2.7.3
 
 # Use -jetty, -undertow to other containers
 # Or blank if you want to deploy to an external container
 appServer=
 executable=false
 
-tomcatVersion=9.0.45
+tomcatVersion=9.0.84
 
 org.gradle.dependency.verification.console=verbose
 
 group=org.apereo.cas
 sourceCompatibility=11
-targetCompatibility=11
+targetCompatibility=17
 
 
 # Location of the downloaded CAS shell JAR
 shellDir=build/libs
-ivyVersion=2.4.0
+ivyVersion=2.5.0
 gradleDownloadTaskVersion=4.1.1
-gradleMavenPluginVersion=5.2.1
-gradleLombokPluginVersion=5.2.1
+gradleMavenPluginVersion=6.3.0
+gradleLombokPluginVersion=6.3.0
 
 baseDockerImage=jetty:9.4-jre11
 allowInsecureRegistries=false

diff --git a/gradle/springboot.gradle b/gradle/springboot.gradle
@@ -58,7 +58,7 @@ bootRun {
 
 springBoot {
     buildInfo()
-    mainClassName = "org.apereo.cas.web.CasWebApplication"
+    mainClass = "org.apereo.cas.web.CasWebApplication"
 }
 
 bootBuildImage {
@@ -75,7 +75,6 @@ bootWar {
     }
     archiveName "${casWebApplicationBinaryName}"
     baseName "cas"
-    excludeDevtools = false
 
     entryCompression = ZipEntryCompression.STORED
     /*

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/georchestra.properties b/src/main/resources/georchestra.properties
@@ -1,3 +1,3 @@
 cas.standard.css.file=/themes/georchestra/css/cas.css
 cas.standard.js.file=/themes/georchestra/js/cas.js
-                    
+cas.favicon.file=/themes/georchestra/favicon.ico
diff --git a/src/main/resources/static/themes/georchestra/favicon.ico b/src/main/resources/static/themes/georchestra/favicon.ico
diff --git a/...es/georchestra/casGenericSuccessView.html → ...rchestra/login/casGenericSuccessView.html b/...es/georchestra/casGenericSuccessView.html → ...rchestra/login/casGenericSuccessView.html
diff --git a/src/main/resources/templates/georchestra/login/casLoginView.html b/src/main/resources/templates/georchestra/login/casLoginView.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
+
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+
+    <title th:text="#{cas.login.pagetitle}">CAS Login View</title>
+    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
+
+</head>
+
+<body class="login mdc-typography">
+<div layout:fragment="content" class="d-flex justify-content-center">
+    <div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content card"
+         th:with="loginFormEnabled=${#strings.defaultString(#themes.code('cas.login-form.enabled'), 'true') == 'true'},
+                  loginFormViewable=${@casThymeleafLoginFormDirector.isLoginFormViewable(#vars)}">
+        <section id="loginForm"
+                 th:if="${loginFormViewable and loginFormEnabled}"
+                 class="login-section login-form card-body">
+            <div th:replace="fragments/loginform :: loginform">
+                <a href="../fragments/loginform.html">Login Form goes here</a>
+            </div>
+        </section>
+        <span th:if="${#bools.isFalse(delegatedAuthenticationDynamicProviderSelection) && #bools.isFalse(delegatedAuthenticationDisabled)}">
+            <section id="loginProviders" class="login-section login-providers card-body"
+                     th:if="${delegatedAuthenticationProviderConfigurations} OR ${wsfedUrls}">
+                <div th:replace="fragments/loginProviders :: loginProviders">
+                    <a href="fragments/loginProviders.html">loginProviders</a>
+                </div>
+            </section>
+        </span>
+        <section id="acceptto" class="login-section login-qr d-xs-none d-md-block" th:if="${accepttoApplicationId}">
+            <div th:replace="fragments/accepttoQRCode :: accepttoQRCode">
+                <a href="fragments/accepttoQRCode.html">accepttoQRCode</a>
+            </div>
+        </section>
+        <section id="qrlogin" class="login-section login-qr d-xs-none d-md-block card-body" th:if="${qrAuthenticationEnabled}">
+            <div th:replace="fragments/qrAuthentication :: qrAuthentication">
+                <a href="fragments/qrAuthentication.html">qrAuthentication</a>
+            </div>
+        </section>
+    </div>
+</div>
+</body>
+
+</html>
diff --git a/.../templates/georchestra/casLogoutView.html → ...tes/georchestra/logout/casLogoutView.html b/.../templates/georchestra/casLogoutView.html → ...tes/georchestra/logout/casLogoutView.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{georchestra/layout}">
+<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
@@ -12,18 +12,19 @@
 <body>
 <main role="main" class="container mt-3 mb-3">
     <div layout:fragment="content">
-        <div class="w-50 m-auto mdc-card card p-4">
-            <div class="card-body">
+        <div class="w-100 m-auto mdc-card card p-4">
+            <div id="logoutBody" class="card-body">
                 <h2 class="banner-heading">
                     <i class="mdi mdi-logout fas fa-sign-out-alt"></i>
                     <span th:utext="#{screen.logout.header}">Log Out Successful</span>
                 </h2>
 
-                <p class="banner-message" th:utext="#{screen.logout.success}">You have successfully logged out of the Central Authentication
-                    Service. You may <a href="/?login">log in</a> again.</p>
+                <p id="logoutMessage" class="banner-message" th:utext="#{screen.logout.success}">You have successfully logged out of the Central Authentication
+                    Service. You may <a href="login">log in</a> again.</p>
+                <p class="banner-message" th:utext="#{screen.logout.security}">For security reasons, exit your web browser.</p>
             </div>
         </div>
     </div>
 </main>
 </body>
-</html>
+</html>