Changeset 751 for branches/ithildin-1.1

Timestamp:

06/23/06 01:43:45 (6 years ago)

Author:

wd

Message:

Add XINFO priv creation for all XINFOs.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/acl.c (modified) (1 diff)
• addons/hostcrypt.c (modified) (1 diff)
• addons/quarantine.c (modified) (1 diff)
• command.c (modified) (1 diff)
• commands/oper.c (modified) (1 diff)
• commands/xinfo.c (modified) (3 diffs)
• support.c (modified) (4 diffs)
• support.h (modified) (3 diffs)

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

@@ -748 +748 @@
     LIST_ALLOC(acl.stage3_list);
 
-    add_xinfo_handler(xinfo_acl_handler, "ACL", XINFO_HANDLER_OPER, NULL,
+    add_xinfo_handler(xinfo_acl_handler, "ACL", XINFO_HANDLER_OPER, 
             "Provides information about the server Access Control List");
 

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

@@ -372 +372 @@
     char addr[IPADDR_SIZE];
     size_t alen;
-
-#ifdef INET6
-    if (inet_pton(PF_INET6, cli->ip, addr) == 1)
-        alen = IPADDR_SIZE;
-    else
-#endif
-        if (inet_pton(PF_INET, cli->ip, addr) == 1)
+    char *s;
+    bool ip = false;
+    int family = PF_INET; 
+#ifdef INET6
+    struct in6_addr i6a;
+#endif
+    struct in_addr ia;
+
+    /* See if it is an IP address.. */
+#ifdef INET6
+    if ((s = strchr(cli->orighost, ':')) != NULL &&
+            inet_pton(PF_INET6, cli->orighost, &i6a) == 1) {
+        ip = true;
+        family = PF_INET6;
+    } else
+#endif
+    if ((s = strrchr(cli->orighost, '.')) != NULL &&
+            inet_pton(PF_INET, cli->orighost, &ia) == 1)
+    ip = true;
+
+    if (ip) {
+        inet_pton(family, cli->orighost, addr);
+#ifdef INET6
+        if (family == PF_INET6)
+            alen = IPADDR_SIZE;
+        else
+#endif
             alen = 4;
+
+        md5_data(addr, alen, md5buf);
+        memset(addr + (alen / 2), 0, alen / 2);
+        md5_data(addr, alen, md5buf + 32);
+    } else {
+        alen = strlen(cli->orighost);
+        md5_data(cli->orighost, alen, md5buf);
+        
+        /* extract only the interesting part of the hostname (domain.tld).
+         * For hostnames which are merely domain.tld to begin with, we
+         * provide the first set of md5 data as additional "seed" for them. */
+        s = strrchr(cli->orighost, '.');
+        if (s == NULL)
+            /* singleton string like 'localhost' */
+            sprintf(buf, "%32s.%s", md5buf, cli->orighost);
         else {
-            inet_pton(PF_INET, "0.0.0.0", addr);
-            alen = 4;
+            while (*s != '.' && s > cli->orighost)
+                s--; /* walk backwards to find the . or beginning of string */
+            if (s == cli->orighost)
+                /* host is in pure domain.tld form */
+                sprintf(buf, "%32s.%s", md5buf, cli->orighost);
+            else
+                /* s is the second to last . in the string now */
+                sprintf(buf, "%s", s + 1);
         }
-
-    md5_data(addr, alen, md5buf);
-    memset(addr + (alen / 2), 0, alen / 2);
-    md5_data(addr, alen, md5buf + 32);
+        /* buf now contains the host we wish to md5 on */
+        alen = strlen(buf);
+        md5_data(buf, alen, md5buf + 32);
+    }
     
     /* okay, md5buf is now a 64 byte long base16 encoded string.  decode it

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

@@ -237 +237 @@
     }
 
-    add_xinfo_handler(xinfo_quarantine_handler, "QUARANTINE", 0, NULL,
+    add_xinfo_handler(xinfo_quarantine_handler, "QUARANTINE", 0, 
             "Provides a list of nickname and channel quarantines");
 

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

@@ -401 +401 @@
             }
         }
-        /* check operator and command use privileges */
+        /* check operator and command use privileges.  Why do this only for
+         * local clients?  Because we need to assume that even if we are not
+         * configured to accept commands from a client, every other server
+         * is.  Without a distributed privilege understanding we have to
+         * assume positive intent. */
         if ((cmd->client.flags & COMMAND_FL_OPERATOR && !OPER(cli)) ||
                 !BPRIV(cli, cmd->priv)) {

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

@@ -23 +23 @@
 MODULE_LOADER(oper) {
 
-    add_xinfo_handler(xinfo_oper_func, "OPERATORS", 0, NULL,
+    add_xinfo_handler(xinfo_oper_func, "OPERATORS", 0,
             "Provides information about server operators");
 

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

@@ -30 +30 @@
 MODULE_LOADER(xinfo) {
 
-    add_xinfo_handler(xinfo_class_handler, "CLASS", 0, NULL,
+    add_xinfo_handler(xinfo_class_handler, "CLASS", 0,
             "Provides information about server connection classes");
-    add_xinfo_handler(xinfo_client_handler, "CLIENT", XINFO_HANDLER_OPER, NULL,
+    add_xinfo_handler(xinfo_client_handler, "CLIENT", XINFO_HANDLER_OPER,
             "Provices information about clients on this server");
     add_xinfo_handler(xinfo_connects_handler, "CONNECTS", XINFO_HANDLER_OPER,
-            NULL, "Shows information about server uplinks");
-    add_xinfo_handler(xinfo_hash_handler, "HASH", XINFO_HANDLER_OPER, NULL,
+            "Shows information about server uplinks");
+    add_xinfo_handler(xinfo_hash_handler, "HASH", XINFO_HANDLER_OPER,
             "Shows hash table statistics.");
-    add_xinfo_handler(xinfo_me_handler, "ME", XINFO_HANDLER_LOCAL, NULL,
+    add_xinfo_handler(xinfo_me_handler, "ME", XINFO_HANDLER_LOCAL,
             "Provides information about your connection statistics");
     add_xinfo_handler(xinfo_privilege_handler, "PRIVILEGE",
-            XINFO_HANDLER_LOCAL | XINFO_HANDLER_OPER, NULL,
+            XINFO_HANDLER_LOCAL | XINFO_HANDLER_OPER,
             "Provides information about available privileges");
-    add_xinfo_handler(xinfo_server_handler, "SERVER", 0, NULL,
+    add_xinfo_handler(xinfo_server_handler, "SERVER", 0,
             "Provides information about this (or other) servers");
-    add_xinfo_handler(xinfo_xinfo_handler, "XINFO", 0, NULL,
+    add_xinfo_handler(xinfo_xinfo_handler, "XINFO", 0,
             "Provides a list of available XINFO query-handlers");
 
@@ -136 +136 @@
         return COMMAND_WEIGHT_LOW; /* silently ignore these */
     if ((xhp->flags & XINFO_HANDLER_OPER && !OPER(cli)) ||
-            (xhp->flags & XINFO_HANDLER_PRIV && !BPRIV(cli, xhp->priv))) {
+            !BPRIV(cli, xhp->priv)) {
         sendto_one(cli, RPL_FMT(cli, ERR_NOPRIVILEGES));
         return COMMAND_WEIGHT_LOW;
@@ -425 +425 @@
             continue; /* non-local */
         if ((xhp->flags & XINFO_HANDLER_OPER && !OPER(cli)) ||
-                (xhp->flags & XINFO_HANDLER_PRIV && !BPRIV(cli, xhp->priv)))
+                !BPRIV(cli, xhp->priv))
             continue; /* not privileged */
 

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

@@ -35 +35 @@
     ip = malloc(sizeof(struct isupport));
     memset(ip, 0, sizeof(struct isupport));
-    ip->name = strdup(name);
+    strlcpy(ip->name, name, ISUPPORTNAME_MAXLEN + 1);
     /* now insert into a list.  we alphabetically sort our list, just
      * because I like to. :) */
@@ -84 +84 @@
     if (ip != NULL) {
         LIST_REMOVE(ip, lp);
-        free(ip->name);
         if (!(ip->flags & ISUPPORT_FL_PRIV) && ip->value.str != NULL)
             free(ip->value.str);
@@ -144 +143 @@
  * fifth is a description of the handler (usually short).  The function returns
  * non-zero upon successful installation. */
-int add_xinfo_handler(xinfo_func func, char *name, int flags,
-        void *udata, char *desc) {
+int add_xinfo_handler(xinfo_func func, char *name, int flags, char *desc) {
     struct xinfo_handler *xhp = find_xinfo_handler(name);
+    uint64_t i64 = 1;
+    char privname[XINFONAME_MAXLEN + 1 + 6]; /* add 6 for "xinfo-" tag */
 
     if (xhp != NULL)
@@ -153 +153 @@
     xhp = malloc(sizeof(struct xinfo_handler));
     xhp->func = func;
-    xhp->name = strdup(name);
+    strlcpy(xhp->name, name, XINFONAME_MAXLEN + 1);
     xhp->flags = flags;
-    if (xhp->flags & XINFO_HANDLER_PRIV)
-        xhp->priv = *(int *)udata;
-    else
-        xhp->priv = -1;
+
+    /* Create a privilege for them.  Always bool, this is simply a "yes/no"
+     * flag to whether or not this information is available.  Always default
+     * to 1 */
+    sprintf(privname, "xinfo-%s", xhp->name);
+    xhp->priv = create_privilege(privname, PRIVILEGE_FL_BOOL, &i64, NULL);
+
     xhp->desc = strdup((desc != NULL ? desc : "no description"));
 

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

@@ -11 +11 @@
 #define IRCD_SUPPORT_H
 
+#define ISUPPORTNAME_MAXLEN 31 /* XXX: what does the spec say, if anything,
+                                  about this...? */
+
 /* a feature may have a straightforward string value, or it may have a value
  * which is connect-time dependent.  features which are connect-time dependent
  * are assumed to be privileges, but see below. */
 struct isupport {
-    char    *name;        /* name of the feature supported. */
+    char name[ISUPPORTNAME_MAXLEN + 1];
     union {
         char *str;        /* string value */
@@ -47 +50 @@
         char **argv __UNUSED)
 
+#define XINFONAME_MAXLEN ISUPPORTNAME_MAXLEN
+
 /* The xinfo_handler structure contains a each xinfo handler's necessary
  * details. */
 struct xinfo_handler {
-    char *name;
+    char name[XINFONAME_MAXLEN + 1];
     char *desc;
 #define XINFO_HANDLER_LOCAL 0x1
 #define XINFO_HANDLER_OPER  0x2
-#define XINFO_HANDLER_PRIV  0x4
     int flags;
-    int priv; /* privilege, if any */
+    int priv; /* privilege */
     xinfo_func func;
 
@@ -64 +68 @@
 #define XINFO_LEN 512
 
-int add_xinfo_handler(xinfo_func, char *, int, void *, char *);
+int add_xinfo_handler(xinfo_func, char *, int, char *);
 struct xinfo_handler *find_xinfo_handler(char *);
 void remove_xinfo_handler(xinfo_func);