Changeset 1629

Timestamp:

06/10/10 08:53:09 (3 years ago)

Author:

ahu

Message:

make sure webserver is bound *before* privileges are dropped. Noticed by Thomas Mieslinger.

Location:

trunk/pdns/pdns

Files:

• common_startup.cc (modified) (2 diffs)
• webserver.cc (modified) (3 diffs)
• webserver.hh (modified) (2 diffs)
• ws.cc (modified) (2 diffs)
• ws.hh (modified) (2 diffs)

trunk/pdns/pdns/common_startup.cc

@@ -305 +305 @@
    }  
 #endif
-
-   Utility::dropPrivs(newuid, newgid);
+  StatWebServer sws;
+  Utility::dropPrivs(newuid, newgid);
 
   if(::arg().mustDo("recursor")){
@@ -317 +317 @@
 
   pthread_t qtid;
-  StatWebServer sws;
+
 
   if(::arg().mustDo("webserver"))

trunk/pdns/pdns/webserver.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2007  PowerDNS.COM BV
+    Copyright (C) 2002-2010  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -191 +191 @@
   d_port=port;
   d_password=password;
+  d_server = 0; // on exception, this class becomes a NOOP later on
+  try {
+    d_server = new Server(d_port, d_listenaddress);
+  }
+  catch(SessionException &e) {
+    L<<Logger::Error<<"Fatal error in webserver: "<<e.reason<<endl;
+  }
 }
 
 void WebServer::go()
 {
+  if(!d_server)
+    return;
   try {
-    Server *s=new Server(d_port, d_listenaddress);
-    
     Session *client;
     pthread_t tid;
@@ -203 +210 @@
     L<<Logger::Error<<"Launched webserver on "<<d_listenaddress<<":"<<d_port<<endl;
 
-    while((client=s->accept())) {
+    while((client=d_server->accept())) {
       pthread_create(&tid, 0 , &serveConnection, (void *)client);
     }

trunk/pdns/pdns/webserver.hh

@@ -24 +24 @@
 
 using namespace std;
+class Server;
 
 class WebServer
@@ -42 +43 @@
   static void *d_that;
   static string d_password;
+  Server* d_server;
 };
 #endif /* WEBSERVER_HH */

trunk/pdns/pdns/ws.cc

@@ -30 +30 @@
 {
   d_start=time(0);
-        d_min10=d_min5=d_min1=0;
+  d_min10=d_min5=d_min1=0;
+  d_ws = new WebServer(arg()["webserver-address"], arg().asNum("webserver-port"),arg()["webserver-password"]);
 }
 
@@ -224 +225 @@
 {
   try {
-    WebServer ws(arg()["webserver-address"], arg().asNum("webserver-port"),arg()["webserver-password"]);
-    ws.setCaller(this);
-    ws.registerHandler("",&indexfunction);
-    ws.go();
+    
+    d_ws->setCaller(this);
+    d_ws->registerHandler("",&indexfunction);
+    d_ws->go();
   }
   catch(...) {

trunk/pdns/pdns/ws.hh

@@ -76 +76 @@
 };
 
+class WebServer;
 
 class StatWebServer
@@ -98 +99 @@
   Ewma d_queries, d_cachehits, d_cachemisses;
   Ewma d_qcachehits, d_qcachemisses;
+  WebServer *d_ws;
 };