From 2c771f394697503170086d1e164bb75ffb3ac8d1 Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Tue, 28 May 2024 13:50:55 +0200
Subject: [PATCH] Improves detection for Cloudflare bots (#7699)

* Adds detection for Cloudflare Smart Transit
* Adds detection for Cloudflare Observatory
ref #7697
---
 Tests/fixtures/bots.yml | 27 +++++++++++++++++++++++++++
 regexes/bots.yml        | 16 ++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/Tests/fixtures/bots.yml b/Tests/fixtures/bots.yml
index b9278f8367..3648ef63cb 100644
--- a/Tests/fixtures/bots.yml
+++ b/Tests/fixtures/bots.yml
@@ -7688,3 +7688,30 @@
     name: ducks.party
     category: Security Checker
     url: https://ducks.party/
+-
+  user_agent: Mozilla/5.0 (compatible; Cloudflare-Smart-Transit/1.0; +https://www.cloudflare.com/
+  bot:
+    name: Cloudflare Smart Transit
+    category: Site Monitor
+    url: https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; Moto G Power (2022)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Mobile Safari/537.36 CloudflareObservatory/1.0
+  bot:
+    name: Cloudflare Observatory
+    category: Site Monitor
+    url: https://developers.cloudflare.com/speed/speed-test/run-speed-test
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
+-
+  user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36 CloudflareObservatory/1.0
+  bot:
+    name: Cloudflare Observatory
+    category: Site Monitor
+    url: https://developers.cloudflare.com/speed/speed-test/run-speed-test
+    producer:
+      name: CloudFlare
+      url: https://www.cloudflare.com/
diff --git a/regexes/bots.yml b/regexes/bots.yml
index f5ef176a3b..8019d92a90 100644
--- a/regexes/bots.yml
+++ b/regexes/bots.yml
@@ -384,6 +384,22 @@
     name: 'CloudFlare'
     url: 'https://www.cloudflare.com/'
 
+- regex: 'Cloudflare-Smart-Transit'
+  name: 'Cloudflare Smart Transit'
+  category: 'Site Monitor'
+  url: 'https://developers.cloudflare.com/fundamentals/reference/cloudflare-site-crawling/'
+  producer:
+    name: 'CloudFlare'
+    url: 'https://www.cloudflare.com/'
+
+- regex: 'CloudflareObservatory'
+  name: 'Cloudflare Observatory'
+  category: 'Site Monitor'
+  url: 'https://developers.cloudflare.com/speed/speed-test/run-speed-test'
+  producer:
+    name: 'CloudFlare'
+    url: 'https://www.cloudflare.com/'
+
 - regex: 'https://developers\.cloudflare\.com/security-center/'
   name: 'Cloudflare Security Insights'
   category: 'Site Monitor'