From 8cbbc821bf4a6f56bdb5db639909dd1853aa1295 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Fri, 2 Mar 2018 17:47:20 +0000 Subject: [PATCH] Shorten some lines to less than 120 chars --- app/Http/Middleware/CSPHeader.php | 42 +++++++++++++++++++++++++---- app/Http/Middleware/CorsHeaders.php | 5 +++- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/CSPHeader.php b/app/Http/Middleware/CSPHeader.php index 92673831..9b521d2b 100644 --- a/app/Http/Middleware/CSPHeader.php +++ b/app/Http/Middleware/CSPHeader.php @@ -21,11 +21,43 @@ class CSPHeader ->header( 'Content-Security-Policy', "default-src 'self'; " . - "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://api.mapbox.com https://analytics.jmb.lv blob:; " . - "style-src 'self' 'unsafe-inline' https://api.mapbox.com https://fonts.googleapis.com use.typekit.net p.typekit.net; " . - "img-src 'self' data: blob: https://pbs.twimg.com https://api.mapbox.com https://*.tiles.mapbox.com https://jbuk-media.s3-eu-west-1.amazonaws.com https://secure.gravatar.com https://graph.facebook.com *.fbcdn.net https://*.cdninstagram.com analytics.jmb.lv https://*.4sqi.net https://upload.wikimedia.org p.typekit.net; " . - "font-src 'self' https://fonts.gstatic.com use.typekit.net fonts.typekit.net; " . - "connect-src 'self' https://api.mapbox.com https://*.tiles.mapbox.com performance.typekit.net data: blob:; " . + "script-src 'self' \ +'unsafe-inline' \ +'unsafe-eval' \ +https://api.mapbox.com \ +https://analytics.jmb.lv \ +blob:; " . + "style-src 'self' \ +'unsafe-inline' \ +https://api.mapbox.com \ +https://fonts.googleapis.com \ +use.typekit.net \ +p.typekit.net; " . + "img-src 'self' \ +data: \ +blob: \ +https://pbs.twimg.com \ +https://api.mapbox.com \ +https://*.tiles.mapbox.com \ +https://jbuk-media.s3-eu-west-1.amazonaws.com \ +https://secure.gravatar.com \ +https://graph.facebook.com \ +*.fbcdn.net \ +https://*.cdninstagram.com \ +analytics.jmb.lv \ +https://*.4sqi.net \ +https://upload.wikimedia.org \ +p.typekit.net; " . + "font-src 'self' \ +https://fonts.gstatic.com \ +use.typekit.net \ +fonts.typekit.net; " . + "connect-src 'self' \ +https://api.mapbox.com \ +https://*.tiles.mapbox.com \ +performance.typekit.net \ +data: \ +blob:; " . "worker-src 'self' blob:; " . "frame-src 'self' https://www.youtube.com blob:; " . "child-src 'self' blob:; " . diff --git a/app/Http/Middleware/CorsHeaders.php b/app/Http/Middleware/CorsHeaders.php index 61b3e1e3..85986079 100644 --- a/app/Http/Middleware/CorsHeaders.php +++ b/app/Http/Middleware/CorsHeaders.php @@ -19,7 +19,10 @@ class CorsHeaders if ($request->path() === 'api/media') { $response->header('Access-Control-Allow-Origin', '*'); $response->header('Access-Control-Allow-Methods', 'OPTIONS, POST'); - $response->header('Access-Control-Allow-Headers', 'Authorization, Content-Type, DNT, X-CSRF-TOKEN, X-REQUESTED-WITH'); + $response->header( + 'Access-Control-Allow-Headers', + 'Authorization, Content-Type, DNT, X-CSRF-TOKEN, X-REQUESTED-WITH' + ); $response->header('Access-Control-Allow-Credentials', 'true'); }