From b96bbacfd1347717de59af0a181dae9f7749affd Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Wed, 29 Apr 2020 00:18:30 +0100 Subject: [PATCH] Updated to v1.3.1 --- README.md | 4 +++- conf/site/changelog.json | 6 ++++++ conf/site/composer.lock | 10 +++++----- conf/site/config/speedtest.php | 2 +- conf/site/vendor/composer/installed.json | 12 ++++++------ .../laravel-cors/src/CorsServiceProvider.php | 4 ---- .../vendor/fruitcake/laravel-cors/src/HandleCors.php | 8 ++++++++ 7 files changed, 29 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a78133d2..336d3727 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Speedtest Tracker -[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.3.0-success) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) +[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.3.1-success) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE) This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [speedtest-cli](https://github.com/sivel/speedtest-cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results. @@ -11,6 +11,8 @@ This program runs a speedtest check every hour and graphs the results. The back- - Automatically run a speedtest every hour - Graph of previous speedtests going back x days - Backup/restore data in JSON format +- Slack/Discord notifications +- Organizr integration ## Usage diff --git a/conf/site/changelog.json b/conf/site/changelog.json index d8baa5d5..effe724e 100644 --- a/conf/site/changelog.json +++ b/conf/site/changelog.json @@ -1,4 +1,10 @@ { + "1.3.1": [ + { + "description": "Updated laravel-cors", + "link": "https://github.com/henrywhitaker3/Speedtest-Tracker/pull/26" + } + ], "1.3.0": [ { "description": "Added discord notifications", diff --git a/conf/site/composer.lock b/conf/site/composer.lock index 8ac156ee..1cbe97a7 100644 --- a/conf/site/composer.lock +++ b/conf/site/composer.lock @@ -434,16 +434,16 @@ }, { "name": "fruitcake/laravel-cors", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0" + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/0e0500133dbb6325266133dd72f040617c9cdbd0", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/1d127dbec313e2e227d65e0c483765d8d7559bf6", + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6", "shasum": "" }, "require": { @@ -498,7 +498,7 @@ "crossdomain", "laravel" ], - "time": "2020-03-11T21:05:07+00:00" + "time": "2020-04-28T08:47:37+00:00" }, { "name": "guzzlehttp/guzzle", diff --git a/conf/site/config/speedtest.php b/conf/site/config/speedtest.php index 4c37532c..ccb46d86 100644 --- a/conf/site/config/speedtest.php +++ b/conf/site/config/speedtest.php @@ -7,7 +7,7 @@ return [ |-------------------------------------------------------------------------- */ - 'version' => '1.3.0', + 'version' => '1.3.1', /* |-------------------------------------------------------------------------- diff --git a/conf/site/vendor/composer/installed.json b/conf/site/vendor/composer/installed.json index 539fa704..00e91ac6 100644 --- a/conf/site/vendor/composer/installed.json +++ b/conf/site/vendor/composer/installed.json @@ -739,17 +739,17 @@ }, { "name": "fruitcake/laravel-cors", - "version": "v1.0.5", - "version_normalized": "1.0.5.0", + "version": "v1.0.6", + "version_normalized": "1.0.6.0", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0" + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/0e0500133dbb6325266133dd72f040617c9cdbd0", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/1d127dbec313e2e227d65e0c483765d8d7559bf6", + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6", "shasum": "" }, "require": { @@ -767,7 +767,7 @@ "phpunit/phpunit": "^6.0|^7.0|^8.0", "squizlabs/php_codesniffer": "^3.5" }, - "time": "2020-03-11T21:05:07+00:00", + "time": "2020-04-28T08:47:37+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/conf/site/vendor/fruitcake/laravel-cors/src/CorsServiceProvider.php b/conf/site/vendor/fruitcake/laravel-cors/src/CorsServiceProvider.php index a26aef13..4796100b 100644 --- a/conf/site/vendor/fruitcake/laravel-cors/src/CorsServiceProvider.php +++ b/conf/site/vendor/fruitcake/laravel-cors/src/CorsServiceProvider.php @@ -31,10 +31,6 @@ class CorsServiceProvider extends BaseServiceProvider } } - if ($config['max_age'] !== false && !is_numeric($config['max_age'])) { - throw new \RuntimeException('CORS config `max_age` should be an integer or `false`'); - } - // Convert case to supported options $options = [ 'supportsCredentials' => $config['supports_credentials'], diff --git a/conf/site/vendor/fruitcake/laravel-cors/src/HandleCors.php b/conf/site/vendor/fruitcake/laravel-cors/src/HandleCors.php index fd9dabb8..7790b1be 100644 --- a/conf/site/vendor/fruitcake/laravel-cors/src/HandleCors.php +++ b/conf/site/vendor/fruitcake/laravel-cors/src/HandleCors.php @@ -6,6 +6,7 @@ use Closure; use Asm89\Stack\CorsService; use Illuminate\Http\Request; use Illuminate\Contracts\Container\Container; +use Illuminate\Foundation\Http\Events\RequestHandled; use Symfony\Component\HttpFoundation\Response; class HandleCors @@ -46,6 +47,13 @@ class HandleCors return new Response('Not allowed in CORS policy.', 403); } + // Add the headers on the Request Handled event as fallback in case of exceptions + if (class_exists(RequestHandled::class) && $this->container->bound('events')) { + $this->container->make('events')->listen(RequestHandled::class, function (RequestHandled $event) { + $this->addHeaders($event->request, $event->response); + }); + } + // Handle the request $response = $next($request);