diff options
| -rw-r--r-- | appinfo/routes.php | 4 | ||||
| -rw-r--r-- | js/signaling.js | 4 | ||||
| -rw-r--r-- | lib/Manager.php | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index de97b6061..f93bbb1a2 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -51,7 +51,7 @@ return [ ], [ 'name' => 'Signaling#signaling', - 'url' => '/api/{apiVersion}/signaling/{token}/messages', + 'url' => '/api/{apiVersion}/signaling/{token}', 'verb' => 'POST', 'requirements' => [ 'apiVersion' => 'v1', @@ -60,7 +60,7 @@ return [ ], [ 'name' => 'Signaling#pullMessages', - 'url' => '/api/{apiVersion}/signaling/{token}/messages', + 'url' => '/api/{apiVersion}/signaling/{token}', 'verb' => 'GET', 'requirements' => [ 'apiVersion' => 'v1', diff --git a/js/signaling.js b/js/signaling.js index 54c22a9b3..932361f05 100644 --- a/js/signaling.js +++ b/js/signaling.js @@ -341,7 +341,7 @@ OCA.Talk.Signaling.Internal.prototype._sendMessages = function(messages) { var defer = $.Deferred(); $.ajax({ - url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken + '/messages', + url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken, type: 'POST', data: {messages: JSON.stringify(messages)}, beforeSend: function (request) { @@ -417,7 +417,7 @@ // Connect to the messages endpoint and pull for new messages this.pullMessagesRequest = $.ajax({ - url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken + '/messages', + url: OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + this.currentRoomToken, type: 'GET', dataType: 'json', beforeSend: function (request) { diff --git a/lib/Manager.php b/lib/Manager.php index bceb5a2b5..a86a41898 100644 --- a/lib/Manager.php +++ b/lib/Manager.php @@ -450,7 +450,11 @@ class Manager { $i = 0; while ($i < 1000) { try { - return $this->generateNewToken($query, $entropy, $chars); + $token = $this->generateNewToken($query, $entropy, $chars); + if (\in_array($token, ['settings', 'backend'], true)) { + throw new \OutOfBoundsException('Reserved word'); + } + return $token; } catch (\OutOfBoundsException $e) { $i++; if ($entropy >= 30 || $i >= 999) { |