roundup-server now logs IP addresses by default (sf bug 778795)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1803 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index 434cd6a7a01f10b18df007ca9de5dd6cc6e5e9d5..abfaf8c3c15a40a0dca86a645b9c43b2722aef9e 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,10 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2003-??-?? 0.6.0??
+2003-08-?? 0.6.0??
 - Fixed editing attributes on FileClass nodes.
-- Query editing now works correctly. (sf bug 621248)
+- Query editing now works correctly (sf bug 621248)
+- roundup-server now logs IP addresses by default (sf bug 778795)
 
 2003-07-29 0.6.0b4
 - plugged cross-site-scripting hole (thanks Jeff Epler)

diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
index ca23de13ad936d84274e89d068caac9c11ad039f..e6dd1240b57cc7448778046651ebd4d537d312f9 100644 (file)
--- a/roundup/scripts/roundup_server.py
+++ b/roundup/scripts/roundup_server.py
@@ -16,7 +16,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup_server.py,v 1.24 2003-05-09 02:02:40 richard Exp $
+$Id: roundup_server.py,v 1.25 2003-08-12 01:11:43 richard Exp $
 """
 
 # python version check
@@ -204,6 +204,13 @@ class RoundupRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         c = tracker.Client(tracker, self, env)
         c.main()
 
+    LOG_IPADDRESS = 1
+    def address_string(self):
+        if self.LOG_IPADDRESS:
+            return self.client_address[0]
+        else:
+            host, port = self.client_address
+            return socket.getfqdn(host)
 
 try:
     import win32serviceutil
@@ -301,16 +308,19 @@ def usage(message=''):
     if message:
         message = _('Error: %(error)s\n\n')%{'error': message}
     print _('''%(message)sUsage:
-roundup-server [-n hostname] [-p port] [-l file] [-d file] [name=tracker home]*
+roundup-server [options] [name=tracker home]*
 
+options:
  -n: sets the host name
  -p: sets the port to listen on
  -l: sets a filename to log to (instead of stdout)
  -d: run the server in the background and on UN*X write the server's PID
      to the nominated file. Note: on Windows the PID argument is needed,
      but ignored.
+ -N: log client machine names in access log instead of IP addresses (much
+     slower)
 
- name=tracker home
+name=tracker home:
    Sets the tracker home(s) to use. The name is how the tracker is
    identified in the URL (it's the first part of the URL path). The
    tracker home is the directory that was identified when you did
@@ -381,7 +391,7 @@ def run():
     try:
         # handle the command-line args
         try:
-            optlist, args = getopt.getopt(sys.argv[1:], 'n:p:u:d:l:h')
+            optlist, args = getopt.getopt(sys.argv[1:], 'n:p:u:d:l:hN')
         except getopt.GetoptError, e:
             usage(str(e))
 
@@ -393,6 +403,7 @@ def run():
             elif opt == '-d': pidfile = abspath(arg)
             elif opt == '-l': logfile = abspath(arg)
             elif opt == '-h': usage()
+            elif opt == '-N': RoundupRequestHandler.LOG_IPADDRESS = 0
 
         if hasattr(os, 'getuid'):
             # if root, setuid to the running user