Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion lib/private/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,7 @@ public static function getInstanceId() {
return $id;
}

protected static $encryptedToken;
/**
* Register an get/post call. Important to prevent CSRF attacks.
*
Expand All @@ -1066,6 +1067,11 @@ public static function getInstanceId() {
* @see OC_Util::isCallRegistered()
*/
public static function callRegister() {
// Use existing token if function has already been called
if(isset(self::$encryptedToken)) {
return self::$encryptedToken;
}

// Check if a token exists
if (!\OC::$server->getSession()->exists('requesttoken')) {
// No valid token found, generate a new one.
Expand All @@ -1078,7 +1084,8 @@ public static function callRegister() {

// Encrypt the token to mitigate breach-like attacks
$sharedSecret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(10);
return \OC::$server->getCrypto()->encrypt($requestToken, $sharedSecret) . ':' . $sharedSecret;
self::$encryptedToken = \OC::$server->getCrypto()->encrypt($requestToken, $sharedSecret) . ':' . $sharedSecret;
return self::$encryptedToken;
}

/**
Expand Down