X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=a94e6984d41e0b8a79a003ae2898cf1b87b9bf2b;hb=de47d8ddf95aeddbdcaf0d9ecf2d126aae9a5df7;hp=617cad12dea70ee44df9c6096deee37764e30166;hpb=f124b07b52a569dd9e332d0940af592d0e8e201d;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 617cad1..a94e698 100644
--- a/service.cpp
+++ b/service.cpp
@@ -240,7 +240,7 @@ int affinity_string_to_mask(TCHAR *string, __int64 *mask) {
   return 0;
 }
 
-inline unsigned long priority_mask() {
+unsigned long priority_mask() {
  return REALTIME_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | ABOVE_NORMAL_PRIORITY_CLASS | NORMAL_PRIORITY_CLASS | BELOW_NORMAL_PRIORITY_CLASS | IDLE_PRIORITY_CLASS;
 }
 
@@ -429,6 +429,56 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;
 }
 
+/* WILL NOT allocate a new string if the identifier is already present. */
+int prepend_service_group_identifier(TCHAR *group, TCHAR **canon) {
+  if (! group || ! group[0] || group[0] == SC_GROUP_IDENTIFIER) {
+    *canon = group;
+    return 0;
+  }
+
+  size_t len = _tcslen(group) + 1;
+  *canon = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
+  if (! *canon) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("prepend_service_group_identifier()"));
+    return 1;
+  }
+
+  TCHAR *s = *canon;
+  *s++ = SC_GROUP_IDENTIFIER;
+  memmove(s, group, len * sizeof(TCHAR));
+  (*canon)[len] = _T('\0');
+
+  return 0;
+}
+
+int append_to_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {
+  *newlen = 0;
+
+  TCHAR *canon = 0;
+  if (type == DEPENDENCY_GROUPS) {
+    if (prepend_service_group_identifier(string, &canon)) return 1;
+  }
+  else canon = string;
+  int ret = append_to_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);
+
+  return ret;
+}
+
+int remove_from_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {
+  *newlen = 0;
+
+  TCHAR *canon = 0;
+  if (type == DEPENDENCY_GROUPS) {
+    if (prepend_service_group_identifier(string, &canon)) return 1;
+  }
+  else canon = string;
+  int ret = remove_from_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);
+
+  return ret;
+}
+
 int set_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
   TCHAR *dependencies = _T("");
   unsigned long num_dependencies = 0;
@@ -562,8 +612,10 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);
   if (! qsc) return 3;
 
-  if (! qsc->lpDependencies) return 0;
-  if (! qsc->lpDependencies[0]) return 0;
+  if (! qsc->lpDependencies || ! qsc->lpDependencies[0]) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    return 0;
+  }
 
   /* lpDependencies is doubly NULL terminated. */
   while (qsc->lpDependencies[*bufsize]) {
@@ -577,6 +629,7 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   if (! *buffer) {
     *bufsize = 0;
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));
+    HeapFree(GetProcessHeap(), 0, qsc);
     return 4;
   }
 
@@ -601,6 +654,12 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
 
   HeapFree(GetProcessHeap(), 0, qsc);
 
+  if (! *buffer[0]) {
+    HeapFree(GetProcessHeap(), 0, *buffer);
+    *buffer = 0;
+    *bufsize = 0;
+  }
+
   return 0;
 }
 
@@ -653,8 +712,6 @@ int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle,
     print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
     return 4;
   }
-
-  return 0;
 }
 
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {
@@ -762,7 +819,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (! service) return;
   if (service->username) HeapFree(GetProcessHeap(), 0, service->username);
   if (service->password) {
-    SecureZeroMemory(service->password, service->passwordlen);
+    SecureZeroMemory(service->password, service->passwordlen * sizeof(TCHAR));
     HeapFree(GetProcessHeap(), 0, service->password);
   }
   if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);
@@ -774,7 +831,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);
   if (service->throttle_timer) CloseHandle(service->throttle_timer);
   if (service->hook_section_initialised) DeleteCriticalSection(&service->hook_section);
-  if (service->initial_env) FreeEnvironmentStrings(service->initial_env);
+  if (service->initial_env) HeapFree(GetProcessHeap(), 0, service->initial_env);
   HeapFree(GetProcessHeap(), 0, service);
 }
 
@@ -1074,7 +1131,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   if (! service->native) {
-    key = open_registry(service->name, KEY_WRITE);
+    key = open_registry(service->name, KEY_READ | KEY_WRITE);
     if (! key) {
       if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
       return 4;
@@ -1126,7 +1183,7 @@ int install_service(nssm_service_t *service) {
   }
 
   /* Get path of this program */
-  GetModuleFileName(0, service->image, _countof(service->image));
+  _sntprintf_s(service->image, _countof(service->image), _TRUNCATE, _T("%s"), nssm_imagepath());
 
   /* Create the service - settings will be changed in edit_service() */
   service->handle = CreateService(services, service->name, service->name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);
@@ -1479,7 +1536,7 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   service->hook_section_initialised = true;
 
   /* Remember our initial environment. */
-  service->initial_env = GetEnvironmentStrings();
+  service->initial_env = copy_environment();
 
   /* Remember our creation time. */
   if (get_process_creation_time(GetCurrentProcess(), &service->nssm_creation_time)) ZeroMemory(&service->nssm_creation_time, sizeof(service->nssm_creation_time));
@@ -1723,15 +1780,7 @@ int start_service(nssm_service_t *service) {
   service->status.dwControlsAccepted = SERVICE_ACCEPT_POWEREVENT | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP;
   SetServiceStatus(service->status_handle, &service->status);
 
-  /* Pre-start hook. */
   unsigned long control = NSSM_SERVICE_CONTROL_START;
-  if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {
-    TCHAR code[16];
-    _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);
-    unset_service_environment(service);
-    return stop_service(service, 5, true, true);
-  }
 
   /* Did another thread receive a stop control? */
   if (service->allow_restart) {
@@ -1744,6 +1793,15 @@ int start_service(nssm_service_t *service) {
       return stop_service(service, 4, true, true);
     }
 
+    /* Pre-start hook. May need I/O to have been redirected already. */
+    if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {
+      TCHAR code[16];
+      _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);
+      unset_service_environment(service);
+      return stop_service(service, 5, true, true);
+    }
+
     /* The pre-start hook will have cleaned the environment. */
     set_service_environment(service);
 
@@ -1982,7 +2040,6 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       wait_for_hooks(service, false);
       free_imports();
       exit(exitcode);
-    break;
   }
 }
 
@@ -2115,3 +2172,62 @@ awaited:
 
   return ret;
 }
+
+int list_nssm_services() {
+  /* Open service manager. */
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
+  if (! services) {
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    return 1;
+  }
+
+  unsigned long bufsize, required, count, i;
+  unsigned long resume = 0;
+  EnumServicesStatus(services, SERVICE_WIN32, SERVICE_STATE_ALL, 0, 0, &required, &count, &resume);
+  unsigned long error = GetLastError();
+  if (error != ERROR_MORE_DATA) {
+    print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));
+    return 2;
+  }
+
+  ENUM_SERVICE_STATUS *status = (ENUM_SERVICE_STATUS *) HeapAlloc(GetProcessHeap(), 0, required);
+  if (! status) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("ENUM_SERVICE_STATUS"), _T("list_nssm_services()"));
+    return 3;
+  }
+
+  bufsize = required;
+  while (true) {
+    int ret = EnumServicesStatus(services, SERVICE_WIN32, SERVICE_STATE_ALL, status, bufsize, &required, &count, &resume);
+    if (! ret) {
+      error = GetLastError();
+      if (error != ERROR_MORE_DATA) {
+        HeapFree(GetProcessHeap(), 0, status);
+        print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));
+        return 4;
+      }
+    }
+
+    for (i = 0; i < count; i++) {
+      /* Try to get the service parameters. */
+      nssm_service_t *service = alloc_nssm_service();
+      if (! service) {
+        HeapFree(GetProcessHeap(), 0, status);
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("nssm_service_t"), _T("list_nssm_services()"));
+        return 5;
+      }
+      _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), status[i].lpServiceName);
+
+      get_parameters(service, 0);
+      /* We manage the service if we have an Application. */
+      if (service->exe[0]) _tprintf(_T("%s\n"), service->name);
+
+      cleanup_nssm_service(service);
+    }
+
+    if (ret) break;
+  }
+
+  HeapFree(GetProcessHeap(), 0, status);
+  return 0;
+}