Remove old HTTP server code

All users of this code have been migrated to the new and shiny HttpServer
class.

It also fixes a typo in the ApacheLogfile unittests. It has not yet been
decided whether we should keep ApacheLogfile or not, hence leaving it in.

Reviewed-by: ultrotter

diff --git a/lib/http.py b/lib/http.py
index 7a6c0db..091ba9d 100644 (file)
--- a/lib/http.py
+++ b/lib/http.py
@@ -173,46 +173,6 @@ class ApacheLogfile:
     return time.strftime(format, tm)
 
 
-class HTTPServer(BaseHTTPServer.HTTPServer, object):
-  """Class to provide an HTTP/HTTPS server.
-
-  """
-  allow_reuse_address = True
-
-  def __init__(self, server_address, HandlerClass, httplog=None,
-               enable_ssl=False, ssl_key=None, ssl_cert=None):
-    """Server constructor.
-
-    Args:
-      server_address: a touple containing:
-        ip: a string with IP address, localhost if empty string
-        port: port number, integer
-      HandlerClass: HTTPRequestHandler object
-      httplog: Access log object
-      enable_ssl: Whether to enable SSL
-      ssl_key: SSL key file
-      ssl_cert: SSL certificate key
-
-    """
-    BaseHTTPServer.HTTPServer.__init__(self, server_address, HandlerClass)
-
-    self.httplog = httplog
-
-    if enable_ssl:
-      # Set up SSL
-      context = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
-      context.use_privatekey_file(ssl_key)
-      context.use_certificate_file(ssl_cert)
-      self.socket = OpenSSL.SSL.Connection(context,
-                                           socket.socket(self.address_family,
-                                           self.socket_type))
-    else:
-      self.socket = socket.socket(self.address_family, self.socket_type)
-
-    self.server_bind()
-    self.server_activate()
-
-
 class HTTPJsonConverter:
   CONTENT_TYPE = "application/json"
 
@@ -223,104 +183,6 @@ class HTTPJsonConverter:
     return serializer.LoadJson(data)
 
 
-class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
-  """Request handler class.
-
-  """
-  def setup(self):
-    """Setup secure read and write file objects.
-
-    """
-    self.connection = self.request
-    self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)
-    self.wfile = socket._fileobject(self.request, "wb", self.wbufsize)
-
-  def handle_one_request(self):
-    """Parses a request and calls the handler function.
-
-    """
-    self.raw_requestline = None
-    try:
-      self.raw_requestline = self.rfile.readline()
-    except OpenSSL.SSL.Error, ex:
-      logger.Error("Error in SSL: %s" % str(ex))
-    if not self.raw_requestline:
-      self.close_connection = 1
-      return
-    if not self.parse_request(): # An error code has been sent, just exit
-      return
-    logging.debug("HTTP request: %s", self.raw_requestline.rstrip("\r\n"))
-
-    try:
-      self._ReadPostData()
-
-      result = self.HandleRequest()
-
-      # TODO: Content-type
-      encoder = HTTPJsonConverter()
-      encoded_result = encoder.Encode(result)
-
-      self.send_response(200)
-      self.send_header("Content-Type", encoder.CONTENT_TYPE)
-      self.send_header("Content-Length", str(len(encoded_result)))
-      self.end_headers()
-
-      self.wfile.write(encoded_result)
-
-    except HTTPException, err:
-      self.send_error(err.code, message=err.message)
-
-    except Exception, err:
-      self.send_error(HTTPInternalError.code, message=str(err))
-
-    except:
-      self.send_error(HTTPInternalError.code, message="Unknown error")
-
-  def _ReadPostData(self):
-    if self.command.upper() not in ("POST", "PUT"):
-      self.post_data = None
-      return
-
-    # TODO: Decide what to do when Content-Length header was not sent
-    try:
-      content_length = int(self.headers.get('Content-Length', 0))
-    except ValueError:
-      raise HTTPBadRequest("No Content-Length header or invalid format")
-
-    try:
-      data = self.rfile.read(content_length)
-    except socket.error, err:
-      logger.Error("Socket error while reading: %s" % str(err))
-      return
-
-    # TODO: Content-type, error handling
-    self.post_data = HTTPJsonConverter().Decode(data)
-
-    logging.debug("HTTP POST data: %s", self.post_data)
-
-  def HandleRequest(self):
-    """Handles a request.
-
-    """
-    raise NotImplementedError()
-
-  def log_message(self, format, *args):
-    """Log an arbitrary message.
-
-    This is used by all other logging functions.
-
-    The first argument, FORMAT, is a format string for the
-    message to be logged.  If the format string contains
-    any % escapes requiring parameters, they should be
-    specified as subsequent arguments (it's just like
-    printf!).
-
-    """
-    logging.debug("Handled request: %s", format % args)
-    if self.server.httplog:
-      self.server.httplog.LogRequest(self, format, *args)
-
-
 class _HttpConnectionHandler(object):
   """Implements server side of HTTP
 

diff --git a/test/ganeti.http_unittest.py b/test/ganeti.http_unittest.py
index 448fca2..e5f787f 100755 (executable)
--- a/test/ganeti.http_unittest.py
+++ b/test/ganeti.http_unittest.py
@@ -31,7 +31,7 @@ from ganeti import http
 
 
 class HttpLogfileTests(unittest.TestCase):
-  """Rests for ApacheLogfile class."""
+  """Tests for ApacheLogfile class."""
 
   class FakeRequest:
     FAKE_ADDRESS = "1.2.3.4"