Merge pull request #244 from Helene/request_headers

Improve debug options for client requests

Author: Helene

source/confgenerator.py

@@ -113,8 +113,9 @@ def GET(self, **params):
         '''
         resp = []
 
+        self.logger.trace(f"Request headers:{str(cherrypy.request.headers)}")
         conn = cherrypy.request.headers.get('Host').split(':')
-        if int(conn[1]) != int(self.attr.get('prometheus')):
+        if len(conn) == 2 and int(conn[1]) != int(self.attr.get('prometheus')):
             self.logger.error(MSG['EndpointNotSupportedForPort'].
                               format(cherrypy.request.script_name, str(conn[1])))
             raise cherrypy.HTTPError(400, ERR[400])

source/opentsdb.py

@@ -281,8 +281,9 @@ def GET(self, **params):
         """
         resp = []
 
+        self.logger.trace(f"Request headers:{str(cherrypy.request.headers)}")
         conn = cherrypy.request.headers.get('Host').split(':')
-        if int(conn[1]) != int(self.port):
+        if len(conn) == 2 and int(conn[1]) != int(self.port):
             self.logger.error(MSG['EndpointNotSupportedForPort'].
                               format(cherrypy.request.script_name, str(conn[1])))
             raise cherrypy.HTTPError(400, ERR[400])
@@ -327,6 +328,13 @@ def POST(self):
         ''' Process POST. tools.json_in.force is set to False for
         compatability between versions of grafana < 3 and version 3.'''
 
+        self.logger.trace(f"Request headers:{str(cherrypy.request.headers)}")
+        conn = cherrypy.request.headers.get('Host').split(':')
+        if len(conn) == 2 and int(conn[1]) != int(self.port):
+            self.logger.error(MSG['EndpointNotSupportedForPort'].
+                              format(cherrypy.request.script_name, str(conn[1])))
+            raise cherrypy.HTTPError(400, ERR[400])
+
         # /api/query
         if 'query' in cherrypy.request.script_name:
 

source/prometheus.py

@@ -149,8 +149,9 @@ def GET(self, **params):
         '''
         resp = []
 
+        self.logger.trace(f"Request headers:{str(cherrypy.request.headers)}")
         conn = cherrypy.request.headers.get('Host').split(':')
-        if int(conn[1]) != int(self.port):
+        if len(conn) == 2 and int(conn[1]) != int(self.port):
             self.logger.error(MSG['EndpointNotSupportedForPort'].
                               format(cherrypy.request.script_name, str(conn[1])))
             raise cherrypy.HTTPError(400, ERR[400])