HH-27375 fix request query parameters logging

hhru · Sep 5, 2012 · fe1af6f · fe1af6f
1 parent 35b8818
commit fe1af6f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/frontik/debug.xsl b/frontik/debug.xsl
@@ -220,16 +220,9 @@
     </xsl:template>
 
     <xsl:template match="param">
-        <table>
-            <tr>
-                <td class="param__name">
-                    <xsl:value-of select="@name"/><xsl:text>&#160;=&#160;</xsl:text>
-                </td>
-                <td class="param__value">
-                    <xsl:apply-templates select="str:tokenize(string(.), '&#0013;&#0010;')" mode="line"/>
-                </td>
-            </tr>
-        </table>
+        <div>
+            <xsl:value-of select="@name"/><xsl:text>&#160;=&#160;</xsl:text><xsl:value-of select="."/>
+        </div>
     </xsl:template>
 
 
@@ -282,12 +275,6 @@
                     display:block;
                 }
 
-            .param__name{
-                vertical-align:top;
-            }
-            .param__value{
-                vertical-align:top;
-            }
             .servicelink{
                 color:#666;
                 font-size:.8em;

diff --git a/frontik/handler_xml_debug.py b/frontik/handler_xml_debug.py
@@ -17,6 +17,7 @@
 import lxml.etree as etree
 import tornado.options
 from lxml.builder import E
+from frontik.util import get_query_parameters
 
 
 log = logging.getLogger('XML_debug')
@@ -79,7 +80,7 @@ def request_to_xml(request):
             cookies.append(E.cookie(_cookies[cookie].value, name = cookie))
 
     params = etree.Element("params")
-    query = urlparse.parse_qs(urlparse.urlparse(request.url).query, True)
+    query = get_query_parameters(request.url)
     for name, values in query.iteritems():
         for value in values:
             params.append(E.param(unicode(value, "utf-8"), name = name))

diff --git a/frontik/util.py b/frontik/util.py
@@ -5,8 +5,10 @@
 import mimetools
 import mimetypes
 import logging.handlers
+import re
 import socket
 
+import urlparse
 from urllib import urlencode
 
 from logging.handlers import  SysLogHandler
@@ -52,6 +54,10 @@ def make_url(base, **query_args):
     else:
         return base
 
+def get_query_parameters(url):
+    url = 'http://' + url if not re.match(r'[a-z]+://.+\??.*', url, re.IGNORECASE) else url
+    return urlparse.parse_qs(urlparse.urlparse(url).query, True)
+
 def get_all_files(root, extension=None):
     out = list()
     for subdir, dirs, files in os.walk(root):