From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 10 Mar 2014 10:59:39 +0000 (+0100)
Subject: Webserver: try harder to always return *some* response
X-Git-Tag: rec-3.6.0-rc1~140^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f67eeda028f31b15bc87b1cafd0cc56f9ccb12b;p=thirdparty%2Fpdns.git

Webserver: try harder to always return *some* response

Even a 500 is better than a connection reset.
---

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 0c18cd2ccb..44c668733e 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -229,7 +229,21 @@ HttpResponse WebServer::handleRequest(HttpRequest req)
       throw HttpNotFoundException();
     }
 
-    (*handler)(&req, &resp);
+    try {
+      (*handler)(&req, &resp);
+    }
+    catch(PDNSException &e) {
+      L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Exception: " << e.reason << endl;
+      throw HttpInternalServerErrorException();
+    }
+    catch(std::exception &e) {
+      L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": STL Exception: " << e.what() << endl;
+      throw HttpInternalServerErrorException();
+    }
+    catch(...) {
+      L<<Logger::Error<<"HTTP ISE for \""<< req.url.path << "\": Unknown Exception" << endl;
+      throw HttpInternalServerErrorException();
+    }
   }
   catch(HttpException &e) {
     resp = e.response();
diff --git a/pdns/webserver.hh b/pdns/webserver.hh
index d56c1120d7..9dc7a397b9 100644
--- a/pdns/webserver.hh
+++ b/pdns/webserver.hh
@@ -94,6 +94,11 @@ public:
   HttpMethodNotAllowedException() : HttpException(405) { };
 };
 
+class HttpInternalServerErrorException : public HttpException {
+public:
+  HttpInternalServerErrorException() : HttpException(500) { };
+};
+
 class ApiException : public runtime_error
 {
 public: