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.

Sign up for GitHub

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

Fix and issue with Request Logging and Improve the log detail #34

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix and issue with Request Logging and Improve the log detail #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a6788d
[bugfix] $req needs to be serialized before being logged, otherwise y…
adamretter Aug 20, 2024
ccfe34c
[feature] Improve logging in exsaml:check-authnreqid to help diagnose…
adamretter Aug 20, 2024
3a81045
[refactor] The 'xmldb:remove' function always returns the Empty Seque…
adamretter Aug 20, 2024
1e2ce86
[feature] Improve logging in exsaml:store-authnreqid to help diagnose…
adamretter Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions content/exsaml.xqm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ declare function exsaml:info($cid as xs:string) {
declare function exsaml:build-authnreq-redir-url($cid as xs:string, $relaystate as xs:string) {
let $log := exsaml:log("info", $cid, "building SAML auth request redir-url; relaystate: " || $relaystate)
let $req := exsaml:build-saml-authnreq($cid)
let $log := exsaml:log("debug", $cid, "build-authnreq-redir-url; req: " || $req)
let $log := exsaml:log("debug", $cid, "build-authnreq-redir-url; req: " || fn:serialize($req))

(: deflate and base64 encode request :)
let $ser := fn:serialize($req)
Expand Down Expand Up @@ -193,11 +193,13 @@ declare %private function exsaml:store-authnreqid-as-exsol-user($cid as xs:strin
declare %private function exsaml:store-authnreqid($cid as xs:string, $reqid as xs:string, $instant as xs:dateTime) {
let $log := exsaml:log("info", $cid, "storing SAML request id: " || $reqid || ", date: " || $instant)
return
system:as-user(
$exsaml:exsaml-user,
$exsaml:exsaml-pass,
let $stored-saml-request-id-path := system:as-user($exsaml:exsaml-user, $exsaml:exsaml-pass,
exsaml:store-authnreqid-as-exsol-user($cid, $reqid, $instant)
)
return
let $log := exsaml:log("trace", $cid, "storing SAML request id: stored at path: " || $stored-saml-request-id-path)
return
$stored-saml-request-id-path
};

(: ==== FUNCTIONS TO PROCESS AND VALIDATE A SAML AUTHN RESPONSE ==== :)
Expand Down Expand Up @@ -447,10 +449,19 @@ declare %private function exsaml:validate-saml-assertion($cid as xs:string, $ass
: @param true if the SAML Request ID is valid, false otherwise.
:)
declare %private function exsaml:check-authnreqid($cid as xs:string, $reqid as xs:string) as xs:boolean {
let $log := exsaml:log("info", $cid, "verifying SAML request: reqid: " || $reqid)
let $stored-saml-request-id-path := $exsaml:saml-coll-reqid || "/" || $reqid
let $log := exsaml:log("info", $cid, "verifying SAML request: reqid: " || $reqid || " by looking for path: " || $stored-saml-request-id-path)
return
system:as-user($exsaml:exsaml-user, $exsaml:exsaml-pass,
exists(doc($exsaml:saml-coll-reqid || "/" || $reqid)) and empty(xmldb:remove($exsaml:saml-coll-reqid, $reqid)))
let $stored-saml-request-id-exists := system:as-user($exsaml:exsaml-user, $exsaml:exsaml-pass,
let $exists := exists(doc($stored-saml-request-id-path))
let $_ := xmldb:remove($exsaml:saml-coll-reqid, $reqid)
return
$exists
)
return
let $log := exsaml:log("trace", $cid, "verifying SAML request: path: " || $stored-saml-request-id-path || " exists: " || $stored-saml-request-id-exists)
return
$stored-saml-request-id-exists
};

(:~
Expand Down