Log calling SUDO_USER or PKEXEC_UID in history.log

[apt.git] / apt-pkg / deb / dpkgpm.cc

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 7355af9d507246205f202ff65bc3195b860ee1b0..e94a8cfdc3be40e3dcd5aab63887dc3f32715af5 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -48,12 +48,28 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <sstream>
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 using namespace std;
 
+APT_PURE static string
+AptHistoryUser()
+{
+   stringstream out;
+   const char* env[]{"SUDO_USER", "PKEXEC_UID", nullptr};
+   for (int i=0; env[i] != nullptr; i++)
+   {
+      if (getenv(env[i]) != nullptr)
+      {
+         out << env[i] << "=" << getenv(env[i]) << " ";
+      }
+   }
+   return out.str();
+}
+
 APT_PURE static unsigned int
 EnvironmentSize()
 {
@@ -876,6 +892,8 @@ bool pkgDPkgPM::OpenLog()
       }
       if (_config->Exists("Commandline::AsString") == true)
         WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
+      if (AptHistoryUser() != "")
+         WriteHistoryTag("Requested-By", AptHistoryUser());
       WriteHistoryTag("Install", install);
       WriteHistoryTag("Reinstall", reinstall);
       WriteHistoryTag("Upgrade", upgrade);
@@ -1194,7 +1212,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
    std::vector<const char *> Args(sArgs.size(), NULL);
    std::transform(sArgs.begin(), sArgs.end(), Args.begin(),
         [](std::string const &s) { return s.c_str(); });
-   unsigned long long const StartSize = std::accumulate(sArgs.begin(), sArgs.end(), 0,
+   unsigned long long const StartSize = std::accumulate(sArgs.begin(), sArgs.end(), 0llu,
         [](unsigned long long const i, std::string const &s) { return i + s.length(); });
    size_t const BaseArgs = Args.size();