Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading to CAS 6.6.15 #13

Merged
merged 7 commits into from
Apr 24, 2024
Merged

Upgrading to CAS 6.6.15 #13

merged 7 commits into from
Apr 24, 2024

Conversation

pmauduit
Copy link
Member

Tests:

  • gradle build ok
  • runtime: running the docker image fails, but launched without any datadir

To be tested more thoroughly, I'd expect that some UI adjustments / realign have to be made

@pmauduit
Copy link
Member Author

See georchestra/georchestra#3838

@pmauduit
Copy link
Member Author

pmauduit commented Oct 28, 2022

I'd expect that some UI adjustments / realign have to be made

v6.6 works in the master docker composition, but it will indeed require some CSS tweaks:

image

@pmauduit
Copy link
Member Author

Not ready for 23.0 IMHO

@fvanderbiest
Copy link
Member

OK, lets postpone it then.

@landryb
Copy link
Member

landryb commented Mar 28, 2024

last version from the same branch is now v6.6.15, and the 7.0 branch is at v7.0.2 ... something for the next codesprint ? or @f-necas can be tricked into looking into it ? ;)

@fvanderbiest
Copy link
Member

or @f-necas can be tricked into looking into it ? ;)

Err... he's very busy currently ;-)

pmauduit and others added 5 commits March 29, 2024 13:48
Tests:
* `gradle build` ok
* runtime fails, but launched without any datadir

To be tested more thoroughly, I'd expect that some UI adjustments /
realign have to be made
@landryb landryb force-pushed the upgrade-to-cas-6.6 branch from fb879f5 to a47cc55 Compare March 29, 2024 13:14
@landryb landryb changed the title Upgrading to CAS 6.6.1 Upgrading to CAS 6.6.15 Mar 29, 2024
@landryb
Copy link
Member

landryb commented Mar 29, 2024

with this updated PR, a cas 6.6.15 built with java 17 works fine in a tomcat running with java17, some properties have been renamed in config/cas.properties:

-cas.service-registry.initFromJson=false
+cas.service-registry.core.init-from-json=false

-cas.authn.oidc.jwks.jwks-file=file:///tmp/keystore.jwksdown
+cas.authn.oidc.jwks.file-system.jwks-file=file:///tmp/keystore.jwksdown

-cas.authn.saml-idp.core.entity-id=https://${FQDN}/idp
+cas.authn.saml-idp.core.entity-id=https://georchestra.dev.craig.fr/idp

-cas.authn.saml-idp.metadata.location=file:///tmp/
+cas.authn.saml-idp.metadata.file-system.location=file:///tmp/

i can login fine:
image

but the theme looks slightly broken.

image

@landryb
Copy link
Member

landryb commented Mar 29, 2024

ah no, the broken theme is due to the infamous "you're behind a reverse proxy so i'll redirect you in a loop" bug, worked around in georchestra/datadir@8e0a447, if i uncomment the line then the login prompt looks more or less like before, a bit too wide ?

image

@landryb
Copy link
Member

landryb commented Mar 29, 2024

the 'login box too wide' goes away if i drop the flex-grow-1 css class that is automagically added to the following div:
image

but i wouldnt know what magic sets this from the html template and the cas.css we have in the repo.

@landryb
Copy link
Member

landryb commented Apr 2, 2024

dropping flex-column from https://github.com/georchestra/georchestra-cas-server/blob/master/src/main/resources/templates/georchestra/fragments/loginform.html#L16 improves the layout, but we're not there yet, as the parent div still has flex-column and i don't get where it comes from.

tried dropping d-flex from https://github.com/georchestra/georchestra-cas-server/blob/master/src/main/resources/templates/georchestra/layout.html#L35 but that didnt help.

image

@fgravin @f-necas since you're more frontend experts than me.... all i know is that bootstrap in cas 6.3 was at 4.6.0, and bootstrap in cas 6.6 is at 5.2.0.

…rsion

Magical div comes from apereo's thymeleaf templates !
@f-necas f-necas force-pushed the upgrade-to-cas-6.6 branch from 1935a70 to 9601d4a Compare April 9, 2024 13:11
@f-necas
Copy link
Contributor

f-necas commented Apr 9, 2024

Solved ! Thanks to @tkohr for mentionning apereo's template.

Source of the magical things : https://github.com/apereo/cas/blob/6.6.x/support/cas-server-support-thymeleaf/src/main/resources/templates/login/casLoginView.html#L15C101-L15C109

@landryb
Copy link
Member

landryb commented Apr 9, 2024

well, iirc that's what i did (removing the flex-grow-1 class) and i had gone diffing the upstream source templates too, but it seems i missed this occurence.

can confirm that the login box layout is now OK on 6.6.15 when building from your last commit 9601d4a and i can login fine as testadmin/testadmin

@pmauduit
Copy link
Member Author

pmauduit commented Apr 9, 2024

pretty cool if it does not require tons of gradle shenanigans to upgrade :-) LGTM

@landryb landryb linked an issue Apr 9, 2024 that may be closed by this pull request
@pmauduit pmauduit merged commit 20cbb9c into master Apr 24, 2024
2 checks passed
@pmauduit pmauduit deleted the upgrade-to-cas-6.6 branch April 24, 2024 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

doesnt build with jdk17
4 participants