From 55fa9553266423896a9eaa74a8899f9881e76400 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Oct 2025 08:50:34 +0300 Subject: [PATCH] 012 json time format bug fix --- Application.cfc | 2 +- Application.cfc.bak | 422 ++++++++++++++++++++++++++++++++++++++++++++ json.cfm | 12 +- json.cfm.bak | 90 ++++++++++ 4 files changed, 520 insertions(+), 6 deletions(-) create mode 100644 Application.cfc.bak create mode 100644 json.cfm.bak diff --git a/Application.cfc b/Application.cfc index e665793..16b6da4 100644 --- a/Application.cfc +++ b/Application.cfc @@ -77,7 +77,7 @@ - + diff --git a/Application.cfc.bak b/Application.cfc.bak new file mode 100644 index 0000000..e665793 --- /dev/null +++ b/Application.cfc.bak @@ -0,0 +1,422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ), + DE( "https://" ), + DE( "http://" ) + ) & + cgi.http_host & + reReplace( + getDirectoryFromPath( arguments.template ), "([^\\/]+[\\/]){#local.requestDepth#}$", + "", + "one" + ) + ) /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jwt = new lib.jwt(this.client_secret); + idp = new lib.oauth2(this.client_id, this.client_secret, this.auth_endpoint, this.access_token_endpoint, this.redirect_uri); + + /* + часто появляется ошибка: после неудачного запроса к IDP + в адресной строке браузера остается все, с чем его редиректил IDP, + а повторный запрос с этим контентом уже не работает. Получаем 400 Bad Request - + может быть, KeyCloak так защищается от циклических редиректов + Не очень понятно, как предотвратить повторный запрос (можно, конечно, использовать сессию, но странно) + */ + //writeOutput(getTickCount()-request.startTickCount); + if(structKeyExists(url, "code")) { //обрабатываем редирект от IDP *** наличие поля code в URL введет нас в заблуждение, но эvar = data, label =то только без валидной сессии + //dump(var = url.code, label = "URL.code"); + // Request access token from idp with the + // authorization code that we got via the URL + //aFormFields = []; + //data = idp.makeAccessTokenRequest((url.code).content, aFormFields); + try { + writeOutput("idp.makeAccessTokenRequest"); + writeOutput(getTickCount()-request.startTickCount); + resp = idp.makeAccessTokenRequest(url.code/*, aFormFields*/); + writeOutput("idp.makeAccessTokenRequest Done"); + writeOutput(getTickCount()-request.startTickCount); + //dump(resp); + data = deserializeJson(resp.content); + //writedump(data); + // Print full response from idp + //dump(var = data, label = "makeAccessTokenRequest - Response from idp"); + + //echo('Refresh token #data.refresh_token#'); + + session.auth.expires_in = data.expires_in; + session.auth.refresh_expires_in = data.refresh_expires_in; + session.auth.access_token = data.access_token; + session.auth.refresh_token = data.refresh_token; + session.auth.id_token = data.id_token; + session.auth.token_type = data.token_type; + session.idp_response_content = structCopy(data); + + //flush() + lock scope="application" type="readonly" timeout="1" { + token_data = (jwt.decode(data.access_token, application.idpCertificate,"RS256")); + } + writeOutput("jwt.decode Done"); + writeOutput(getTickCount()-request.startTickCount); + writedump(token_data); + session.auth.login = token_data.preferred_username; + session.auth.wz = token_data.ClientID; + session.auth.fullname = token_data.name; + session.auth.groups = token_data.groups; + session.auth.session_state = token_data.session_state; + session.auth.sid = token_data.sid; + session.auth.auth_time = token_data.auth_time; + session.auth.exp = token_data.exp; + session.auth.iat = token_data.iat; + //session.sid = token_data.sid; + session.token_data = structCopy(token_data); + + location(this.redirect_uri,false); + } catch (e) {echo('
****************** #e.message# : #e.detail# **********');} + + } else { + strURL = idp.buildRedirectToAuthURL({"scope":'openid profile email',"state":session.auth_state,"allow_signup":false}); + echo('self-made Auth link (idp) #strURL#

'); + location(strUrl,false); + } + + + + + + + + + + + + + + + + + ---> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select value as stand from config + where name='STAND' + + + + + + + + + + + + + + + + + + + select 1; + + + + + + + + + + + + + + + + + + + + select 2; + + + + + + + + + + + + + + + + + + +//https://keycloak.nubes.ru/admin +//https://keycloak.nubes.ru/realms/SSH_CA/account //smishchuk@mgmt.nubes.ru +//https://stackoverflow.com/questions/28658735/what-are-keycloaks-oauth2-openid-connect-endpoints +//http://https://keycloak.nubes.ru/realms/SSH_CA/.well-known/openid-configuration + +//https://keycloak.nubes.ru/realms/cloud/.well-known/openid-configuration тут ссылка +//https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs тут серт +//только надо его обрамить -----BEGIN CERTIFICATE----- +function getIdpCertificate(certUrl) { + + var httpService = new http(); + httpService.setMethod( "get" ); + httpService.setCharset( "utf-8" ); + httpService.setUrl(arguments.certUrl); + + var result = httpService.send().getPrefix(); + var status_code = result.ResponseHeader['Status_Code']; + + if ('200' == status_code) { + var content = deserializeJson(result.FileContent); + //мы подразумеваем структуру конкретно KeyCloak + var key = ""; + for (key in content.keys) { + if ("RSA" == key.kty AND "sig" == key.use) { + return "-----BEGIN CERTIFICATE-----" & key.x5c[1] & "-----END CERTIFICATE-----"; + } + } + throw(message="RSA cetificate not found"); + } else { + throw (message="Cannot obtain IDP certificate, request failed", detail="Status_Code #status_code#"); + } +} + + + \ No newline at end of file diff --git a/json.cfm b/json.cfm index 81ba8e5..d9430ec 100644 --- a/json.cfm +++ b/json.cfm @@ -26,7 +26,7 @@ output="false" hint="formates date and time like this: 2023-12-18T15:41:42.516+0300"> - + @@ -69,10 +69,12 @@ /> { diff --git a/json.cfm.bak b/json.cfm.bak new file mode 100644 index 0000000..2f8ec0e --- /dev/null +++ b/json.cfm.bak @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //copy fields to structure, renaming fields, this preserves data type + + + + + + + + + + + + + + + + + { + result.append(row); + return result; + }, [])# +}/> + +#serializeJSON(out)# + +