Merge branch 'master' into issue-3302

Author: jimklimov

NEWS.adoc

@@ -113,6 +113,11 @@ https://github.com/networkupstools/nut/milestone/12
      operations. (Re-)registration of the "Network UPS Tools" service should
      now populate a nice description of it. The `-U` (uninstall) action should
      now also try to stop the service first. [PR #3235]
+   * Using `nut.exe -N` for testing and pressing 'Ctrl+C' should now cause the
+     started daemons to be killed off. Previously they would linger and e.g.
+     preclude subsequent experiments with the service wrapper. Console close
+     events are ignored, so there is a way to indefinitely keep the daemons
+     started by test-mode wrapper running (kill via Task Manager). [#3312]
    * Revised WIN32 `WSAStartup()` and registration of `atexit(WSACleanup)` to
      only be done once per program (and cleanups to be always registered); this
      impacts the C `libupsclient` and C++ `libnutclient` libraries (and so most
@@ -276,6 +281,10 @@ https://github.com/networkupstools/nut/milestone/12
      built-in NUT configuration path on all platforms, but to also consider
      `NUT_CONFPATH` and other fallback locations, like other code does.
      [PR #3249]
+   * Enhance debug-logging of dynamic library loading with information about
+     any missing method in the library discovered at run-time, if lack of such
+     prevents us from using that library, and blocks scanning of corresponding
+     protocol and/or media to discover possibly supported devices. [PR #3310]
    * Introduced `nut-scanner` support for new `nut-upower` driver. [PR #3293]
 
  - `upsd` data server updates:
@@ -342,6 +351,9 @@ several `FSD` notifications into one executed action. [PR #3097]
    * Introduced a `@NUT_UPSSTATS_TEMPLATE@` command which the HTML template
      files now MUST start with (safety check that we are reading a template).
      [issue #3252, PR #3249]
+   * (Experimental) Custom templates other than `upsstats{,-single}.html` can
+     now be specified as CGI parameters, if locally permitted via `hosts.conf`.
+     [issue #2524, PR #3304]
 
  - `upssched` tool updates:
    * Previously in PR #2896 (NUT releases v2.8.3 and v2.8.4) the `UPSNAME` and

clients/cgilib.c

@@ -87,8 +87,15 @@ void extractcgiargs(void)
 	while (ptr) {
 		varname = ptr;
 		eq = strchr(varname, '=');
-		if (!eq) {
-			ptr = strchr(varname, '&');
+		amp = strchr(varname, '&');
+		if (!eq
+		 || (eq && amp && amp < eq)
+		) {
+			/* Last token is a flag (without assignment in sight),
+			 * OR we've got a flag token in the middle of a query
+			 * string, followed by another key=value pair later on.
+			 */
+			ptr = amp;
 			if (ptr)
 				*ptr++ = '\0';
 
@@ -99,6 +106,8 @@ void extractcgiargs(void)
 			continue;
 		}
 
+		/* The nearest point of interest is a key=value pair,
+		 * maybe followed by another amp and flag or assignment... */
 		*eq = '\0';
 		value = eq + 1;
 		amp = strchr(value, '&');
@@ -111,6 +120,8 @@ void extractcgiargs(void)
 
 		cleanvar = unescape(varname);
 		cleanval = unescape(value);
+		upsdebugx(3, "%s: parsearg('%s', '%s')<br/>",
+			__func__, NUT_STRARG(cleanvar), NUT_STRARG(cleanval));
 		parsearg(cleanvar, cleanval);
 		free(cleanvar);
 		free(cleanval);

clients/upsclient.c

@@ -501,7 +501,7 @@ int upscli_init(int certverify, const char *certpath,
 void upscli_add_host_cert(const char* hostname, const char* certname, int certverify, int forcessl)
 {
 #ifdef WITH_NSS
-	HOST_CERT_t* cert = xmalloc(sizeof(HOST_CERT_t));
+	HOST_CERT_t* cert = (HOST_CERT_t *)xmalloc(sizeof(HOST_CERT_t));
 	cert->next = first_host_cert;
 	cert->host = xstrdup(hostname);
 	cert->certname = xstrdup(certname);

clients/upsimage.c

@@ -20,6 +20,7 @@
    Copyrights:
      (C) 1998  Russell Kroll <rkroll@exploits.org>
      (C) 2002  Simon Rozman <simon@rozman.net>
+     (C) 2020-2026 Jim Klimov <jimklimov+nut@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -619,14 +620,14 @@ int main(int argc, char **argv)
 	double	var = 0;
 
 #ifdef WIN32
-        /* Required ritual before calling any socket functions */
-        static WSADATA  WSAdata;
-        static int      WSA_Started = 0;
-        if (!WSA_Started) {
-                WSAStartup(2, &WSAdata);
-                atexit((void(*)(void))WSACleanup);
-                WSA_Started = 1;
-        }
+	/* Required ritual before calling any socket functions */
+	static WSADATA	WSAdata;
+	static int	WSA_Started = 0;
+	if (!WSA_Started) {
+		WSAStartup(2, &WSAdata);
+		atexit((void(*)(void))WSACleanup);
+		WSA_Started = 1;
+	}
 
 	/* Avoid binary output conversions, e.g.
 	 * mangling what looks like CRLF on WIN32 */
@@ -646,6 +647,23 @@ int main(int argc, char **argv)
 		nut_debug_level = i;
 	}
 
+#ifdef NUT_CGI_DEBUG_UPSIMAGE
+# if (NUT_CGI_DEBUG_UPSIMAGE - 0 < 1)
+#  undef NUT_CGI_DEBUG_UPSIMAGE
+#  define NUT_CGI_DEBUG_UPSIMAGE 6
+# endif
+	/* Un-comment via make flags when developer-troubleshooting: */
+	nut_debug_level = NUT_CGI_DEBUG_UPSIMAGE;
+#endif
+
+	if (nut_debug_level > 0) {
+		cgilogbit_set();
+		printf("Content-type: text/html\n");
+		printf("Pragma: no-cache\n");
+		printf("\n");
+		printf("<p>NUT CGI Debugging enabled, level: %d</p>\n\n", nut_debug_level);
+	}
+
 	extractcgiargs();
 
 	upscli_init_default_connect_timeout(NULL, NULL, UPSCLI_DEFAULT_CONNECT_TIMEOUT);

clients/upsset.c

@@ -1,6 +1,7 @@
 /* upsset - CGI program to manage read/write variables
 
    Copyright (C) 1999  Russell Kroll <rkroll@exploits.org>
+   Copyright (C) 2020-2026 Jim Klimov <jimklimov+nut@gmail.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1116,14 +1117,14 @@ int main(int argc, char **argv)
 	int i;
 
 #ifdef WIN32
-        /* Required ritual before calling any socket functions */
-        static WSADATA  WSAdata;
-        static int      WSA_Started = 0;
-        if (!WSA_Started) {
-                WSAStartup(2, &WSAdata);
-                atexit((void(*)(void))WSACleanup);
-                WSA_Started = 1;
-        }
+	/* Required ritual before calling any socket functions */
+	static WSADATA	WSAdata;
+	static int	WSA_Started = 0;
+	if (!WSA_Started) {
+		WSAStartup(2, &WSAdata);
+		atexit((void(*)(void))WSACleanup);
+		WSA_Started = 1;
+	}
 
 	/* Avoid binary output conversions, e.g.
 	 * mangling what looks like CRLF on WIN32 */
@@ -1136,7 +1137,9 @@ int main(int argc, char **argv)
 	NUT_UNUSED_VARIABLE(argv);
 	username = password = function = monups = NULL;
 
-	printf("Content-type: text/html\n\n");
+	printf("Content-type: text/html\n");
+	printf("Pragma: no-cache\n");
+	printf("\n");
 
 	/* NOTE: Caller must `export NUT_DEBUG_LEVEL` to see debugs for upsc
 	 * and NUT methods called from it. This line aims to just initialize
@@ -1148,6 +1151,20 @@ int main(int argc, char **argv)
 		nut_debug_level = i;
 	}
 
+#ifdef NUT_CGI_DEBUG_UPSSET
+# if (NUT_CGI_DEBUG_UPSSET - 0 < 1)
+#  undef NUT_CGI_DEBUG_UPSSET
+#  define NUT_CGI_DEBUG_UPSSET 6
+# endif
+	/* Un-comment via make flags when developer-troubleshooting: */
+	nut_debug_level = NUT_CGI_DEBUG_UPSSET;
+#endif
+
+	if (nut_debug_level > 0) {
+		cgilogbit_set();
+		printf("<p>NUT CGI Debugging enabled, level: %d</p>\n\n", nut_debug_level);
+	}
+
 	/* see if the magic string is present in the config file */
 	check_conf();