Changeset 772

Timestamp:

09/27/06 05:15:07 (6 years ago)

Author:

wd

Message:

Add CGI:IRC hostmasking support.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/acl.c (modified) (1 diff)
• addons/hostmask.c (modified) (1 diff)
• client.c (modified) (1 diff)
• commands/pass.c (modified) (1 diff)
• commands/server.c (modified) (1 diff)
• connection.c (modified) (1 diff)
• connection.h (modified) (3 diffs)
• server.c (modified) (1 diff)

branches/ithildin-1.1/modules/ircd/addons/acl.c

@@ -411 +411 @@
         /* check password/info first, since they're cheaper than all the
          * match calls (I guess */
-        if (ap->pass != NULL && strcmp(ap->pass, cp->pass))
+        if (ap->pass != NULL && cp->pass != NULL && strcmp(ap->pass, cp->pass))
             continue; /* password incorrect */
         if (ap->info != NULL && !match(ap->info, cp->cli->info))

branches/ithildin-1.1/modules/ircd/addons/hostmask.c

@@ -65 +65 @@
 HOOK_FUNCTION(hostmask_cc_hook) {
     client_t *cli = (client_t *)data;
-    char *mask = NULL;
+    char *mask;
 
-    if (cli->conn != NULL)
-        mask = mdext(cli->conn->cls, class_hostmask_mdi);
+    if (cli->conn == NULL)
+        return NULL; /* nothing to do */
 
+    mask = mdext(cli->conn->cls, class_hostmask_mdi);
     if (mask != NULL && *mask != '\0') {
+        if (!strcasecmp(mask, "cgi:irc")) {
+            /* Special CGI:IRC hack.  We take the password, if supplied, and
+             * use it as a hostname (as long as it's valid) */
+            if (cli->conn->pass != NULL && *cli->conn->pass != '\0' &&
+                    istr_okay(ircd.maps.host, cli->conn->pass))
+                mask = cli->conn->pass;
+            else {
+                log_warn("cgi:irc hostmasked connection did not provide a "
+                        "valid host (%s!%s@%s)", cli->nick, cli->user,
+                        cli->host);
+                return NULL;
+            }
+            /* fallthrough to normal mask case. */
+        }
         sendto_flag(SFLAG("SPY"), "Changing hostname for %s!%s@%s to %s",
                 cli->nick, cli->user, cli->host, mask);

branches/ithildin-1.1/modules/ircd/client.c

@@ -200 +200 @@
             LIST_INSERT_HEAD(ircd.connections.clients, cp, lp);
             ircd.stats.serv.unkclients--;
+
+            /* clean out their password */
+            if (cp->pass != NULL) {
+                free(cp->pass);
+                cp->pass = NULL;
+            }
         }
 
         cli->signon = cli->ts = me.now;
         cli->hops = 0; /* our client, they're 0 hops from us <G> */
+
     }
 

branches/ithildin-1.1/modules/ircd/commands/pass.c

@@ -17 +17 @@
 */
 
+static void copy_in_pass(connection_t *, char *);
+
 CLIENT_COMMAND(pass, 1, 1, COMMAND_FL_UNREGISTERED) {
+
     /* just copy the pass in */
-    strncpy(cli->conn->pass, argv[1], PASSWDLEN);
-
+    copy_in_pass(cli->conn, argv[1]);
     return COMMAND_WEIGHT_NONE;
 }
 
 SERVER_COMMAND(pass, 1, 1, COMMAND_FL_UNREGISTERED) {
+
     /* just copy the pass in */
-    strncpy(srv->conn->pass, argv[1], PASSWDLEN);
-
+    copy_in_pass(srv->conn, argv[1]);
     return 0;
 }
+
+static void copy_in_pass(connection_t *conn, char *pass) {
+
+    /* Hack to support CGI IRC, which sends the 'real hostname' as the client
+     * password.  What?  Let's use HOSTLEN I guess! */
+    if (conn->pass != NULL)
+        free(conn->pass); /* dump whatever was there before.. */
+    conn->pass = malloc(HOSTLEN + 1);
+    strlcpy(conn->pass, pass, HOSTLEN + 1);
+}
+
 /* vi:set ts=8 sts=4 sw=4 tw=76 et: */

branches/ithildin-1.1/modules/ircd/commands/server.c

@@ -118 +118 @@
             }
 
-            if (strcmp(pass, srv->conn->pass)) {
+            if (srv->conn->pass == NULL || strcmp(pass, srv->conn->pass)) {
                 destroy_connection(srv->conn, "password mismatch");
                 return IRCD_CONNECTION_CLOSED; /* password mismatch */

branches/ithildin-1.1/modules/ircd/connection.c

@@ -58 +58 @@
             sendq_pop(c);
     }
+
+    if (c->pass != NULL)
+        free(c->pass);
 
     if (c->buf != NULL)

branches/ithildin-1.1/modules/ircd/connection.h

@@ -2 +2 @@
  * connection.h: support structures/prototypes for connection.c
  * 
- * Copyright 2002 the Ithildin Project.
+ * Copyright 2002-2006 the Ithildin Project.
  * See the COPYING file for more information on licensing and use.
  * 
@@ -8 +8 @@
  */
 
-#ifndef IRCD_SOCKET_H
-#define IRCD_SOCKET_H
+#ifndef IRCD_CONNECTION_H
+#define IRCD_CONNECTION_H
 
 struct connection {
@@ -18 +18 @@
                                        identd/dns) */
     char    user[USERLEN + 1];
-    char    pass[PASSWDLEN + 1];    /* password, after registration feel
-                                       free to use this as empty bufferspace */
+    char    *pass;                  /* password, if not NULL it must be
+                                       malloc'd memory.  It will be
+                                       destroyed after client registration.  */
 
     char    *buf;                   /* temporary buffer pointer, possibly

branches/ithildin-1.1/modules/ircd/server.c

@@ -293 +293 @@
         LIST_REMOVE(sp->conn, lp);
         LIST_INSERT_HEAD(ircd.connections.servers, sp->conn, lp);
+        
+        /* clean out the password area */
+        if (sp->conn->pass != NULL) {
+            free(sp->conn->pass);
+            sp->conn->pass = NULL;
+        }
     }