diff --git a/.env.example b/.env.example index 27d4d257..5cb402c9 100644 --- a/.env.example +++ b/.env.example @@ -70,6 +70,14 @@ MESBR_COUPON_3_CHARCUT="" ANALYTICS_GOOGLE_ID= GOOGLE_MAP_API_KEY= +# Google Recaptcha +GOOGLE_RECAPTCHA_PUBLIC= +GOOGLE_RECAPTCHA_PRIVATE= +GOOGLE_RECAPTCHA_VERSION= + +# Matomo +MATOMO_SITE_ID= + ## MERCANET MERCANET_SECRET= MERCANET_MERCHAND_ID= diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index fd3c511b..e8b76a17 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -3,19 +3,38 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Route; +use Illuminate\Support\Facades\View; class SecureHeaders { - // Enumerate headers which you do not want in your application's responses. - // Great starting point would be to go check out @Scott_Helme's: - // https://securityheaders.com/ + /** + * Enumerate headers which you do not want in your application's responses. + * Great starting point would be to go check out @Scott_Helme's: + * https://securityheaders.com/ + * + * @var array + */ private $unwantedHeaderList = [ 'X-Powered-By', 'Server', ]; - public function handle($request, Closure $next) + /** + * Handle an incoming request. + * + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse + */ + public function handle(Request $request, Closure $next) { + View::share('nonce', $nonce = \uniqid()); + // * For VueJS dev tool to execute + $jsDev = config('app.debug') ? "'unsafe-eval' 'unsafe-inline'" : "'nonce-$nonce'"; + $reportUri = Route::has('cspReportUri') ? + \sprintf('report-uri %s', \parse_url(route('cspReportUri'), \PHP_URL_PATH)) : ''; $this->removeUnwantedHeaders($this->unwantedHeaderList); $response = $next($request); $response->headers->set('Referrer-Policy', 'no-referrer-when-downgrade'); @@ -24,19 +43,41 @@ class SecureHeaders $response->headers->set('X-Frame-Options', 'SAMEORIGIN'); $response->headers->set('Strict-Transport-Security', 'max-age=31536000; includeSubDomains;'); $cspPolicies = [ + 'frame-src ' . implode(" ", [ + 'https://www.google.com/recaptcha/', + 'https://recaptcha.google.com/recaptcha/' + ]) . ';', "style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com https://fonts.googleapis.com;", // phpcs:ignore Generic.Files.LineLength.TooLong - "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com https://www.googletagmanager.com https://www.google-analytics.com https://maps.googleapis.com https://fonts.googleapis.com;" + 'script-src ' . implode(" ", [ + '\'self\'', + '\'unsafe-inline\'', + '\'unsafe-eval\'', + 'https://cdnjs.cloudflare.com', + 'https://*.googletagmanager.com', + 'https://www.google-analytics.com', + 'https://maps.googleapis.com', + 'https://fonts.googleapis.com', + 'https://www.google.com/recaptcha/', + 'https://www.gstatic.com/recaptcha/', + 'https://yl.s-web.fr', + ]) . ' ' . $jsDev . ';' ]; $response->headers->set( 'Content-Security-Policy', - implode(' ', $cspPolicies) + implode(' ', $cspPolicies) . $reportUri ); $response->headers->set('Feature-Policy', 'fullscreen \'self\';'); return $response; } - private function removeUnwantedHeaders($headerList) + /** + * Remove unwanted headers + * + * @param array $headerList + * @return void + */ + private function removeUnwantedHeaders(array $headerList) { foreach ($headerList as $header) { header_remove($header); diff --git a/app/Http/Requests/ContactFormRequest.php b/app/Http/Requests/ContactFormRequest.php index 111ed972..5e32b9ae 100644 --- a/app/Http/Requests/ContactFormRequest.php +++ b/app/Http/Requests/ContactFormRequest.php @@ -4,6 +4,7 @@ namespace App\Http\Requests; use App\Enums\ContactFormCivility; use App\Enums\ContactFormType; +use App\Lib\Helpers\ToolboxHelper; use Illuminate\Foundation\Http\FormRequest; use Kwaadpepper\Enum\Rules\EnumIsValidRule; @@ -26,6 +27,8 @@ class ContactFormRequest extends FormRequest */ public function rules() { + ToolboxHelper::validateRecaptcha($this, \config('services.google.recaptcha.version')); + if ($this->type == ContactFormType::onepage()->value) { app()->setLocale('nl'); } diff --git a/app/Http/Requests/CustomerRegisterRequest.php b/app/Http/Requests/CustomerRegisterRequest.php index 08c9f5e7..af9f2250 100644 --- a/app/Http/Requests/CustomerRegisterRequest.php +++ b/app/Http/Requests/CustomerRegisterRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use App\Lib\Helpers\ToolboxHelper; use Carbon\Carbon; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Password; @@ -36,6 +37,8 @@ class CustomerRegisterRequest extends FormRequest */ public function rules() { + ToolboxHelper::validateRecaptcha($this, \config('services.google.recaptcha.version')); + return [ 'email' => 'required|email:rfc,dns,spoof,filter|max:255|unique:customers,email', 'username' => 'required|string|min:1|max:255|unique:customers,username', @@ -78,6 +81,10 @@ class CustomerRegisterRequest extends FormRequest ]; } + /** + * + * @return array + */ public function attributes() { return [ @@ -85,6 +92,10 @@ class CustomerRegisterRequest extends FormRequest ]; } + /** + * + * @return array + */ public function messages() { return [ diff --git a/app/Http/Requests/UpdateEngagement.php b/app/Http/Requests/UpdateEngagement.php index 6f3b424c..1c4c9e08 100644 --- a/app/Http/Requests/UpdateEngagement.php +++ b/app/Http/Requests/UpdateEngagement.php @@ -129,9 +129,14 @@ class UpdateEngagement extends FormRequest }//end if break; case InputType::url()->value: + if ($iptName === "link") { + $ruleAtt = "sometimes"; + } else { + $ruleAtt = "required"; + } $rules = array_merge($rules, [ "content.$i.content.$iptName.value" => [ - 'required', 'url', + $ruleAtt, 'url', // @phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed function ($attribute, $value, $fail) { try { @@ -172,10 +177,10 @@ class UpdateEngagement extends FormRequest "content.$i.content.$iptName.value" => 'boolean' ]); break; - }//end switch - }//end foreach - }//end foreach - }//end if + } //end switch + } //end foreach + } //end foreach + } //end if return $rules; } } diff --git a/app/Jobs/XmlTracaReader.php b/app/Jobs/XmlTracaReader.php index b35e7c9e..a113c07f 100644 --- a/app/Jobs/XmlTracaReader.php +++ b/app/Jobs/XmlTracaReader.php @@ -64,7 +64,7 @@ class XmlTracaReader extends XmlJobs // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed function (\SimpleXMLElement $xmlContent, array &$line) { $abatage_date = \explode('.', $line['abatage_date']); - // * Inverser année et jours a cause du flux de merde + // * Inverser année et jours a cause du flux $line['abatage_date'] = \sprintf( '20%s/%s/%s', $abatage_date[2], diff --git a/app/Lib/Helpers/ToolboxHelper.php b/app/Lib/Helpers/ToolboxHelper.php new file mode 100644 index 00000000..7cce2405 --- /dev/null +++ b/app/Lib/Helpers/ToolboxHelper.php @@ -0,0 +1,65 @@ +all(), [ + 'g-recaptcha-response' => [ + 'required', 'string', + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed, Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed + function ($attribute, $value, $fail) use ($isV3) { + try { + $response = Http::asForm()->post('https://www.google.com/recaptcha/api/siteverify', [ + 'secret' => config('services.google.recaptcha.private'), + 'response' => \strval($value), + 'remoteip' => app('clientIp') + ]); + if ($e = $response->toException()) { + throw $e; + } + if ($isV3) { + if ( + !$response->json('success') or + !$response->json('challenge_ts') or + Carbon::parse($response->json('challenge_ts'))->lessThan(\now('utc')->subMinutes(5)) or + $response->json('hostname') !== \parse_url(config('app.url'), \PHP_URL_HOST) or + !$response->json('score') + ) { + throw new \RuntimeException(); + } + if (\floatval($response->json('score')) < 0.8) { + $fail("Vous n'avez pas obtenu un score assez élevé lors de la validation du recaptcha"); + } + return; + } + if ( + !$response->json('success') or + !$response->json('challenge_ts') or + Carbon::parse($response->json('challenge_ts'))->lessThan(\now('utc')->subMinutes(5)) or + $response->json('hostname') !== \parse_url(config('app.url'), \PHP_URL_HOST) + ) { + throw new \RuntimeException(); + } + } catch (\Exception $e) { + $fail('Erreur lors de la validation du formulaire veuillez réssayer'); + } //end try + } + ] + ], [], ['g-recaptcha-response' => 'reCaptcha']); + } +} diff --git a/config/services.php b/config/services.php index 915dfe7a..745029db 100644 --- a/config/services.php +++ b/config/services.php @@ -30,4 +30,16 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'google' => [ + 'recaptcha' => [ + 'public' => env('GOOGLE_RECAPTCHA_PUBLIC'), + 'private' => env('GOOGLE_RECAPTCHA_PRIVATE'), + 'version' => env('GOOGLE_RECAPTCHA_VERSION', "3") === "3" ? true : false + ] + ], + + 'matomo' => [ + 'site_id' => env('MATOMO_SITE_ID') + ], + ]; diff --git a/resources/views/bo/engagements/form-inputs.blade.php b/resources/views/bo/engagements/form-inputs.blade.php index 90d04b1c..722b700c 100644 --- a/resources/views/bo/engagements/form-inputs.blade.php +++ b/resources/views/bo/engagements/form-inputs.blade.php @@ -32,8 +32,13 @@ $content = $engagement->content; @case(InputType::url()->value) @case(InputType::string()->value)
- - + @if($k === 'link') + + + @else + + + @endif
@break @case(InputType::text()->value) diff --git a/resources/views/front/auth/register.blade.php b/resources/views/front/auth/register.blade.php index 36e2d279..ec32365b 100644 --- a/resources/views/front/auth/register.blade.php +++ b/resources/views/front/auth/register.blade.php @@ -8,7 +8,7 @@ @section('content')
-
+ @csrf
@if ($errors->any()) @@ -79,20 +79,38 @@

+
@endsection + +@push('scripts') + +@endpush diff --git a/resources/views/front/contact/contact-form.blade.php b/resources/views/front/contact/contact-form.blade.php index 19053c07..bea672ae 100644 --- a/resources/views/front/contact/contact-form.blade.php +++ b/resources/views/front/contact/contact-form.blade.php @@ -1,4 +1,4 @@ -
+ @csrf

@@ -137,10 +137,11 @@ @if($errors->default->has('message')){{ implode('
', $errors->default->get('message')) }}
@endif

-

+

+
*{{ __('mandatory_fields') }} - -

+ +
@push('scripts') @@ -169,3 +170,20 @@ @endpush +@push('scripts') + +@endpush + diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php index 31e9bcc3..d084ec82 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc1.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && !empty($bloc['content']['link']['value'])) diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php index e2f186bf..8050f3ac 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc2.blade.php @@ -7,7 +7,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && !empty($bloc['content']['link']['value'])) diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php index aca59382..25b6da77 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc3.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && !empty($bloc['content']['link']['value'])) diff --git a/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php b/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php index eabd9ce5..5699d729 100644 --- a/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php +++ b/resources/views/front/onsengage/engageetresponsable/blocs/bloc4.blade.php @@ -5,7 +5,7 @@
{!! clean($bloc['content']['content']['value']) !!}
- @if($bloc['content']['link']['status']) + @if($bloc['content']['link']['status'] && !empty($bloc['content']['link']['value'])) diff --git a/resources/views/front/webldc-cn.blade.php b/resources/views/front/webldc-cn.blade.php index 939b7f63..c794bf39 100644 --- a/resources/views/front/webldc-cn.blade.php +++ b/resources/views/front/webldc-cn.blade.php @@ -21,18 +21,18 @@

Le site internet Le Gaulois utilise des cookies !

-

Nous utilisons des cookies pour nous assurer du bon fonctionnement de notre site et à des fins analytiques. - En poursuivant votre navigation sur ce site ou en fermant ce bandeau, vous consentez à l’utilisation de ces +

Nous utilisons des cookies pour nous assurer du bon fonctionnement de notre site et à des fins analytiques. + En poursuivant votre navigation sur ce site ou en fermant ce bandeau, vous consentez à l’utilisation de ces cookies.

-

Si vous refusez l'utilisation des cookies, vos informations ne seront pas suivies lors de votre visite sur ce site. Un cookie sera utilisé +

Si vous refusez l'utilisation des cookies, vos informations ne seront pas suivies lors de votre visite sur ce site. Un cookie sera utilisé dans votre navigateur afin de se souvenir de ne pas suivre vos préférences. Certaines fonctionnalités ne seront pas accessibles. Vous pouvez changer d’avis et modifier votre consentement à tout moment en revenant sur ce site. Pour en savoir plus sur les cookies que nous utilisons, consultez notre charte de confidentialité.

@@ -47,8 +47,8 @@

{{ __('Le respect de votre vie privée est notre priorité') }}

Les fonctionnalités de ce site s’appuient sur des services proposés par des tiers. Si vous acceptez, ces tiers déposeront des cookies qui vous permettront de visualiser sur le site du contenu hébergé par ces tiers. - Via ces cookies, ces tiers collecteront et utiliseront vos données de navigation pour des finalités qui leur sont propres, conformément - à leur politique de confidentialité (lien ci-dessous). Cette page vous permet de donner ou de retirer votre consentement, soit globalement + Via ces cookies, ces tiers collecteront et utiliseront vos données de navigation pour des finalités qui leur sont propres, conformément + à leur politique de confidentialité (lien ci-dessous). Cette page vous permet de donner ou de retirer votre consentement, soit globalement soit service par service.