Source Format Enforcement (#763)

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

diff --git a/src/log/Config.cc b/src/log/Config.cc
index 37dc7e5a5fe97b2c0d8b4129668ca32990d287bf..24b93ad2bc4679e03d1313a1ebc3942c1654dca5 100644 (file)
--- a/src/log/Config.cc
+++ b/src/log/Config.cc
@@ -1,6 +1,16 @@
+/*
+ * Copyright (C) 1996-2021 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"
+#include "Debug.h"
 #include "log/Config.h"
-#include "protos.h"
 
 Log::LogConfig Log::TheConfig;
 
@@ -9,19 +19,44 @@ Log::LogConfig::parseFormats()
 {
     char *name, *def;
 
-    if ((name = strtok(NULL, w_space)) == NULL)
+    if (!(name = ConfigParser::NextToken())) {
+        debugs(3, DBG_CRITICAL, "FATAL: missing logformat details in " << cfg_filename << " line " << config_lineno);
         self_destruct();
+        return;
+    }
 
-    if ((def = strtok(NULL, "\r\n")) == NULL) {
-        self_destruct();
+    // 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;
     }
 
-    debugs(3, 2, "Log Format for '" << name << "' is '" << def << "'");
+    // 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())) {
+        delete nlf;
+        self_destruct();
+        return;
+    }
+    ConfigParser::DisableMacros();
+
+    debugs(3, 2, "Log Format for '" << name << "' is '" << def << "'");
+
     if (!nlf->parse(def)) {
+        delete nlf;
         self_destruct();
         return;
     }
@@ -30,3 +65,4 @@ Log::LogConfig::parseFormats()
     nlf->next = logformats;
     logformats = nlf;
 }
+