From 41b4fbd1e3b240b73d6358321225393b50dd45dc Mon Sep 17 00:00:00 2001 From: Olivier Bieler Date: Tue, 19 Nov 2019 12:51:08 +0100 Subject: [PATCH] Add WAF Cloudflare custom error pages (#86) * prepare custom pages for Cloudflare * add Ray ID * use errors folder * remove <--Main--> comment * remove other comment Main.. * insert full js inline with a variable to avoid errors * add vendors css * add meta viewport and favicons * add meta viewport and favicons in cf-block --- grunt/compile-handlebars.js | 26 ++++++++++ grunt/cssmin.js | 9 ++++ src/errors/cf-waf-block.html | 76 ++++++++++++++++++++++++++++ src/errors/cf-waf-challenge.html | 78 +++++++++++++++++++++++++++++ src/includes/full/head.html | 5 +- src/includes/partials/favicons.html | 4 ++ 6 files changed, 194 insertions(+), 4 deletions(-) create mode 100644 src/errors/cf-waf-block.html create mode 100644 src/errors/cf-waf-challenge.html create mode 100644 src/includes/partials/favicons.html diff --git a/grunt/compile-handlebars.js b/grunt/compile-handlebars.js index 6959a97..c61ddbc 100644 --- a/grunt/compile-handlebars.js +++ b/grunt/compile-handlebars.js @@ -5,6 +5,9 @@ 'use strict'; +const fs = require('fs'); +const path = require('path'); + module.exports = { includes: { files: [{ @@ -20,6 +23,29 @@ module.exports = { YEAR: (new Date()).getFullYear().toString() }] }, + errors: { + files: [{ + cwd: 'src/errors', + expand: true, + src: '*.html', + dest: 'release/errors', + ext: '.html' + }], + partials: [ + 'src/includes/partials/*.html', + 'src/includes/full/*.html', + 'tmp/css/*.css' + ], + globals: [{ + VERSION: '<%= pkg.version %>', + YEAR: (new Date()).getFullYear().toString(), + FULL_JS: function () { + return fs.readFileSync( + path.join(__dirname, '/../dist/js/elements.min.js'), 'utf-8' + ); + } + }] + }, download: { files: [{ cwd: 'src', diff --git a/grunt/cssmin.js b/grunt/cssmin.js index 40dd507..8c713f6 100644 --- a/grunt/cssmin.js +++ b/grunt/cssmin.js @@ -6,6 +6,15 @@ 'use strict'; module.exports = { + tmpCloudflare: { + files: { + 'tmp/css/css-elements-for-cloudflare-custom-pages.min.css': [ + 'tmp/css/base.css', + 'tmp/css/vendors.min.css', + 'src/css/utilities.css' + ] + } + }, dist: { files: { 'dist/css/elements.min.css': [ diff --git a/src/errors/cf-waf-block.html b/src/errors/cf-waf-block.html new file mode 100644 index 0000000..58272e6 --- /dev/null +++ b/src/errors/cf-waf-block.html @@ -0,0 +1,76 @@ + + + + + Blocked - EPFL + + + {{> favicons}} + + + + + +
+ + {{> access-nav-en }} + +
+ {{> logo }} +
+ +
+ +
+ +
+
+
+

Sorry, you have been blocked

+
+

You are unable to access epfl.ch.

+
+
Why have I been blocked?
+
+

This website is using a security service to protect itself from online attacks. The action you just performed triggered the security solution. There are several actions that could trigger this block including submitting a certain word or phrase, a SQL command or malformed data.

+
+
What can I do to resolve this?
+
+

You can contact 1234@epfl.ch and send the following Ray ID: ::RAY_ID::.

+
+
+
+
+ +
+
+ {{> footer-light-en }} +
+
+ +
+ + + + + + + + diff --git a/src/errors/cf-waf-challenge.html b/src/errors/cf-waf-challenge.html new file mode 100644 index 0000000..6c80865 --- /dev/null +++ b/src/errors/cf-waf-challenge.html @@ -0,0 +1,78 @@ + + + + + Challenge CAPTCHA required - EPFL + + + {{> favicons}} + + + + + +
+ + {{> access-nav-en }} + +
+ {{> logo }} +
+ +
+ +
+ +
+
+
+

One more step

+
+

Please complete the security check to access epfl.ch or contact 1234@epfl.ch by transmitting the following Ray ID: ::RAY_ID::.

+ ::CAPTCHA_BOX:: +
+
Why do I have to complete a CAPTCHA?
+
+

Completing the CAPTCHA proves you are a human and gives you temporary access to the web property.

+
+
What can I do to prevent this in the future?
+
+

If you are on a personal connection, like at home, you can run an anti-virus scan on your device to make sure it is not infected with malware.

+

If you are at an office or shared network, you can ask the network administrator to run a scan across the network looking for misconfigured or infected devices.

+
+
+
+
+ +
+
+ {{> footer-light-en }} +
+
+ +
+ + + + + + + + diff --git a/src/includes/full/head.html b/src/includes/full/head.html index fef5dde..43aef0b 100644 --- a/src/includes/full/head.html +++ b/src/includes/full/head.html @@ -1,10 +1,7 @@ - - - - +{{> favicons }} diff --git a/src/includes/partials/favicons.html b/src/includes/partials/favicons.html new file mode 100644 index 0000000..3d06fc5 --- /dev/null +++ b/src/includes/partials/favicons.html @@ -0,0 +1,4 @@ + + + +