Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-25 13:54:59 +02:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Generate only one CSRF token

Browse Source
This commit is contained in:
Lukas Reschke 2012-10-28 20:50:50 +01:00
parent 4d61eb3e4c
commit ac784baef6
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/util.php
View File

@ -496,28 +496,19 @@ class OC_Util {
* @see OC_Util::isCallRegistered()
*/
public static function callRegister() {
// generate a random token.
$token = self::generate_random_bytes(20);
// store the token together with a timestamp in the session.
$_SESSION['requesttoken-'.$token]=time();
// cleanup old tokens garbage collector
// only run every 20th time so we don't waste cpu cycles
if(rand(0, 20)==0) {
foreach($_SESSION as $key=>$value) {
// search all tokens in the session
if(substr($key, 0, 12)=='requesttoken') {
// check if static lifespan has expired
if($value+self::$callLifespan<time()) {
// remove outdated tokens
unset($_SESSION[$key]);
}
}
}
// Check if a token exists
if(!isset($_SESSION['requesttoken']) || time() >$_SESSION['requesttoken']['time']) {
// No valid token found, generate a new one.
$requestTokenArray = array(
"requesttoken" => self::generate_random_bytes(20),
"time" => time()+self::$callLifespan,
);
$_SESSION['requesttoken']=$requestTokenArray;
} else {
// Valid token already exists, send it
$requestTokenArray = $_SESSION['requesttoken'];
}
// return the token
return($token);
return($requestTokenArray['requesttoken']);
}
/**
@ -537,17 +528,14 @@ class OC_Util {
//no token found.
return false;
}
if(isset($_SESSION['requesttoken-'.$token])) {
$timestamp=$_SESSION['requesttoken-'.$token];
// check if static lifespan has expired
if($timestamp+self::$callLifespan<time()) {
return false;
}else{
//token valid
return true;
}
}else{
// Check if the token is valid
if(!isset($_SESSION['requesttoken']) || time() > $_SESSION['requesttoken']["time"]) {
// Not valid
return false;
} else {
// Valid token
return true;
}
}