Changeset 636

Timestamp:

24/07/08 00:52:07 (4 months ago)

Author:

markdoliner

Message:

Added a maximum stanza limit to c2s. This can be used to set an
upper limit on the number of individual requests that can be made
in a given window of time.

Location:

trunk

Files:

• c2s/c2s.c (modified) (2 diffs)
• c2s/c2s.h (modified) (2 diffs)
• c2s/main.c (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• etc/c2s.xml.dist.in (modified) (1 diff)

trunk/c2s/c2s.c

@@ -225 +225 @@
             sess->c2s->packet_count++;
 
+            /* check rate limits */
+            if(sess->stanza_rate != NULL) {
+                if(rate_check(sess->stanza_rate) == 0) {
+
+                    /* inform the app if we haven't already */
+                    if(!sess->stanza_rate_log) {
+                        if(s->state >= state_STREAM && sess->resources != NULL)
+                            log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s] is being stanza rate limited", sess->fd->fd, jid_user(sess->resources->jid));
+                        else
+                            log_write(sess->c2s->log, LOG_NOTICE, "[%d] [%s, port=%d] is being stanza rate limited", sess->fd->fd, sess->ip, sess->port);
+
+                        sess->stanza_rate_log = 1;
+                    }
+
+                    log_write(sess->c2s->log, LOG_NOTICE, "%d is throttled, disconnecting", sess->fd->fd);
+
+                    /* Disconnect the user.  Ideally we would just stop
+                       reading from their socket and delay processing of this
+                       stanza until the throttle time expires.  But that's
+                       difficult. */
+                    sx_kill(s);
+                    return -1;
+                }
+
+                /* update rate limits */
+                rate_add(sess->stanza_rate, 1);
+            }
+
             nad = (nad_t) data;
 
@@ -577 +605 @@
             if(c2s->byte_rate_total != 0)
                 sess->rate = rate_new(c2s->byte_rate_total, c2s->byte_rate_seconds, c2s->byte_rate_wait);
+
+            if(c2s->stanza_rate_total != 0)
+                sess->stanza_rate = rate_new(c2s->stanza_rate_total, c2s->stanza_rate_seconds, c2s->stanza_rate_wait);
 
             /* find out which port this is */

trunk/c2s/c2s.h

@@ -86 +86 @@
     int                 rate_log;
 
+    rate_t              stanza_rate;
+    int                 stanza_rate_log;
+
     time_t              last_activity;
     unsigned int        packet_count;
@@ -233 +236 @@
     int                 byte_rate_seconds;
     int                 byte_rate_wait;
+
+    /** stanza rates */
+    int                 stanza_rate_total;
+    int                 stanza_rate_seconds;
+    int                 stanza_rate_wait;
 
     /** maximum stanza size */

trunk/c2s/main.c

@@ -157 +157 @@
     }
 
+    elem = config_get(c2s->config, "io.limits.stanzas");
+    if(elem != NULL)
+    {
+        c2s->stanza_rate_total = j_atoi(elem->values[0], 0);
+        if(c2s->stanza_rate_total != 0)
+        {
+            c2s->stanza_rate_seconds = j_atoi(j_attr((const char **) elem->attrs[0], "seconds"), 1);
+            c2s->stanza_rate_wait = j_atoi(j_attr((const char **) elem->attrs[0], "throttle"), 5);
+        }
+    }
+
     elem = config_get(c2s->config, "io.limits.connects");
     if(elem != NULL)

trunk/ChangeLog

@@ -1 +1 @@
 2008-07-23 Mark Doliner <mark@meebo.com>
         * Removed scod module
+        * Added a maximum stanza limit to c2s.  This can be used to set an
+          upper limit on the number of individual requests that can be made
+          in a given window of time.
 
 2008-07-15 Tomasz Sterna <tomek@xiaoka.com>

trunk/etc/c2s.xml.dist.in

@@ -205 +205 @@
       <bytes>0</bytes>
 
+      <!-- Maximum number of stanzas per second - if more than X stanzas
+           are sent in Y seconds, connection is throttled for Z seconds.
+           The format is:
+
+             <stanzas seconds='Y' throttle='Z'>X</bytes>
+
+           Default Y 1, default Z is 5. Set X to 0 to disable -->
+      <stanzas>1000</stanzas>
+
       <!-- Maximum connects per second - if more than X connects are
            attempted from a single IP in Y seconds, that IP is throttled