Uses unique_ptr on REMOTE_USER

Author: zimmerle

headers/modsecurity/transaction.h

@@ -625,8 +625,6 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa
 
     int m_secRuleEngine;
 
-    std::string m_variableRemoteUser;
-
  private:
     /**
      * Pointer to the callback function that will be called to fill

src/transaction.cc

@@ -187,7 +187,6 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, void *logCbData)
     m_json(NULL),
 #endif
     m_secRuleEngine(RulesSetProperties::PropertyNotSetRuleEngine),
-    m_variableRemoteUser(""),
     m_logCbData(logCbData),
     TransactionAnchoredVariables(this),
     TransactionRuleMessageManagement(this) {
@@ -253,7 +252,6 @@ Transaction::Transaction(ModSecurity *ms, RulesSet *rules, char *id, void *logCb
     m_json(NULL),
 #endif
     m_secRuleEngine(RulesSetProperties::PropertyNotSetRuleEngine),
-    m_variableRemoteUser(""),
     m_logCbData(logCbData),
     TransactionAnchoredVariables(this),
     TransactionRuleMessageManagement(this) {
@@ -1467,14 +1465,8 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename,
        m_variableRequestHeaders.resolveFirst("Host").get())
         << " ";
     ss << utils::string::dash_if_empty(this->m_clientIpAddress->c_str()) << " ";
-    /** TODO: Check variable */
-    variables::RemoteUser *r = new variables::RemoteUser("REMOTE_USER");
-    VariableValues l;
-    r->evaluate(this, &l);
-    delete r;
 
-    ss << utils::string::dash_if_empty(
-        m_variableRemoteUser.c_str());
+    ss << utils::string::dash_if_empty(variables::RemoteUser::parserRemoteUser(this).first.c_str());
     ss << " ";
     /** TODO: Check variable */
     //ss << utils::string::dash_if_empty(

src/variables/remote_user.cc

@@ -30,45 +30,22 @@
 #include <memory>
 
 #include "modsecurity/transaction.h"
-#include "src/utils/base64.h"
+
 
 namespace modsecurity {
 namespace variables {
 
 
+
 void RemoteUser::evaluate(Transaction *transaction,
     VariableValues *l) {
-    size_t pos;
-    std::string base64;
-    std::string header;
-
-    VariableValues l2;
-    transaction->m_variableRequestHeaders.resolve("authorization", &l2);
-
-    if (l2.size() < 1) {
-        return;
-    }
-
-    header = std::string(l2.at(0)->getValue());
-
-    if (header.compare(0, 6, "Basic ") == 0) {
-        base64 = std::string(header, 6, header.length());
-    }
-
-    base64 = Utils::Base64::decode(base64);
-
-    pos = base64.find(":");
-    if (pos == std::string::npos) {
-        return;
-    }
-    transaction->m_variableRemoteUser.assign(std::string(base64, 0, pos));
 
-    const std::string name = l2[0]->getName();
-    auto var = std::make_shared<VariableValue>(&name, &transaction->m_variableRemoteUser);
+    auto userName = parserRemoteUser(transaction);
+    auto var = std::make_shared<VariableValue>(
+        std::unique_ptr<std::string>(new std::string(userName.first)),
+        &m_retName);
+    var->addOrigin(userName.second);
 
-    for (auto &i : l2[0]->getOrigin()) {
-        var->addOrigin(i);
-    }
     l->push_back(std::move(var));
 }
 

src/variables/remote_user.h

@@ -23,6 +23,7 @@
 #define SRC_VARIABLES_REMOTE_USER_H_
 
 #include "src/variables/variable.h"
+#include "src/utils/base64.h"
 
 namespace modsecurity {
 
@@ -38,6 +39,38 @@ class RemoteUser : public Variable {
 
     void evaluate(Transaction *transaction,
         VariableValues *l) override;
+
+    static std::pair<std::string, VariableOrigin> parserRemoteUser(Transaction *transaction) {
+        size_t pos;
+        std::string base64;
+        std::string header;
+
+        VariableValues l2;
+        transaction->m_variableRequestHeaders.resolve("authorization", &l2);
+
+        if (l2.size() < 1) {
+            goto err;
+        }
+
+        header = std::string(l2.at(0)->getValue());
+
+        if (header.compare(0, 6, "Basic ") == 0) {
+            base64 = std::string(header, 6, header.length());
+        }
+
+        base64 = Utils::Base64::decode(base64);
+
+        pos = base64.find(":");
+        if (pos == std::string::npos) {
+            goto err;
+        }
+
+        return std::make_pair(std::string(base64, 0, pos), l2[0]->getOrigin()[0]);
+err:
+        return std::make_pair(std::string(""), VariableOrigin());
+
+    }
+
     std::string m_retName;
 };