From 21d09db477c079b67337c41a22a082ee51a20204 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Tue, 31 Mar 2020 23:10:29 +1000
Subject: [PATCH] add CCBot user agent

---
 gen_router.go      | 30 +++++++++++++++++-------------
 langs/english.json |  1 +
 router_gen/main.go |  5 ++++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/gen_router.go b/gen_router.go
index 816ef721..f44d42a1 100644
--- a/gen_router.go
+++ b/gen_router.go
@@ -620,10 +620,11 @@ var agentMapEnum = map[string]int{
 	"blexbot": 46,
 	"aspiegel": 47,
 	"mail_ru": 48,
-	"zgrab": 49,
-	"curl": 50,
-	"python": 51,
-	"go": 52,
+	"ccbot": 49,
+	"zgrab": 50,
+	"curl": 51,
+	"python": 52,
+	"go": 53,
 }
 var reverseAgentMapEnum = map[int]string{ 
 	0: "unknown",
@@ -675,10 +676,11 @@ var reverseAgentMapEnum = map[int]string{
 	46: "blexbot",
 	47: "aspiegel",
 	48: "mail_ru",
-	49: "zgrab",
-	50: "curl",
-	51: "python",
-	52: "go",
+	49: "ccbot",
+	50: "zgrab",
+	51: "curl",
+	52: "python",
+	53: "go",
 }
 var markToAgent = map[string]string{ 
 	"OPR": "opera",
@@ -730,6 +732,7 @@ var markToAgent = map[string]string{
 	"BLEXBot": "blexbot",
 	"AspiegelBot": "aspiegel",
 	"RU_Bot": "mail_ru",
+	"CCBot": "ccbot",
 	"zgrab": "zgrab",
 	"curl": "curl",
 	"python": "python",
@@ -785,10 +788,11 @@ var markToID = map[string]int{
 	"BLEXBot": 46,
 	"AspiegelBot": 47,
 	"RU_Bot": 48,
-	"zgrab": 49,
-	"curl": 50,
-	"python": 51,
-	"Go": 52,
+	"CCBot": 49,
+	"zgrab": 50,
+	"curl": 51,
+	"python": 52,
+	"Go": 53,
 }
 /*var agentRank = map[string]int{
 	"opera":9,
@@ -1160,7 +1164,7 @@ func (r *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			if strings.Contains(ua,"rv:11") {
 				agent = 6
 			}
-		case 49:
+		case 50:
 			r.SuspiciousRequest(req,"Vulnerability Scanner")
 		}
 		
diff --git a/langs/english.json b/langs/english.json
index 35e6d5a4..0baceb49 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -232,6 +232,7 @@
 		"blexbot":"BLEXBot",
 		"aspiegel":"Aspiegel",
 		"mail_ru":"Mail.ru bot",
+		"ccbot":"CCBot",
 		"zgrab":"Zgrab App Scanner",
 		"curl":"curl",
 		"python":"Python Bot",
diff --git a/router_gen/main.go b/router_gen/main.go
index 82f3ac3f..2f9a6cce 100644
--- a/router_gen/main.go
+++ b/router_gen/main.go
@@ -280,6 +280,7 @@ func main() {
 		"blexbot",
 		"aspiegel",
 		"mail_ru",
+		"ccbot",
 		"zgrab",
 		"curl",
 		"python",
@@ -343,6 +344,7 @@ func main() {
 		"BLEXBot",
 		"AspiegelBot",
 		"RU_Bot", // Mail.RU_Bot
+		"CCBot",
 		"zgrab",
 		"curl",
 		"python",
@@ -390,7 +392,7 @@ func main() {
 		"Facebot":             "facebook",
 		"Applebot":            "apple",
 		"Discourse":           "discourse",
-		"mattermost":"mattermost",
+		"mattermost":          "mattermost",
 		"ia_archiver":         "alexa",
 
 		"SemrushBot":  "semrush",
@@ -401,6 +403,7 @@ func main() {
 		"BLEXBot":     "blexbot",
 		"AspiegelBot": "aspiegel",
 		"RU_Bot":      "mail_ru", // Mail.RU_Bot
+		"CCBot":       "ccbot",
 		"zgrab":       "zgrab",
 		"curl":        "curl",
 		"python":      "python",