diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml index 801a861..deedba3 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml @@ -40,7 +40,7 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-7364b51af024a93080fe9a7cafbd0f9121c88904" + tag: "r-95871349e8265b00ad7b2829249e4f29cab5d6ab" dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth" credentials: "git-credentials" keystores: diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptchainfos.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptchainfos.groovy index d23548d..b1bd6b2 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptchainfos.groovy +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptchainfos.groovy @@ -9,9 +9,9 @@ try { def jsonSlurper = new JsonSlurper() def httpClient = HttpClients.create(parameters) def httpResponse = Http.get().url(url).build().send(httpClient) - LOG.info('Response Message: ' + httpResponse.reasonPhrase()) - LOG.info('Response Status Code: ' + httpResponse.code()) - LOG.info('Response: ' + httpResponse.bodyAsString()) + LOG.debug('Response Message: ' + httpResponse.reasonPhrase()) + LOG.debug('Response Status Code: ' + httpResponse.code()) + LOG.debug('Response: ' + httpResponse.bodyAsString()) if (httpResponse.code() == 200) { def json = jsonSlurper.parseText(httpResponse.bodyAsString()) diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptcharesult.groovy b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptcharesult.groovy index 4e0c096..a9682b0 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptcharesult.groovy +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/fido2_fetchcaptcharesult.groovy @@ -1,12 +1,14 @@ def url = parameters.get('url') def email = inargs['userInputValue_prompt.email'] +def token = inargs['captcha_response']?: 'MISSING' + def ip = request.getLoginContext()['connection.HttpHeader.X-Real-IP'] ?: 'unknown' def userAgent = request.getLoginContext()['connection.HttpHeader.user-agent'] ?: request.getLoginContext()['connection.HttpHeader.User-Agent'] ?: 'unknown' def payload = "{ \"userIp\": \"${ip}\", \"email\": \"${email}\", \"userAgent\": \"${userAgent}\" }" -LOG.debug('Token: ' + inargs['recaptcha_response']) +LOG.debug('Token: ' + token) LOG.debug('Payload: ' + payload) try { @@ -15,7 +17,7 @@ try { def httpResponse = Http.post() .url(url) .header("Accept", "application/json") - .header("X-FriendlyCAPTCHA-Token", inargs['recaptcha_response']) + .header("X-FriendlyCAPTCHA-Token", token) .entity(Http.entity() .content(payload) .contentType("application/json")