diff options
Diffstat (limited to 'modules/casserver/www')
-rw-r--r-- | modules/casserver/www/login.php | 6 | ||||
-rw-r--r-- | modules/casserver/www/proxy.php | 2 | ||||
-rw-r--r-- | modules/casserver/www/serviceValidate.php | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/casserver/www/login.php b/modules/casserver/www/login.php index ebbaec3..008018b 100644 --- a/modules/casserver/www/login.php +++ b/modules/casserver/www/login.php @@ -41,15 +41,15 @@ $attributes = $as->getAttributes(); $path = $casconfig->resolvePath($casconfig->getValue('ticketcache', '/tmp')); -$ticket = str_replace( '_', 'ST-', SimpleSAML_Utilities::generateID() ); +$ticket = str_replace( '_', 'ST-', SimpleSAML\Utils\Random::generateID() ); storeTicket($ticket, $path, array('service' => $service, 'forceAuthn' => $forceAuthn, 'attributes' => $attributes, 'proxies' => array(), 'validbefore' => time() + 5)); -SimpleSAML_Utilities::redirectTrustedURL( - SimpleSAML_Utilities::addURLparameter($service, +\SimpleSAML\Utils\HTTP::redirectTrustedURL( + \SimpleSAML\Utils\HTTP::addURLParameters($service, array('ticket' => $ticket) ) );
\ No newline at end of file diff --git a/modules/casserver/www/proxy.php b/modules/casserver/www/proxy.php index 7b88e41..6fc14e4 100644 --- a/modules/casserver/www/proxy.php +++ b/modules/casserver/www/proxy.php @@ -26,7 +26,7 @@ $path = $casconfig->resolvePath($casconfig->getValue('ticketcache', 'ticketcache $ticket = retrieveTicket($pgt, $path, false); if ($ticket['validbefore'] > time()) { - $pt = str_replace( '_', 'PT-', SimpleSAML_Utilities::generateID() ); + $pt = str_replace( '_', 'PT-', SimpleSAML\Utils\Random::generateID() ); storeTicket($pt, $path, array( 'service' => $targetService, 'forceAuthn' => false, diff --git a/modules/casserver/www/serviceValidate.php b/modules/casserver/www/serviceValidate.php index ffb20bb..ad5616d 100644 --- a/modules/casserver/www/serviceValidate.php +++ b/modules/casserver/www/serviceValidate.php @@ -41,14 +41,14 @@ try { if (isset($_GET['pgtUrl'])) { $pgtUrl = $_GET['pgtUrl']; - $pgtiou = str_replace( '_', 'PGTIOU-', SimpleSAML_Utilities::generateID()); - $pgt = str_replace( '_', 'PGT-', SimpleSAML_Utilities::generateID()); + $pgtiou = str_replace( '_', 'PGTIOU-', SimpleSAML\Utils\Random::generateID()); + $pgt = str_replace( '_', 'PGT-', SimpleSAML\Utils\Random::generateID()); $content = array( 'attributes' => $attributes, 'forceAuthn' => false, 'proxies' => array_merge(array($service), $ticketcontent['proxies']), 'validbefore' => time() + 60); - SimpleSAML_Utilities::fetch($pgtUrl . '?pgtIou=' . $pgtiou . '&pgtId=' . $pgt); + \SimpleSAML\Utils\HTTP::fetch($pgtUrl . '?pgtIou=' . $pgtiou . '&pgtId=' . $pgt); storeTicket($pgt, $path, $content); $pgtiouxml = "\n<cas:proxyGrantingTicket>$pgtiou</cas:proxyGrantingTicket>\n"; } |