Changeset 1369

Timestamp:

09/30/08 05:15:44 (4 years ago)

Author:

wichert

Message:

Add authentication related settings to the configuration

Location:

trunk/wifidog

Files:

• src/conf.c (modified) (5 diffs)
• src/conf.h (modified) (1 diff)
• wifidog.conf (modified) (1 diff)

trunk/wifidog/src/conf.c

@@ -85 +85 @@
         oHTTPDMaxConn,
         oHTTPDName,
+        oHTTPDRealm,
+        oHTTPDUsername,
+        oHTTPDPassword,
         oClientTimeout,
         oCheckInterval,
@@ -112 +115 @@
         { "httpdmaxconn",       oHTTPDMaxConn },
         { "httpdname",          oHTTPDName },
+        { "httpdrealm",         oHTTPDRealm },
+        { "httpdusername",      oHTTPDUsername },
+        { "httpdpassword",      oHTTPDPassword },
         { "clienttimeout",      oClientTimeout },
         { "checkinterval",      oCheckInterval },
@@ -166 +172 @@
         config.auth_servers = NULL;
         config.httpdname = NULL;
+        config.httpdrealm = DEFAULT_HTTPDNAME;
+        config.httpdusername = NULL;
+        config.httpdpassword = NULL;
         config.clienttimeout = DEFAULT_CLIENTTIMEOUT;
         config.checkinterval = DEFAULT_CHECKINTERVAL;
@@ -706 +715 @@
                                         sscanf(p1, "%d", &config.httpdmaxconn);
                                         break;
+                                case oHTTPDRealm:
+                                        config.httpdrealm = safe_strdup(p1);
+                                        break;
+                                case oHTTPDUsername:
+                                        config.httpdusername = safe_strdup(p1);
+                                        break;
+                                case oHTTPDPassword:
+                                        config.httpdpassword = safe_strdup(p1);
+                                        break;
                                 case oBadOption:
                                         debug(LOG_ERR, "Bad option on line %d "
@@ -733 +751 @@
                         }
                 }
+        }
+
+        if (config.httpdusername && !config.httpdpassword) {
+                debug(LOG_ERR, "HTTPDUserName requires a HTTPDPassword to be set.");
+                exit(-1);
         }
 

trunk/wifidog/src/conf.h

@@ -142 +142 @@
     int httpdmaxconn;           /**< @brief Used by libhttpd, not sure what it
                                      does */
+    char *httpdrealm;           /**< @brief HTTP Authentication realm */
+    char *httpdusername;        /**< @brief Username for HTTP authentication */
+    char *httpdpassword;        /**< @brief Password for HTTP authentication */
     int clienttimeout;          /**< @brief How many CheckIntervals before a client
                                      must be re-authenticated */

trunk/wifidog/wifidog.conf

@@ -110 +110 @@
 # How many sockets to listen to
 # HTTPDMaxConn 10
+
+# Parameter: HTTPDRealm
+# Default: WiFiDog
+# Optional
+#
+# The name of the HTTP authentication realm. This only used when a user
+# tries to access a protected WiFiDog internal page. See HTTPUserName.
+# HTTPDRealm WiFiDog
+
+# Parameter: HTTPDUserName / HTTPDPassword
+# Default: unset
+# Optional
+#
+# The gateway exposes some information such as the status page through its web
+# interface. This information can be protected with a username and password,
+# which can be set through the HTTPDUserName and HTTPDPassword parameters.
+# HTTPDUserName admin
+# HTTPDPassword secret
 
 # Parameter: CheckInterval