keepalive and logger

CMakeLists.txt

@@ -25,9 +25,11 @@ add_subdirectory(parser)
 add_subdirectory(plugins)
 add_subdirectory(webserver)
 add_subdirectory(service)
+add_subdirectory(logger)
+add_subdirectory(scripts)
 add_subdirectory(webgui)
 
 # Install java libraries
 install(DIRECTORY
   lib/java/
-  DESTINATION "${INSTALL_JAVA_LIB_DIR}")
+  DESTINATION "${INSTALL_JAVA_LIB_DIR}")

logger/CMakeLists.txt

@@ -0,0 +1,25 @@
+set(_src
+  src/ldlogger-hooks.c
+  src/ldlogger-logger.c
+  src/ldlogger-tool.c
+  src/ldlogger-tool-gcc.c
+  src/ldlogger-tool-javac.c
+  src/ldlogger-util.c)
+
+add_definitions(-D_GNU_SOURCE -D__LOGGER_MAIN__)
+
+add_executable(logger ${_src})
+target_link_libraries(logger
+  ${CMAKE_DL_LIBS})
+
+add_library(ldlogger SHARED ${_src})
+target_compile_options(ldlogger PUBLIC -Wno-unknown-pragmas)
+target_link_libraries(ldlogger
+  ${CMAKE_DL_LIBS})
+
+install(TARGETS ldlogger
+  DESTINATION ${INSTALL_LIB_DIR}/x86_64)
+
+install(TARGETS logger
+  RUNTIME DESTINATION ${INSTALL_BIN_DIR}
+  LIBRARY DESTINATION ${INSTALL_LIB_DIR})

logger/src/ldlogger-hooks.c

@@ -0,0 +1,96 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <dlfcn.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <stdbool.h>
+
+#include "ldlogger-hooks.h"
+
+#define CC_LOGGER_MAX_ARGS 2048
+
+#define CC_LOGGER_CALL_EXEC(funName_, arglist, ...) \
+  tryLog(__VA_ARGS__); \
+  { \
+    unsetLDPRELOAD(__VA_ARGS__); \
+    typedef int (*FunType) arglist; \
+    FunType fun = (FunType) dlsym(RTLD_NEXT, #funName_); \
+    if (!fun) \
+    { \
+      return -1; \
+    } \
+    return (*fun)( __VA_ARGS__ ); \
+  }
+
+static void unsetLDPRELOAD(const char* const filename_, ...)
+{
+  char ldd[] = "ldd";
+  const char* pos = strstr(filename_, ldd);
+  if (pos)
+  {
+    unsigned int pos_number = pos-filename_;
+    unsigned int prefix_length = strlen(filename_)-strlen(ldd);
+    /* is there /ldd suffix in filename? or is filename equal ldd? */
+    if ((prefix_length == pos_number) && ( pos_number == 0 || (pos-1 && *--pos == '/')))
+    {
+      unsetenv("LD_PRELOAD");
+    }
+  }
+}
+
+/**
+ * Tries to log an exec* call.
+ *
+ * @param origin_ the exec* function name.
+ * @param filename_ the filename / command (see lookupPath_).
+ * @param argv_ arguments.
+ */
+static void tryLog(
+  const char* const filename_,
+  char* const argv_[], ...)
+{
+  size_t i;
+  const char* loggerArgs[CC_LOGGER_MAX_ARGS];
+  char* ldpreload;
+
+  loggerArgs[0] = filename_;
+  for (i = 0; argv_[i]; ++i)
+  {
+    loggerArgs[i+1] = argv_[i];
+  }
+  loggerArgs[i+1] = NULL;
+
+  logExec(i+1, (const char**) loggerArgs);
+}
+
+__attribute__ ((visibility ("default"))) int execv(const char* filename_, char* const argv_[])
+{
+  CC_LOGGER_CALL_EXEC(execv, (const char*, char* const*),
+    filename_, argv_);
+}
+
+__attribute__ ((visibility ("default"))) int execve(const char* filename_, char* const argv_[], char* const envp_[])
+{
+  CC_LOGGER_CALL_EXEC(execve, (const char*, char* const*, char* const*),
+    filename_, argv_, envp_);
+}
+
+__attribute__ ((visibility ("default"))) int execvp(const char* filename_, char* const argv_[])
+{
+  CC_LOGGER_CALL_EXEC(execvp, (const char*, char* const*),
+    filename_, argv_);
+}
+
+#ifdef _GNU_SOURCE
+__attribute__ ((visibility ("default"))) int execvpe(const char* filename_, char *const argv_[], char* const envp_[])
+{
+  CC_LOGGER_CALL_EXEC(execvpe, (const char*, char* const*, char* const*),
+    filename_, argv_, envp_);
+}
+#endif

logger/src/ldlogger-hooks.h

@@ -0,0 +1,6 @@
+#ifndef CC_LOGGER_HOOKS_H
+#define CC_LOGGER_HOOKS_H
+
+int logExec(int argc_, const char** argv_);
+
+#endif // CC_LOGGER_HOOKS_H