Fixed CSP
This commit is contained in:
Jérémy Munsch 2022-09-29 13:33:04 +02:00
parent a43a840d4b
commit d538d98bd3
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
10 changed files with 34 additions and 42 deletions

View file

@ -44,7 +44,7 @@ class SecureHeaders
// phpcs:ignore Generic.Files.LineLength.TooLong
"style-src 'self' $cssDev https://fonts.googleapis.com;",
// phpcs:ignore Generic.Files.LineLength.TooLong
"script-src 'self' $jsDev https://fonts.googleapis.com;"
"script-src 'self' $jsDev https://fonts.googleapis.com https://www.googletagmanager.com;"
];
$response->headers->set(
'Content-Security-Policy',

19
package-lock.json generated
View file

@ -4,10 +4,6 @@
"requires": true,
"packages": {
"": {
"name": "bogt",
"dependencies": {
"sweetalert2": "^11.4.20"
},
"devDependencies": {
"@lighting-beetle/glider-js": "^1.8.2",
"@popperjs/core": "^2.11.5",
@ -24,6 +20,7 @@
"resolve-url-loader": "^5.0.0",
"sass": "1.32.13",
"sass-loader": "^8.0.2",
"sweetalert2": "^11.4.35",
"vue": "^2.6.14",
"vue-template-compiler": "^2.6.14"
}
@ -8454,9 +8451,10 @@
}
},
"node_modules/sweetalert2": {
"version": "11.4.20",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz",
"integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew==",
"version": "11.4.35",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.35.tgz",
"integrity": "sha512-nifH7Hd8oSIO8qf6GHhob6xZK2KoX7+EalTFm3nHshdQ38TY/r0m/QiuJCDL0cTGbRhzMWL7WYBSA3fjnh+F1g==",
"dev": true,
"funding": {
"type": "individual",
"url": "https://sweetalert2.github.io/#donations"
@ -15709,9 +15707,10 @@
}
},
"sweetalert2": {
"version": "11.4.20",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.20.tgz",
"integrity": "sha512-3LiBFa5yRmTcqM0vGcFmo0EnhmaMSJfzhFpvZoXK6BOY94HIcIUbwhhW+NY5oXOpz5CT21qFAu0fKCUkOc/Pew=="
"version": "11.4.35",
"resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.35.tgz",
"integrity": "sha512-nifH7Hd8oSIO8qf6GHhob6xZK2KoX7+EalTFm3nHshdQ38TY/r0m/QiuJCDL0cTGbRhzMWL7WYBSA3fjnh+F1g==",
"dev": true
},
"tapable": {
"version": "2.2.1",

View file

@ -25,10 +25,8 @@
"resolve-url-loader": "^5.0.0",
"sass": "1.32.13",
"sass-loader": "^8.0.2",
"sweetalert2": "^11.4.35",
"vue": "^2.6.14",
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
"sweetalert2": "^11.4.20"
}
}

View file

@ -1,5 +1,5 @@
// ES6 Modules or TypeScript
import Swal from 'sweetalert2'
import Swal from 'sweetalert2/dist/sweetalert2.js'
document.addEventListener('DOMContentLoaded', () => {
if (document.getElementsByClassName('oldEgg').length) {

View file

@ -45,3 +45,8 @@ body {
}
}
.egg-alert {
margin-top:10px;
margin-bottom:10px;
}

View file

@ -1,3 +1,5 @@
@import 'sweetalert2/dist/sweetalert2.css';
.swal2-confirm {
border-radius: 0 !important;
box-shadow: 0px 5px 5px #00000069 !important;
@ -8,4 +10,4 @@
text-decoration: none;
font-family: MyriadProBold;
}
}
}

View file

@ -1,15 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
<symbol id="check-circle-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
</symbol>
<symbol id="info-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</symbol>
<symbol id="exclamation-triangle-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
</symbol>
</svg>
@if ($message = Session::get('success'))
<div class="alert alert-success d-flex align-items-center alert-dismissible fade show" role="alert">
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Success:"><use xlink:href="#check-circle-fill"/></svg>

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

@ -12,7 +12,7 @@
<p>Erreur</p>
<p>Ne mettez pas tous vos oeufs dans le même panier ! :)</p>
</div>
<div class="body" style="margin-top:10px; margin-bottom:10px;">
<div class="body egg-alert">
<img class="img-fluid" src="{{ asset('assets/images/egg/generique.jpg') }}" alt="Élevage">
<p class="message blue">Nous n'avons pu retrouver l'éleveur concerné par votre boite.</p>
<p></p>

View file

@ -5,9 +5,21 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ __('Autorisation nécessaire') }}</title>
<style @if(isset($nonce)) nonce="{{ $nonce }}" @endif>
.h-title {
padding: 1rem;
background-color: rgb(153, 153, 153);
color: #FFF;
position: absolute;
top:50%;
left: 50%;
transform:translateX(-50%)
translateY(-50%);
}
</style>
</head>
<body>
<h2 style="padding: 1rem; background-color: rgb(153, 153, 153); color: #FFF; position: absolute; top:50%; left: 50%; transform:translateX(-50%) translateY(-50%);">
<h2 class="h-title ">
{{__("Vous devez autoriser les cookies '".request()->type."' pour visualiser cet élément") }}
</h2>
</body>

View file

@ -1,15 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
<symbol id="check-circle-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
</symbol>
<symbol id="info-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</symbol>
<symbol id="exclamation-triangle-fill" fill="currentColor" viewBox="0 0 16 16">
<path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
</symbol>
</svg>
@if ($message = Session::get('success'))
<div class="row justify-content-center">
<div class="col col-md-10 mt-3">

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB