refactor!

Author: edef1c

binding.cc

@@ -1,72 +1,33 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#if __APPLE__ || __FreeBSD__
-#include <sys/ucred.h>
-#include <sys/un.h>
-#include <sys/proc_info.h>  // for struct proc_bsdshortinfo
-#include <libproc.h>        // for proc_pidinfo()
-#endif
+#include "credentials.hh"
 #include <nan.h>
 
-using v8::FunctionTemplate;
-
 NAN_METHOD(FromFd) {
   auto fd = Nan::To<int>(info[0]).FromJust();
-
-
   auto ret = Nan::New<v8::Object>();
   info.GetReturnValue().Set(ret);
-#define SET_RETVAL(key, value) Nan::Set(ret, Nan::New(#key).ToLocalChecked(), Nan::New(value))
-
-
-#if defined(SO_PEERCRED)
-  struct ucred creds;
-  socklen_t creds_len = sizeof creds;
-  int fail = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &creds_len);
-#elif defined(LOCAL_PEERCRED) && defined(LOCAL_PEERPID)
-#define USE_PROC
-  struct proc_bsdshortinfo proc;
+#define SET_RETVAL(key, value) Nan::Set(ret, Nan::New(key).ToLocalChecked(), Nan::New(value))
 
-  struct {
-    pid_t pid;
-    uid_t uid;
-  } creds;
+  Credentials creds;
+  if (!creds.Init(fd)) {
+    SET_RETVAL("errno", errno);
+    return;
+  }
 
-  struct xucred xcreds;
-  socklen_t xcreds_len = sizeof xcreds;
-  int fail = getsockopt(fd, SOL_LOCAL, LOCAL_PEERCRED, &xcreds, &xcreds_len);
-  if (!fail) {
-    assert(xcreds.cr_version == XUCRED_VERSION);
-    creds.uid = xcreds.cr_uid;
+  SET_RETVAL("pid", creds.GetPid());
+  SET_RETVAL("uid", creds.GetUid());
+  SET_RETVAL("gid", creds.GetGid());
 
-    socklen_t pid_len = sizeof creds.pid;
-    fail = getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &creds.pid, &pid_len);
-  }
-  if (!fail) {
-    fail = proc_pidinfo(creds.pid, PROC_PIDT_SHORTBSDINFO, 1, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) == 0;
-  }
-#else
-#error "unsupported platform"
+#ifdef CREDENTIALS_HAS_PPID
+  SET_RETVAL("ppid", creds.GetPpid());
 #endif
-
-  if (fail) {
-    SET_RETVAL(errno, errno);
-  } else {
-    SET_RETVAL(pid, creds.pid);
-    SET_RETVAL(uid, creds.uid);
-#ifdef USE_PROC
-    SET_RETVAL(ppid, proc.pbsi_ppid);
-    SET_RETVAL(pgid, proc.pbsi_pgid);
-    SET_RETVAL(gid, proc.pbsi_gid);
-#else
-    SET_RETVAL(gid, creds.gid);
+#ifdef CREDENTIALS_HAS_PGID
+  SET_RETVAL("pgid", creds.GetPgid());
 #endif
-  }
 }
 
 NAN_MODULE_INIT(Init) {
   Nan::Set(target, Nan::New("fromFd").ToLocalChecked(),
-    Nan::GetFunction(Nan::New<FunctionTemplate>(FromFd)).ToLocalChecked());
+    Nan::GetFunction(Nan::New<v8::FunctionTemplate>(FromFd)).ToLocalChecked());
 }
 
 NODE_MODULE(NativeExtension, Init)

binding.gyp

@@ -3,10 +3,26 @@
   "targets": [
     {
       "target_name": "binding",
-      "sources": [ "binding.cc" ],
       "include_dirs": [
         "<!(node -e \"require('nan')\")"
       ],
+      "sources": [
+        "binding.cc",
+        "credentials_linux.cc",
+        "credentials_osx.cc"
+      ],
+      "conditions": [
+        [ 'OS != "linux"', {
+          "sources!": [
+            "credentials_linux.cc",
+          ]
+        } ],
+        [ 'OS != "mac"', {
+          "sources!": [
+            "credentials_osx.cc",
+          ]
+        } ],
+      ]
     }
   ],
 }

credentials.hh

@@ -0,0 +1,37 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#if __APPLE__
+#include <sys/ucred.h>
+#include <sys/un.h>
+#include <sys/proc_info.h>
+#include <libproc.h>
+#define CREDENTIALS_HAS_PPID
+#define CREDENTIALS_HAS_PGID
+#elif __linux__
+// no extra headers
+#else
+#error "Unsupported platform"
+#endif
+
+class Credentials {
+#ifdef __APPLE__
+  struct proc_bsdshortinfo proc;
+#elif __linux__
+  struct ucred ucred;
+#endif
+
+public:
+  Credentials() {}
+  auto Init(int fd) -> bool;
+
+  auto GetPid() -> pid_t;
+#ifdef CREDENTIALS_HAS_PPID
+  auto GetPpid() -> pid_t;
+#endif
+#ifdef CREDENTIALS_HAS_PGID
+  auto GetPgid() -> pid_t;
+#endif
+
+  auto GetUid() -> uid_t;
+  auto GetGid() -> gid_t;
+};

credentials_linux.cc

@@ -0,0 +1,23 @@
+#include "credentials.hh"
+#include <cassert>
+
+auto Credentials::Init(int fd) -> bool {
+  socklen_t ucred_len = sizeof ucred;
+  if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &ucred_len)) {
+    return false;
+  }
+  assert(ucred_len == sizeof ucred);
+  return true;
+}
+
+auto Credentials::GetPid() -> pid_t {
+  return ucred.pid;
+}
+
+auto Credentials::GetUid() -> uid_t {
+  return ucred.uid;
+}
+
+auto Credentials::GetGid() -> gid_t {
+  return ucred.uid;
+}

credentials_osx.cc

@@ -0,0 +1,35 @@
+#include "credentials.hh"
+#include <cassert>
+
+auto Credentials::Init(int fd) -> bool {
+  auto pid = (pid_t) -1;
+  socklen_t pid_len = sizeof pid;
+  if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_len)) {
+    return false;
+  }
+  assert(pid_len == sizeof pid);
+  if (proc_pidinfo(pid, PROC_PIDT_SHORTBSDINFO, 1, &proc, PROC_PIDT_SHORTBSDINFO_SIZE) == 0) {
+    return false;
+  }
+  return true;
+}
+
+auto Credentials::GetPid() -> pid_t {
+  return (pid_t) proc.pbsi_pid;
+}
+
+auto Credentials::GetPpid() -> pid_t {
+  return (pid_t) proc.pbsi_ppid;
+}
+
+auto Credentials::GetPgid() -> pid_t {
+  return (pid_t) proc.pbsi_pgid;
+}
+
+auto Credentials::GetUid() -> uid_t {
+  return proc.pbsi_uid;
+}
+
+auto Credentials::GetGid() -> gid_t {
+  return proc.pbsi_gid;
+}