Process open sockets on Linux was added '['

osquery/tables/networking/linux/process_open_sockets.cpp

@@ -61,13 +61,17 @@ unsigned short portFromHex(const std::string &encoded_port) {
   return decoded;
 }
 
-void genSocketsFromProc(const std::map<std::string, std::string> &socket_inodes,
+void genSocketsFromProc(const std::map<std::string, std::string> &inodes,
                         int protocol,
                         int family,
                         QueryData &results) {
   std::string path = "/proc/net/";
+  if (family == AF_UNIX) {
+    path += "unix";
+  } else {
     path += kLinuxProtocolNames.at(protocol);
     path += (family == AF_INET6) ? "6" : "";
+  }
 
   std::string content;
   if (!osquery::readFile(path, content).ok()) {
@@ -78,10 +82,10 @@ void genSocketsFromProc(const std::map<std::string, std::string> &socket_inodes,
   // The system's socket information is tokenized by line.
   size_t index = 0;
   for (const auto &line : osquery::split(content, "\n")) {
-    index += 1;
-    if (index == 1) {
+    if (++index == 1) {
       // The first line is a textual header and will be ignored.
-      if (line.find("sl") != 0) {
+      if (line.find("sl") != 0 && line.find("sk") != 0 &&
+          line.find("Num") != 0) {
         // Header fields are unknown, stop parsing.
         break;
       }
@@ -90,11 +94,25 @@ void genSocketsFromProc(const std::map<std::string, std::string> &socket_inodes,
 
     // The socket information is tokenized by spaces, each a field.
     auto fields = osquery::split(line, " ");
-    if (fields.size() < 10) {
+    // UNIX socket reporting has a smaller number of fields.
+    size_t min_fields = (family == AF_UNIX) ? 7 : 10;
+    if (fields.size() < min_fields) {
       // Unknown/malformed socket information.
       continue;
     }
 
+
+    Row r;
+    if (family == AF_UNIX) {
+      r["socket"] = fields[6];
+      r["family"] = "0";
+      r["protocol"] = fields[2];
+      r["local_address"] = "";
+      r["local_port"] = "0";
+      r["remote_address"] = "";
+      r["remote_port"] = "0";
+      r["path"] = (fields.size() >= 8) ? fields[7] : "";
+    } else {
       // Two of the fields are the local/remote address/port pairs.
       auto locals = osquery::split(fields[1], ":");
       auto remotes = osquery::split(fields[2], ":");
@@ -103,7 +121,6 @@ void genSocketsFromProc(const std::map<std::string, std::string> &socket_inodes,
         continue;
       }
 
-    Row r;
       r["socket"] = fields[9];
       r["family"] = INTEGER(family);
       r["protocol"] = INTEGER(protocol);
@@ -111,9 +128,12 @@ void genSocketsFromProc(const std::map<std::string, std::string> &socket_inodes,
       r["local_port"] = INTEGER(portFromHex(locals[1]));
       r["remote_address"] = addressFromHex(remotes[0], family);
       r["remote_port"] = INTEGER(portFromHex(remotes[1]));
+      // Path is only used for UNIX domain sockets.
+      r["path"] = "";
+    }
 
-    if (socket_inodes.count(r["socket"]) > 0) {
-      r["pid"] = socket_inodes.at(r["socket"]);
+    if (inodes.count(r["socket"]) > 0) {
+      r["pid"] = inodes.at(r["socket"]);
     } else {
       r["pid"] = "-1";
     }
@@ -139,9 +159,9 @@ QueryData genOpenSockets(QueryContext &context) {
     std::map<std::string, std::string> descriptors;
     if (osquery::procDescriptors(process, descriptors).ok()) {
       for (const auto& fd : descriptors) {
-        if (fd.second.find("socket:") != std::string::npos) {
-          // See #792: std::regex is incomplete until GCC 4.9
-          auto inode = fd.second.substr(fd.second.find("socket:") + 8);
+        if (fd.second.find("socket:[") == 0) {
+          // See #792: std::regex is incomplete until GCC 4.9 (skip 8 chars)
+          auto inode = fd.second.substr(8);
           socket_inodes[inode.substr(0, inode.size() - 1)] = process;
         }
       }
@@ -155,6 +175,7 @@ QueryData genOpenSockets(QueryContext &context) {
     genSocketsFromProc(socket_inodes, protocol.first, AF_INET6, results);
   }
 
+  genSocketsFromProc(socket_inodes, IPPROTO_IP, AF_UNIX, results);
   return results;
 }
 }

osquery/tables/system/darwin/process_open_descriptors.cpp

@@ -103,11 +103,13 @@ void genSocketDescriptor(int pid, int descriptor, QueryData &results) {
                      PROC_PIDFDSOCKETINFO_SIZE) <= 0) {
     return;
   }
-  if (si.psi.soi_kind == SOCKINFO_IN || si.psi.soi_kind == SOCKINFO_TCP) {
+
+  if (si.psi.soi_family == AF_INET || si.psi.soi_family == AF_INET6) {
     Row r;
 
     r["pid"] = INTEGER(pid);
     r["socket"] = INTEGER(descriptor);
+    r["path"] = "";
 
     // Darwin/OSX SOCKINFO_TCP is not IPPROTO_TCP
     if (si.psi.soi_kind == SOCKINFO_TCP) {
@@ -125,6 +127,29 @@ void genSocketDescriptor(int pid, int descriptor, QueryData &results) {
 
     parseNetworkSocket(si, r);
     results.push_back(r);
+  } else if (si.psi.soi_family == AF_UNIX) {
+    Row r;
+
+    r["pid"] = INTEGER(pid);
+    r["socket"] = INTEGER(descriptor);
+    r["family"] = "0";
+    r["protocol"] = "0";
+    r["local_address"] = "";
+    r["local_port"] = "0";
+    r["remote_address"] = "";
+    r["remote_port"] = "0";
+    if ((char *)si.psi.soi_proto.pri_un.unsi_addr.ua_sun.sun_path != nullptr) {
+      r["path"] = si.psi.soi_proto.pri_un.unsi_addr.ua_sun.sun_path;
+    } else {
+      r["path"] = "";
+    }
+    results.push_back(r);
+  } else if (si.psi.soi_family == AF_APPLETALK) {
+    // AF_APPLETALK = 17
+  } else if (si.psi.soi_family == AF_NATM) {
+    // AF_NATM = 32
+  } else {
+    // Unsupported socket type.
   }
 }
 

specs/process_open_sockets.table

@@ -9,6 +9,7 @@ schema([
     Column("remote_address", TEXT, "Socket remote address"),
     Column("local_port", INTEGER, "Socket local port"),
     Column("remote_port", INTEGER, "Socket remote port"),
+    Column("path", TEXT, "For UNIX sockets (family=AF_UNIX), the domain path"),
 ])
 implementation("system/process_open_sockets@genOpenSockets")
 examples([