Changeset 731 for branches

Timestamp:

05/12/06 03:35:50 (6 years ago)

Author:

wd

Message:

• Remove long useless fizzer drone module.
• Update ACL API to make matching ACLs much stricter.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/acl.c (modified) (10 diffs)
• addons/acl.h (modified) (2 diffs)
• addons/drone_fizzer.c (deleted)
• addons/throttle.c (modified) (1 diff)
• commands/acl.c (modified) (2 diffs)
• commands/akill.c (modified) (2 diffs)

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

@@ -26 +26 @@
  * CIDR mask, or something else) */
 #define ACL_DEFAULT_HASH 0
-/* the default rule at which inserts happen */
-#define ACL_DEFAULT_RULE 1000
-#define ACL_DEFAULT_CONF_RULE 2000
 
 /* function prototypes */
@@ -36 +33 @@
 XINFO_FUNC(xinfo_acl_handler);
 
-/* create an acl structure with the given definition (or find one if it exists
- * already) and add it in to the system.  ACLs are equivalent for our purposes
- * if they are in the same stage and have the same host-pattern.  It doesn't
- * make sense to have an accept for a host and a deny for host (with the
- * exception that hosts which have a password are considered different enough
- * to be left alone. */
-acl_t *create_acl(int stage, int acc, char *host, const char *type) {
+/* Create an ACL with the given data.  We will override ACLs that are
+ * similar enough to ourself (same stage/host/access/rule#) unless they have
+ * special parameter data (such as passwords or 'info line' bans) */
+acl_t *create_acl(int stage, int acc, char *host, const char *type, int rule) {
     acl_t *ap, *ap2;
     char *at, hostcopy[USERLEN + HOSTLEN + 2];
     struct acl_list *list;
     
-    if ((ap = find_acl(stage, host, type, NULL, NULL)) != NULL) {
-        if ((ap->pass != NULL && (ap->access != acc)) || ap->info != NULL)
-            ap = NULL; /* if it has a password, don't trample it unless we are
-                          adding another rule with a password and the same
-                          access.  if it has an info field, don't trample it at
-                          all. */
+    /* look for an ACL in this stage from the same hostname and with the
+     * same access and rule number.  If we find one we will delete it unless
+     * it has an info-line, in which case we will leave it alone.  (This is
+     * sort of a broken concession to not having a create command which
+     * takes that information...) */
+    if ((ap = find_acl(stage, acc, host, type, rule, NULL, NULL)) != NULL) {
+        if (ap->info != NULL)
+            ap = NULL;
     }
 
@@ -78 +74 @@
     
     /* add them into the big list... */
-    ap->rule = acl.default_rule;
+    if (rule == ACL_DEFAULT_RULE)
+        ap->rule = acl.default_rule;
+    else
+        ap->rule = (short)rule;
     ap->hash = get_acl_hash(ap->host);
 
@@ -154 +153 @@
 /* this function finds an ACL based on stage/host/type, and possibly based on
  * the pass/info parameters. */
-acl_t *find_acl(int stage, char *hostmask, const char *type, char *pass,
-        char *info) {
+acl_t *find_acl(int stage, int acc, char *hostmask, const char *type,
+        int rule, char *pass, char *info) {
     struct acl_list *list;
     char *at, hostcopy[USERLEN + HOSTLEN + 2], user[USERLEN + 1];
@@ -182 +181 @@
     /* now try and find them in the bucket. */
     LIST_FOREACH(ap, list, intlp) {
+        if (acc != ACL_ACCESS_ANY && ap->access != acc)
+            continue;
+        if (rule != ACL_ANY_RULE && ap->rule != rule)
+            continue;
+
         if (!strcasecmp(ap->user, user) && !strcasecmp(ap->host, host) &&
                 !strcasecmp(ap->type, type) &&
@@ -457 +461 @@
 }
 
+/* These two are the defaults for runtime and configured rule numbers,
+ * respectively. */
+#define ACLCONF_DEFAULT_RULE 1000
+#define ACLCONF_DEFAULT_CONF_RULE 2000
 HOOK_FUNCTION(acl_conf_hook) {
     conf_entry_t *cep;
@@ -465 +473 @@
     char redirect[SERVLEN + 1];
     class_t *cls;
-    int odr, rn, dcr; /* Old Default Rule, Rule Number, Default Conf Rule */
+    int rule;
+    int default_rule; /* default rule for config entries */
 
     /* remove anything that points to a conf.  usually this will only be
@@ -480 +489 @@
     /* see about setting the default rule number.. */
     if ((s = conf_find_entry("default-acl-rule", *ircd.confhead, 1)) != NULL)
-        acl.default_rule = str_conv_int(s, ACL_DEFAULT_RULE);
+        acl.default_rule = str_conv_int(s, ACLCONF_DEFAULT_RULE);
     else
-        acl.default_rule = ACL_DEFAULT_RULE;
+        acl.default_rule = ACLCONF_DEFAULT_RULE;
     if ((s = conf_find_entry("default-acl-conf-rule", *ircd.confhead, 1)) !=
             NULL)
-        dcr = str_conv_int(s, ACL_DEFAULT_CONF_RULE);
+        default_rule = str_conv_int(s, ACLCONF_DEFAULT_CONF_RULE);
     else
-        dcr = ACL_DEFAULT_CONF_RULE;
+        default_rule = ACLCONF_DEFAULT_CONF_RULE;
 
     /* now read through the conf looking for ACLs, as we find them parse and
@@ -496 +505 @@
     while ((cep = conf_find_next("acl", NULL, CONF_TYPE_LIST, cep,
                     *ircd.confhead, 1)) != NULL) {
-        rn = dcr;
+        rule = default_rule;
         if (cep->string != NULL)
-            rn = str_conv_int(cep->string, -1);
-        if (rn < 0 || rn > USHRT_MAX) {
-            log_warn("got acl with bogus rule number (%d)", rn);
-            rn = dcr;
+            rule = str_conv_int(cep->string, -1);
+        if (rule < 0 || rule > USHRT_MAX) {
+            log_warn("got acl with bogus rule number (%d)", rule);
+            rule = default_rule;
         }
 
@@ -566 +575 @@
          * add the acl.  yikes!  Use this macro to make life a bit easier. */
 #define ACL_PARSE_ADD(_host) do {                                             \
-        odr = acl.default_rule;                                               \
-        acl.default_rule = rn;                                                \
-        ap = create_acl(stg, acc, _host, "acl");                              \
-        acl.default_rule = odr;                                               \
+        ap = create_acl(stg, acc, _host, "acl", rule);                        \
         ap->conf = clp;                                                       \
         ap->cls = cls;                                                        \

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

@@ -16 +16 @@
 #define ACL_STAGE_REGISTER 3
     int     stage;                  /* one of 1, 2, or 3 */
+#define ACL_ACCESS_ANY -1
 #define ACL_DENY 0
 #define ACL_ALLOW 1
@@ -63 +64 @@
 } acl;
 
-acl_t *create_acl(int, int, char *, const char *);
-acl_t *find_acl(int, char *, const char *, char *, char *);
+#define ACL_ANY_RULE -1
+#define ACL_DEFAULT_RULE -2
+acl_t *create_acl(int, int, char *, const char *, int);
+acl_t *find_acl(int, int, char *, const char *, int, char *, char *);
 void destroy_acl(acl_t *);
 void acl_add_timer(acl_t *, time_t);

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

@@ -164 +164 @@
 
     if (tp->banned + len >= me.now)  {
-        if ((ap = find_acl(ACL_STAGE_CONNECT, cp->host, throttle_acl_type,
-                        NULL, NULL)) == NULL) {
+        if ((ap = find_acl(ACL_STAGE_CONNECT, ACL_DENY, cp->host,
+                        throttle_acl_type, NULL, NULL)) == NULL) {
             ap = create_acl(ACL_STAGE_CONNECT, ACL_DENY, cp->host,
-                    throttle_acl_type);
+                    throttle_acl_type, ACL_DEFAULT_RULE);
             ap->reason = strdup(THROTTLE_ERRMSG);
         }

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

@@ -228 +228 @@
 
     /* see if it exists */
-    ap = find_acl(stage, mask, type, NULL, NULL);
+    ap = find_acl(stage, acc, mask, type, ACL_DEFAULT_RULE, NULL, NULL);
 
     /* are we adding..? */
@@ -238 +238 @@
         }
 
-        ap = create_acl(stage, acc, mask, type);
+        ap = create_acl(stage, acc, mask, type, ACL_DEFAULT_RULE);
         ap->reason = strdup(reason);
         /* if the expire time is non-zero, set a conf to 0x1 so it will get

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

@@ -187 +187 @@
 
     if (op == ACL_ADD) {
-        ap = create_acl(stage, ACL_DENY, mask, type);
+        ap = create_acl(stage, ACL_DENY, mask, type, ACL_DEFAULT_RULE);
         ap->conf = ACL_CONF_TEMP;
         if (expire)
@@ -198 +198 @@
         acl_force_check(ap->stage, ap, srv->name, false);
     } else if (op == ACL_DEL) {
-        if ((ap = find_acl(stage, mask, type, NULL, info)))
+        if ((ap = find_acl(stage, ACL_DENY, mask, type, ACL_DEFAULT_RULE, NULL, info)))
             destroy_acl(ap);
     }