Repository: vcl Updated Branches: refs/heads/develop 2c96d3a80 -> 5743cf340
VCL-1105 - Shibboleth authentication broken due to bug in getCryptKeyID utils.php: modified getCryptKeyID: added preg_replace to remove /shibauth from $filebase Project: http://git-wip-us.apache.org/repos/asf/vcl/repo Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/c92ffda6 Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/c92ffda6 Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/c92ffda6 Branch: refs/heads/develop Commit: c92ffda6ca794892e65e8afdf06f8d9039c81e52 Parents: 2c96d3a Author: Josh Thompson <jftho...@ncsu.edu> Authored: Tue Dec 11 14:10:34 2018 -0500 Committer: Josh Thompson <jftho...@ncsu.edu> Committed: Tue Dec 11 14:10:34 2018 -0500 ---------------------------------------------------------------------- web/.ht-inc/utils.php | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vcl/blob/c92ffda6/web/.ht-inc/utils.php ---------------------------------------------------------------------- diff --git a/web/.ht-inc/utils.php b/web/.ht-inc/utils.php index 2dad962..763e4b2 100644 --- a/web/.ht-inc/utils.php +++ b/web/.ht-inc/utils.php @@ -2989,6 +2989,7 @@ function deleteSecretKeys($secretid) { function getCryptKeyID() { $reg = "|" . SCRIPT . "$|"; $filebase = preg_replace($reg, '', $_SERVER['SCRIPT_FILENAME']); + $filebase = preg_replace('|/shibauth|', '', $filebase); $filebase .= "/.ht-inc/cryptkey"; $idfile = "$filebase/cryptkeyid";
