hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

fix unassume in cas-curl

Browse Source
This commit is contained in:
Michael Hoennig 2025-01-06 12:24:49 +01:00
parent 7dea3607f1
commit 802cc3a622
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/cas-curl
View File

@ -13,10 +13,16 @@ if [ "$1" == "--trace" ]; then
} }
function doCurl() { function doCurl() {
set -x set -x
curl --fail-with-body \ if [ -z "$HSADMINNG_CAS_ASSUME" ]; then
--header "Authorization: $HSADMINNG_CAS_TICKET" \ curl --fail-with-body \
--header "assumed-roles: $HSADMINNG_CAS_ASSUME" \ --header "Authorization: $HSADMINNG_CAS_TICKET" \
"$@" "$@"
else
curl --fail-with-body \
--header "Authorization: $HSADMINNG_CAS_TICKET" \
--header "assumed-roles: $HSADMINNG_CAS_ASSUME" \
"$@"
fi
set +x set +x
} }
shift shift

4
src/main/java/net/hostsharing/hsadminng/config/CasAuthenticator.java
View File

@ -45,13 +45,13 @@ public class CasAuthenticator implements Authenticator {
private String casValidation(final HttpServletRequest httpRequest) private String casValidation(final HttpServletRequest httpRequest)
throws SAXException, IOException, ParserConfigurationException { throws SAXException, IOException, ParserConfigurationException {
System.err.println("CasAuthenticator.casValidation using CAS-server: " + casServerUrl);
final var ticket = httpRequest.getHeader("Authorization"); final var ticket = httpRequest.getHeader("Authorization");
final var url = casServerUrl + "/p3/serviceValidate" + final var url = casServerUrl + "/p3/serviceValidate" +
"?service=" + serviceUrl + "?service=" + serviceUrl +
"&ticket=" + ticket; "&ticket=" + ticket;
System.err.println("CasAuthenticator.casValidation using URL: " + url);
final var response = restTemplate.getForObject(url, String.class); final var response = restTemplate.getForObject(url, String.class);
final var doc = DocumentBuilderFactory.newInstance().newDocumentBuilder() final var doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()