blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:beyondcode/laravel-websockets

This commit is contained in:
Marcel Pociot 2018-11-26 23:06:28 +01:00
parent 097be4d2b1 ef67261cb5
commit 687d584e56
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/websockets.php
View File

@ -50,7 +50,7 @@ return [
* Leave this empty if you want to accepts requests from all hosts.
*/
'allowedOrigins' => [
//
],
/*

4
src/Dashboard/Http/routes.php
View File

@ -5,5 +5,5 @@ use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage;
use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard;
Route::get('/', ShowDashboard::class);
Route::post('/auth', AuthenticateDashboard::class);
Route::post('/event', SendMessage::class);
Route::post('auth', AuthenticateDashboard::class);
Route::post('event', SendMessage::class);

30
src/LaravelEcho/Http/Controllers/EchoController.php
View File

@ -60,21 +60,23 @@ abstract class EchoController implements HttpServerInterface
function onError(ConnectionInterface $connection, Exception $exception)
{
if ($exception instanceof HttpException) {
$response = new Response($exception->getStatusCode(), [
'Content-Type' => 'application/json'
], json_encode([
'error' => $exception->getMessage()
]));
$connection->send(Psr\str($response));
$connection->close();
if (! $exception instanceof HttpException) {
return;
}
$response = new Response($exception->getStatusCode(), [
'Content-Type' => 'application/json'
], json_encode([
'error' => $exception->getMessage()
]));
$connection->send(Psr\str($response));
$connection->close();
}
public function ensureValidAppId(string $appId)
{
if (! $client = Client::findByAppId($appId)) {
if (!$client = Client::findByAppId($appId)) {
throw new HttpException(401, "Unknown app id `{$appId}` provided.");
}
@ -86,10 +88,10 @@ abstract class EchoController implements HttpServerInterface
$bodyMd5 = md5($request->getContent());
$signature =
"{$request->getMethod()}\n/{$request->path()}\n".
"auth_key={$request->get('auth_key')}".
"&auth_timestamp={$request->get('auth_timestamp')}".
"&auth_version={$request->get('auth_version')}".
"{$request->getMethod()}\n/{$request->path()}\n" .
"auth_key={$request->get('auth_key')}" .
"&auth_timestamp={$request->get('auth_timestamp')}" .
"&auth_version={$request->get('auth_version')}" .
"&body_md5={$bodyMd5}";
$authSignature = hash_hmac('sha256', $signature, Client::findByAppId($request->get('appId'))->appSecret);