Changeset 725 for branches/ithildin-1.1

Timestamp:

05/03/06 22:12:57 (6 years ago)

Author:

wd

Message:

Add redirect numeric support, redirect support in acls

Location:

branches/ithildin-1.1/modules/ircd

Files:

• addons/acl.c (modified) (5 diffs)
• addons/acl.h (modified) (1 diff)
• doc/conf.txt (modified) (1 diff)
• ircd.c (modified) (1 diff)
• send.h (modified) (1 diff)

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

@@ -217 +217 @@
     if (ap->info != NULL)
         free(ap->info);
+    if (ap->redirect != NULL)
+        free(ap->redirect);
     if (ap->timer != TIMER_INVALID)
         destroy_timer(ap->timer);
@@ -409 +411 @@
                 /* okay, it actually matches. */
                 if (ap->access == ACL_DENY) {
+                    /* Is this a redirect?  Maybe so, let's send them the
+                     * redirect message if it is. */
+                    if (ap->redirect != NULL)
+                        sendto_one(cp->cli, RPL_FMT(cp->cli, RPL_REDIR),
+                                ap->redirect, ap->redirect_port);
+
                     /* if there's a reason for the ban and they weren't already
-                     * denied set ret, otherwise just leave it alone */
+                     * denied set ret, otherwise just leave it alone.  Why?
+                     * this is possible if there is no more room in their
+                     * connection class.  We want them to know that they
+                     * would be authorized if the class wasn't full, instead
+                     * of telling them they are not at all authorized. */
                     ret = (ret != NULL ? ret : ap->reason);
                     break; /* we'll return below. */
@@ -448 +460 @@
     conf_list_t *clp;
     acl_t *ap, *ap2;
-    int stg, acc;
-    char *s, *class, *pass, *info, *reason;
+    int stg, acc, redirect_port = 0;
+    char *s, *class, *pass, *info, *reason, *redir;
+    char redirect[SERVLEN + 1];
     class_t *cls;
     int odr, rn, dcr; /* Old Default Rule, Rule Number, Default Conf Rule */
@@ -522 +535 @@
         pass = conf_find_entry("pass", clp, 1);
         info = conf_find_entry("info", clp, 1);
-        if (access == ACL_DENY) {
+        if (acc == ACL_DENY) {
             if ((reason = conf_find_entry("reason", clp, 1)) == NULL)
                 reason = "You are not authorised to use this server.";
         }
+
+        if ((redir = conf_find_entry("redirect", clp, 1)) != NULL) {
+            /* try finding the port .. */
+            if ((s = strchr(redir, ':')) != NULL) {
+                strlcpy(redirect, redir, (s - redir <= SERVLEN ?
+                            (s - redir) + 1 : SERVLEN + 1));
+                if ((redirect_port = str_conv_int(s + 1, 0)) == 0)
+                    log_warn("Could not parse server:port combo for redirect "
+                            "%s", redir);
+            } else {
+                strlcpy(redirect, redir, SERVLEN + 1);
+                redirect_port = 6667;
+            }
+
+            if (acc != ACL_DENY) {
+                log_warn("Redirection forces a DENY ACL type.");
+                acc = ACL_DENY;
+            }
+        } else
+            *redirect = '\0';
+                
+
 
         /* now iterate through all the host lists and all the regular hosts and
@@ -546 +581 @@
         if (str_conv_bool(conf_find_entry("skip-ident", clp, 1), 0))          \
             ap->flags |= ACL_FL_SKIP_IDENT;                                   \
+        if (*redirect != '\0' && redirect_port != 0) {                        \
+            ap->redirect = strdup(redirect);                                  \
+            ap->redirect_port = redirect_port;                                \
+        }                                                                     \
 } while (0)
 

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

@@ -31 +31 @@
                                        only) */
     char    *pass;                  /* password */
+    char    *redirect;              /* redirect server (or NULL if none) */
+    int     redirect_port;          /* redirect port */
+
     time_t  added;                  /* when it was added */
     time_t  expire;                 /* when this will expire */

branches/ithildin-1.1/modules/ircd/doc/conf.txt

@@ -65 +65 @@
     // connection.  This only works for deny entries.
     reason "You are not authorized to use this server.";
+
+    // redirect: (optional)
+    // This specifies that a connection should be redirected to the
+    // specified server/port (server:port form).  If the port is left off
+    // it is assumed to be the default port (typically 6667).  This applies
+    // only to entries in stage 3.
+    // NB: redirect ACLs are always deny type.  That is, the redirect message
+    // is provided and then the connection is closed.
+    redirect <some-irc-server:some-port>;
 
     // skip-dns: (optional)

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

@@ -443 +443 @@
         CMSG("004", "%s %s %s %s");                         /* rpl_myinfo */
         CMSG("005", "%s :are available on this server.");   /* rpl_isupport */
+        CMSG("010", "%s %d :Please redirect your client to this server and "
+                "port."); /* rpl_redir */
         CMSG("263", ":Server load is temporarily too heavy, please wait a "
                 "while and try again."); /* rpl_loadtoohigh */

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

@@ -172 +172 @@
 #define RPL_MYINFO 004
 #define RPL_ISUPPORT 005
+#define RPL_REDIR 010
 #define RPL_LOADTOOHIGH 263