Increased allowed length for vhosts, properly check return values on server start to detect a failure on start

RamseyK · RamseyK · commit 58ac9cc7103b · 2018-05-27T19:44:23.000-04:00
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -31,22 +31,27 @@ HTTPServer::HTTPServer(std::vector<std::string> vhost_aliases, int port, std::st
 	listenSocket = INVALID_SOCKET;
 	listenPort = port;
 
-	printf("Primary port: %i, disk path: %s\n", port, diskpath.c_str());
+	std::cout << "Primary port: " << port << ", disk path: " << diskpath.c_str() << std::endl;
 
 	// Create a resource host serving the base path ./htdocs on disk
     ResourceHost* resHost = new ResourceHost(diskpath);
 	hostList.push_back(resHost);
 
 	// Always serve up localhost/127.0.0.1 (which is why we only added one ResourceHost to hostList above)
-	char tmpstr[32];
+	char tmpstr[128];
 	sprintf(tmpstr, "localhost:%i", listenPort);
 	vhosts.insert(std::pair<std::string, ResourceHost*>(std::string(tmpstr).c_str(), resHost));
 	sprintf(tmpstr, "127.0.0.1:%i", listenPort);
 	vhosts.insert(std::pair<std::string, ResourceHost*>(std::string(tmpstr).c_str(), resHost));
 
 	// Setup the resource host serving htdocs to provide for the vhost aliases
 	for (std::string vh : vhost_aliases) {
-		printf("vhost: %s\n", vh.c_str());
+		if ((vh.length() - 6) >= 128) {
+			std::cout << "vhost " << vh << " too long, skipping!" << std::endl;
+			continue;
+		}
+
+		std::cout << "vhost: " << vh << std::endl;
 		sprintf(tmpstr, "%s:%i", vh.c_str(), listenPort);
 		vhosts.insert(std::pair<std::string, ResourceHost*>(std::string(tmpstr).c_str(), resHost));
 	}
diff --git a/src/main.cpp b/src/main.cpp
@@ -46,7 +46,7 @@ int main (int argc, const char * argv[])
 	int epos;
 	cfile.open("server.config");
 	if (!cfile.is_open()) {
-		printf("Unable to open server.config file in working directory\n");
+		std::cout << "Unable to open server.config file in working directory" << std::endl;
 		return -1;
 	}
 	while (getline(cfile, line)) {
@@ -66,7 +66,7 @@ int main (int argc, const char * argv[])
 	auto it_port = config.find("port");
 	auto it_path = config.find("diskpath");
 	if (it_vhost == config.end() || it_port == config.end() || it_path == config.end()) {
-		printf("vhost, port, and diskpath must be supplied in the config, at a minimum\n");
+		std::cout << "vhost, port, and diskpath must be supplied in the config, at a minimum" << std::endl;
 		return -1;
 	}
 
@@ -93,7 +93,11 @@ int main (int argc, const char * argv[])
 
     // Instance and start the server
 	svr = new HTTPServer(vhosts, atoi(config["port"].c_str()), config["diskpath"]);
-	svr->start();
+	if (!svr->start()) {
+		svr->stop();
+		delete svr;
+		return -1;
+	}
 
 	// Run main event loop
 	svr->process();
