summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-02-13 11:35:12 +0100
committerLukas Reschke <lukas@owncloud.com>2015-02-13 12:08:23 +0100
commit025110821f41ba55ec9deb2479ff7eb6b3e8b5c1 (patch)
tree7be906cf4d0a4b3fc88f03c37b9b97cd15ebc84e /lib/private
parentdfcd4acd5aebfa3476c58c652bbf5545d3882217 (diff)
downloadnextcloud-server-025110821f41ba55ec9deb2479ff7eb6b3e8b5c1.tar.gz
nextcloud-server-025110821f41ba55ec9deb2479ff7eb6b3e8b5c1.zip
URLEncode logout attribute
Otherwise logout can fail if the requesttoken contains a +
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/security/securerandom.php3
-rw-r--r--lib/private/user.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/security/securerandom.php b/lib/private/security/securerandom.php
index 2402e863fb0..b1169bff289 100644
--- a/lib/private/security/securerandom.php
+++ b/lib/private/security/securerandom.php
@@ -64,8 +64,7 @@ class SecureRandom implements ISecureRandom {
* Generate a random string of specified length.
* @param string $length The length of the generated string
* @param string $characters An optional list of characters to use if no characterlist is
- * specified 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./
- * is used.
+ * specified all valid base64 characters are used.
* @return string
* @throws \Exception If the generator is not initialized.
*/
diff --git a/lib/private/user.php b/lib/private/user.php
index d1fedffcaaf..10457c224f2 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -366,7 +366,7 @@ class OC_User {
return $backend->getLogoutAttribute();
}
- return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . OC_Util::callRegister() . '"';
+ return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . urlencode(OC_Util::callRegister()) . '"';
}
/**