Changeset 799

Timestamp:

10/10/05 02:06:47 (3 years ago)

Author:

aprilp

Message:

* Ability to run wifidog without an auth server (splash only).
* Does not allow (yet) to specify a custom splash/disclaimer, but will
forward to the portal of your choice if specified in the config (or
a generic one if none is specified).
Of course, using wifidog without an authentication server will not give
you statistics and all the rest of the cool features.

Files:

• trunk/wifidog/ChangeLog (modified) (1 diff)
• trunk/wifidog/src/conf.c (modified) (5 diffs)
• trunk/wifidog/src/conf.h (modified) (1 diff)
• trunk/wifidog/src/firewall.c (modified) (3 diffs)
• trunk/wifidog/src/gateway.c (modified) (7 diffs)
• trunk/wifidog/src/http.c (modified) (3 diffs)
• trunk/wifidog/src/http.h (modified) (1 diff)
• trunk/wifidog/src/ping_thread.c (modified) (2 diffs)
• trunk/wifidog/src/util.c (modified) (2 diffs)
• trunk/wifidog/wifidog.conf (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
-# $Header$
+2005-10-10 Philippe April <philippe@ilesansfil.org>
+        * Ability to run wifidog without an auth server (splash only).
+        * Does not allow (yet) to specify a custom splash/disclaimer, but will
+        forward to the portal of your choice if specified in the config (or
+        a generic one if none is specified).
+        Of course, using wifidog without an authentication server will not give
+        you statistics and all the rest of the cool features.
+
-2005-10-09 Philippe April <philippe@ilesansfil.org>
-        * Changed html pages, added info to wdctl status

trunk/wifidog/src/conf.c

@@ -78 +78 @@
-        oAuthServPath,
-        oAuthServMaxTries,
+    oPortal,
-        oHTTPDMaxConn,
-        oHTTPDName,
@@ -105 +106 @@
-        { "authserver",         oAuthServer },
-        { "authservmaxtries",   oAuthServMaxTries },
+        { "portal",             oPortal },
-        { "httpdmaxconn",       oHTTPDMaxConn },
-        { "httpdname",          oHTTPDName },
@@ -149 +151 @@
-        config.authserv_maxtries = DEFAULT_AUTHSERVMAXTRIES;
-        config.httpdname = NULL;
+    config.portal = NULL;
-        config.clienttimeout = DEFAULT_CLIENTTIMEOUT;
-        config.checkinterval = DEFAULT_CHECKINTERVAL;
@@ -640 +643 @@
-                                                        &linenum);
-                                        break;
+                case oPortal:
+                    config.portal = safe_strdup(p1);
+                    break;
-                                case oFirewallRuleSet:
-                                        parse_firewall_ruleset(p1, fd, filename, &linenum);
@@ -752 +758 @@
-{
-        config_notnull(config.gw_interface, "GatewayInterface");
-        config_notnull(config.auth_servers, "AuthServer");
-
-        if (missing_parms) {

trunk/wifidog/src/conf.h

@@ -116 +116 @@
-                                     connection attempts before abandoning */
-    t_auth_serv *auth_servers;  /**< @brief Auth servers list */
+    char *portal;           /**< @brief portal file or url to show */
-    char *httpdname;            /**< @brief Name the web server will return when
-                                     replying to a request */

trunk/wifidog/src/firewall.c

@@ -242 +242 @@
-        /* Ping the client, if he responds it'll keep activity on the link */
-        icmp_ping(ip);
-
-
+
+
+
+
-            LOCK_CLIENT_LIST();
-        
@@ -253 +255 @@
-                                <= time(NULL)) {
-                /* Timing out user */
-
+
+
-                fw_deny(p1->ip, p1->mac, p1->fw_connection_state);
-                client_list_delete(p1);
-
-
+
+
-                                        UNLOCK_CLIENT_LIST();
-                                        auth_server_request(&authresponse, REQUEST_TYPE_LOGOUT, ip, mac, token, 0, 0);
-                                        LOCK_CLIENT_LIST();
-
-                               
+    
+            } 
-                /*
-                 * This handles any change in
@@ -268 +272 @@
-                 * to change the status of a
-                 * user while he's connected
+                 *
+                 * Only run if we have an auth server
+                 * configured!
-                 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                            fw_deny(p1->ip, p1->mac, p1->fw_connection_state);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }

trunk/wifidog/src/gateway.c

@@ -78 +78 @@
-/* from client_list.c */
-extern pthread_mutex_t client_list_mutex;
+
+/* Time when wifidog started  */
+time_t started_time = 0;
-
-/* Appends -x, the current PID, and NULL to restartargv
@@ -264 +267 @@
-{
-        static  pthread_mutex_t sigterm_mutex = PTHREAD_MUTEX_INITIALIZER;
+        s_config *config = config_get_config();
-
-        debug(LOG_INFO, "Handler for termination caught signal %d", s);
@@ -287 +291 @@
-                pthread_kill(tid_fw_counter, SIGKILL);
-        }
-
+config->auth_servers != NULL && 
-                debug(LOG_INFO, "Explicitly killing the ping thread");
-                pthread_kill(tid_ping, SIGKILL);
@@ -360 +364 @@
-        request *r;
-        void **params;
+    FILE *fh;
+
+    /* Set the time when wifidog started */
+        if (!started_time) {
+                debug(LOG_INFO, "Setting started_time");
+                started_time = time(NULL);
+        }
+        else if (started_time < MINIMUM_STARTED_TIME) {
+                debug(LOG_WARNING, "Detected possible clock skew - re-setting started_time");
+                started_time = time(NULL);
+        }
-
-        /* If we don't have the Gateway IP address, get it. Can't fail. */
@@ -394 +409 @@
-        httpdAddCContent(webserver, "/wifidog", "status", 0, NULL, http_callback_status);
-        httpdAddCContent(webserver, "/wifidog", "auth", 0, NULL, http_callback_auth);
+        httpdAddCContent(webserver, "/wifidog", "splash", 0, NULL, http_callback_splash);
+        httpdAddCContent(webserver, "/wifidog", "portal", 0, NULL, http_callback_portal);
+
-        httpdAddC404Content(webserver, http_callback_404);
-
@@ -401 +419 @@
-        fw_init();
-
-s
+S
-        result = pthread_create(&tid_fw_counter, NULL, (void *)thread_client_timeout_check, NULL);
-        if (result != 0) {
-       
-       
+    
+    
-        }
-        pthread_detach(tid_fw_counter);
-
-s
+S
-        result = pthread_create(&tid, NULL, (void *)thread_wdctl, (void *)safe_strdup(config->wdctl_sock));
-        if (result != 0) {
@@ -417 +435 @@
-        pthread_detach(tid);
-        
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        debug(LOG_NOTICE, "Waiting for connections");

trunk/wifidog/src/http.c

@@ -61 +61 @@
-        int             port;
-        s_config        *config = config_get_config();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -156 +179 @@
-}
-
+void
+http_callback_splash(httpd *webserver, request *r)
+{
+        char * status = NULL;
+        httpVar * url;
+
+        status = get_status_text();
+        http_wifidog_header(r, "Disclaimer");
+        httpdOutput(r, "<p>This hotspot offers Free internet access!</p>");
+        httpdOutput(r, "<p>By clicking ACCEPT, you agree that you will respect these WiFi Do's and Don'ts:</p>");
+    httpdOutput(r, "<ul>\n");
+    httpdOutput(r, "<li>Respect the venue's bandwidth. Don't download too many large files.\n");
+    httpdOutput(r, "<li>Make Purchases and Tip.\n");
+    httpdOutput(r, "<li>If it's a busy place, don't take up too much space.\n");
+    httpdOutput(r, "<li>Turn down your sound or use headphones.\n");
+    httpdOutput(r, "<li>Share a table.\n");
+    httpdOutput(r, "<li>Thank the staff or management - let them know you appreciate the WiFi.\n");
+    httpdOutput(r, "<li>If it's busy - don't overstay your welcome.\n");
+    httpdOutput(r, "<li>Help others who are having trouble getting on the network.\n");
+    httpdOutput(r, "<li>Remember that the WiFi is complimentary. If it doesn't work, let the staff know. Be patient.\n");
+    httpdOutput(r, "</ul>\n");
+        if ((url = httpdGetVariableByName(r, "url"))) {
+            httpdPrintf(r, "<a href=\"/wifidog/auth?url=%s\">ACCEPT</a>", url->value);
+    } else {
+            httpdOutput(r, "<a href=\"/wifidog/auth\">ACCEPT</a>");
+    }
+
+        http_wifidog_footer(r);
+        free(status);
+}
+
+void
+http_callback_portal(httpd *webserver, request *r)
+{
+        char * status = NULL;
+
+        status = get_status_text();
+        http_wifidog_header(r, "Enjoy!");
+        httpdOutput(r, "<p>Don't forget, socialize and discuss with others! (you're not at home, enjoy the place and people!)</p>");
+        http_wifidog_footer(r);
+        free(status);
+}
+
-void 
-http_callback_auth(httpd *webserver, request *r)
-{
+        s_config        *config = config_get_config();
-        t_client        *client;
-        httpVar * token;
-        char    *mac;
+    char    *newlocation;
-
-        if ((token = httpdGetVariableByName(r, "token"))) {
@@ -188 +256 @@
-                        free(mac);
-                }
+        } else if (config->auth_servers == NULL) {
+        /* No authentication server is configured, we do not expect a token
+         * auth right away */
+                if (!(mac = arp_get(r->clientAddr))) {
+                        /* We could not get their MAC address */
+                        debug(LOG_ERR, "Failed to retrieve MAC address for ip %s", r->clientAddr);
+                        http_wifidog_header(r, "WiFiDog Error");
+                        httpdOutput(r, "Failed to retrieve your MAC address");
+                        http_wifidog_footer(r);
+                } else {
+                        /* We have their MAC address */
+
+                        LOCK_CLIENT_LIST();
+                        
+                        if ((client = client_list_find(r->clientAddr, mac)) == NULL) {
+                                debug(LOG_DEBUG, "New client ip=%s mac=%s", r->clientAddr, mac);
+                                client_list_append(r->clientAddr, mac, "SpLaShOnLy");
+                        } else {
+                                debug(LOG_DEBUG, "Node for %s already exists", client->ip);
+                        }
+
+            /* Find the client in the list once it's created (not very useful) */
+                        client = client_list_find(r->clientAddr, mac);
+
+            debug(LOG_INFO, "ALLOWING %s [%s], the user clicked the accept button", client->ip, client->mac);
+            client->fw_connection_state = FW_MARK_KNOWN;
+            fw_allow(client->ip, client->mac, FW_MARK_KNOWN);
+
+                        UNLOCK_CLIENT_LIST();
+
+                        free(mac);
+
+            httpdSetResponse(r, "307 Redirect to portal\n");
+            /* If we have a portal url specified in the configuration,
+               forward to it, otherwise forward to /wifidog/portal */
+            if (config->portal && strncmp(config->portal, "http://", strlen("http://")) == 0) {
+                debug(LOG_INFO, "Redirecting to portal at %s", config->portal);
+                safe_asprintf(&newlocation, "Location: %s",
+                    config->portal
+                );
+
+                httpdAddHeader(r, newlocation);
+                http_wifidog_header(r, "Redirection");
+
+                httpdPrintf(r, "Please <a href='%s'>click here</a> for the portal",
+                    config->portal);
+            } else {
+                safe_asprintf(&newlocation, "Location: http://%s:%d/wifidog/portal",
+                    config->gw_address,
+                    config->gw_port);
+                debug(LOG_INFO, "Redirecting to local portal");
+
+                httpdAddHeader(r, newlocation);
+                http_wifidog_header(r, "Redirection");
+
+                httpdPrintf(r, "Please <a href='http://%s:%d/wifidog/portal'>click here</a> for the portal",
+                    config->gw_address, 
+                    config->gw_port);
+            }
+
+            http_wifidog_footer(r);
+            free(newlocation);
+                }
-        } else {
-                /* They did not supply variable "token" */

trunk/wifidog/src/http.h

@@ -39 +39 @@
-void http_callback_status(httpd *webserver, request *r);
-/**@brief Callback for libhttpd */
+void http_callback_splash(httpd *webserver, request *r);
+/**@brief Callback for libhttpd */
+void http_callback_portal(httpd *webserver, request *r);
+/**@brief Callback for libhttpd */
-void http_callback_auth(httpd *webserver, request *r);
-

trunk/wifidog/src/ping_thread.c

@@ -52 +52 @@
-static void ping(void);
-
-time_t started_time = 0
+extern time_t started_time
-
-/** Launches a thread that periodically checks in with the wifidog auth server to perform heartbeat function.
@@ -65 +65 @@
-        struct  timespec        timeout;
-        
-        if (!started_time) {
-                debug(LOG_INFO, "Setting started_time");
-                started_time = time(NULL);
-        }
-        else if (started_time < MINIMUM_STARTED_TIME) {
-                debug(LOG_WARNING, "Detected possible clock skew - re-setting started_time");
-                started_time = time(NULL);
-        }
-
-        while (1) {
-                /* Make sure we check the servers at the very begining */

trunk/wifidog/src/util.c

@@ -317 +317 @@
-        unsigned long int uptime = 0;
-        unsigned int days = 0, hours = 0, minutes = 0, seconds = 0;
+     t_trusted_mac *p;
-        
-        len = 0;
@@ -394 +395 @@
-                first = first->next;
-        }
-
+
-        UNLOCK_CLIENT_LIST();
+
+    config = config_get_config();
-    
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return safe_strdup(buffer);

trunk/wifidog/wifidog.conf

@@ -79 +79 @@
-#    Path /
-#}
+
+# Parameter: Portal
+# Default: none
+# Optional
+#
+# Set this to a URL for your portal, if you run without an auth server
+# Portal http://www.ilesansfil.org/
-
-# Parameter: Daemon