From ed0420e635fb904d6df1c77614e061329739608e Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sun, 6 Jan 2019 03:22:15 +0100
Subject: [PATCH] Update of WAF script for Cloudfront

---
 lib/core/settings.py | 2 +-
 txt/checksum.md5     | 4 ++--
 waf/cloudfront.py    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 933e074c8..d00bd630f 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.1.4"
+VERSION = "1.3.1.5"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index a4edec0bd..06228f886 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -49,7 +49,7 @@ fe370021c6bc99daf44b2bfc0d1effb3  lib/core/patch.py
 9a7d68d5fa01561500423791f15cc676  lib/core/replication.py
 3179d34f371e0295dd4604568fb30bcd  lib/core/revision.py
 d6269c55789f78cf707e09a0f5b45443  lib/core/session.py
-8d07fc2ad855c7c9175f80a0f1cbfddd  lib/core/settings.py
+a7b1cd71be4ae51360d0d01293271e66  lib/core/settings.py
 a8a7501d1e6b21669b858a62e921d191  lib/core/shell.py
 5dc606fdf0afefd4b305169c21ab2612  lib/core/subprocessng.py
 eec3080ba5baca44c6de4595f1c92a0d  lib/core/target.py
@@ -414,7 +414,7 @@ ef8c5db49ad9973b59d6b9b65b001714  waf/blockdos.py
 a05edf8f2962dfff0457b7a4fd5e169c  waf/ciscoacexml.py
 af079de99a8ec6988d28aa4c0aa32cf9  waf/cloudbric.py
 8fec83056c8728076ab17ab3a2ebbe7b  waf/cloudflare.py
-5672c1ae038dcfc523a6d82d9875025c  waf/cloudfront.py
+8414f766b0171fbc264c46ad40dff237  waf/cloudfront.py
 847ee97f6e0f8aeec61afd3e0c91543b  waf/comodo.py
 f7571543ccb671a63a8139e375d6a4f2  waf/crawlprotect.py
 f20b14ca9f7c2442fd1e9432d933a75b  waf/datapower.py
diff --git a/waf/cloudfront.py b/waf/cloudfront.py
index 081c97502..46474c489 100644
--- a/waf/cloudfront.py
+++ b/waf/cloudfront.py
@@ -15,9 +15,10 @@ def detect(get_page):
     retval = False
 
     for vector in WAF_ATTACK_VECTORS:
-        _, headers, _ = get_page(get=vector)
+        page, headers, _ = get_page(get=vector)
 
         retval = re.search(r"Error from cloudfront", headers.get("X-Cache", ""), re.I) is not None
+        retval |= all(_ in (page or "") for _ in ("Generated by cloudfront", "Request blocked"))
 
         if retval:
             break