[CalendarServer-changes] [5122] CalendarServer/trunk/twistedcaldav/accesslog.py

[source_changes at macosforge.org]

Revision: 5122
          http://trac.macosforge.org/projects/calendarserver/changeset/5122
Author:   sagen at apple.com
Date:     2010-02-15 13:50:27 -0800 (Mon, 15 Feb 2010)
Log Message:
-----------
Log x-forwarded-for into access.log

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/accesslog.py

Modified: CalendarServer/trunk/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/accesslog.py	2010-02-15 19:41:04 UTC (rev 5121)
+++ CalendarServer/trunk/twistedcaldav/accesslog.py	2010-02-15 21:50:27 UTC (rev 5122)
@@ -133,6 +133,17 @@
                         if " " in v:
                             v = '"%s"' % (v,)
                         formats.append("%s=%s" % (k, v))
+
+                fwdHeaders = request.headers.getRawHeaders("x-forwarded-for", "")
+                if fwdHeaders:
+                    # Limit each x-forwarded-header to 50 in case someone is
+                    # trying to overwhelm the logs
+                    forwardedFor = ",".join([hdr[:50] for hdr in fwdHeaders])
+                    forwardedFor = forwardedFor.replace(" ", "")
+                    formats.append("fwd=%(fwd)s")
+                else:
+                    forwardedFor = ""
+
                 format = " ".join(formats)
 
             formatArgs = {
@@ -149,6 +160,7 @@
                 "serverInstance"      : config.LogID,
                 "timeSpent"           : (time.time() - request.initTime) * 1000,
                 "outstandingRequests" : request.chanRequest.channel.factory.outstandingRequests,
+                "fwd"                 : forwardedFor,
             }
             self.logMessage(format % formatArgs)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100215/e60923c3/attachment.html>