Source Format Enforcement (#532)

[thirdparty/squid.git] / src / log / Config.cc

diff --git a/src/log/Config.cc b/src/log/Config.cc
index bb0a872b75d60ad91c9246fb7b29b5cf0930377d..f06a06a13a0dc4e2e476436b68b25db52e0662fb 100644 (file)
--- a/src/log/Config.cc
+++ b/src/log/Config.cc
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #include "squid.h"
 #include "cache_cf.h"
 #include "ConfigParser.h"
@@ -11,13 +19,35 @@ Log::LogConfig::parseFormats()
 {
     char *name, *def;
 
-    if ((name = ConfigParser::NextToken()) == NULL)
+    if (!(name = ConfigParser::NextToken())) {
+        debugs(3, DBG_CRITICAL, "FATAL: missing logformat details in " << cfg_filename << " line " << config_lineno);
         self_destruct();
+        return;
+    }
+
+    // check for re-definition of built-in formats
+    if (strcmp(name, "squid") == 0 ||
+            strcmp(name, "common") == 0 ||
+            strcmp(name, "combined") == 0 ||
+            strcmp(name, "useragent") == 0 ||
+            strcmp(name, "referrer") == 0) {
+        debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "ERROR: logformat " << name << " is already defined. Ignoring.");
+        return;
+    }
+
+    // check for re-definition of custom formats
+    for (auto i = logformats; i ; i = i->next) {
+        if (strcmp(i->name, name) == 0) {
+            debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "ERROR: logformat " << name << " is already defined. Ignoring.");
+            return;
+        }
+    }
 
     ::Format::Format *nlf = new ::Format::Format(name);
 
     ConfigParser::EnableMacros();
-    if ((def = ConfigParser::NextQuotedOrToEol()) == NULL) {
+    if (!(def = ConfigParser::NextQuotedOrToEol())) {
+        delete nlf;
         self_destruct();
         return;
     }
@@ -26,6 +56,7 @@ Log::LogConfig::parseFormats()
     debugs(3, 2, "Log Format for '" << name << "' is '" << def << "'");
 
     if (!nlf->parse(def)) {
+        delete nlf;
         self_destruct();
         return;
     }
@@ -34,3 +65,4 @@ Log::LogConfig::parseFormats()
     nlf->next = logformats;
     logformats = nlf;
 }
+