Added configuration file to specify primary vhost/post/diskpath

RamseyK · RamseyK · commit 9a24975f5330 · 2018-05-13T20:00:45.000+10:00
diff --git a/bin/server.config b/bin/server.config
@@ -0,0 +1,4 @@
+# Default vhost
+vhost=192.168.1.5
+port=8080
+diskpath=./htdocs
diff --git a/src/HTTPMessage.cpp b/src/HTTPMessage.cpp
@@ -295,8 +295,7 @@ void HTTPMessage::addHeader(std::string key, int value) {
  */
 std::string HTTPMessage::getHeaderValue(std::string key) {
     // Lookup in map
-    std::map<std::string, std::string>::const_iterator it;
-    it = headers->find(key);
+    auto it = headers->find(key);
     
     // Key wasn't found, return a blank value
     if (it == headers->end())
diff --git a/src/HTTPServer.cpp b/src/HTTPServer.cpp
@@ -21,19 +21,32 @@
 /**
  * Server Constructor
  * Initialize state and server variables
+ *
+ * @param vhost Name of the primary Host the HTTP server will respond to
+ * @param port Port the vhost listens on
+ * @param diskpath Path to the folder the vhost serves up
  */
-HTTPServer::HTTPServer() {
+HTTPServer::HTTPServer(std::string vhost, int port, std::string diskpath) {
 	canRun = false;
 	listenSocket = INVALID_SOCKET;
+	listenPort = port;
+
+	// TODO: Eventually we should allow the config to specify multiple vhosts with their own diskpaths
+	printf("Primary vhost: %s, port: %i, disk path: %s\n", vhost.c_str(), port, diskpath.c_str());
 
 	// Create a resource host serving the base path ./htdocs on disk
-    ResourceHost* resHost = new ResourceHost("./htdocs");
+    ResourceHost* resHost = new ResourceHost(diskpath);
 	hostList.push_back(resHost);
 
-	// Setup the resource host serving htdocs to provide for the following vhosts:
-	vhosts.insert(std::pair<std::string, ResourceHost*>("localhost:8080", resHost));
-	vhosts.insert(std::pair<std::string, ResourceHost*>("127.0.0.1:8080", resHost));
-	vhosts.insert(std::pair<std::string, ResourceHost*>("192.168.1.59:8080", resHost));
+	// Setup the resource host serving htdocs to provide for the following vhosts
+	// Use the primary vhost to also serve up localhost/127.0.0.1 (which is why we only added one ResourceHost to hostList above)
+	char tmpstr[32];
+	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));
+	sprintf(tmpstr, "%s:%i", vhost.c_str(), listenPort);
+	vhosts.insert(std::pair<std::string, ResourceHost*>(std::string(tmpstr).c_str(), resHost));
 }
 
 /**
@@ -54,12 +67,10 @@ HTTPServer::~HTTPServer() {
  * Start Server
  * Initialize the Server Socket by requesting a socket handle, binding, and going into a listening state
  *
- * @param port Port to listen on
  * @return True if initialization succeeded. False if otherwise
  */
-bool HTTPServer::start(int port) {
-	canRun = false;    
-	listenPort = port;
+bool HTTPServer::start() {
+	canRun = false;
 
 	// Create a handle for the listening socket, TCP
 	listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -252,8 +263,7 @@ void HTTPServer::acceptConnection() {
  * @return Pointer to Client object if found. NULL otherwise
  */
 Client* HTTPServer::getClient(int clfd) {
-	std::unordered_map<int, Client*>::const_iterator it;
-    it = clientMap.find(clfd);
+    auto it = clientMap.find(clfd);
 
 	// Client wasn't found
 	if(it == clientMap.end())
@@ -555,7 +565,7 @@ void HTTPServer::handleTrace(Client* cl, HTTPRequest *req) {
 	sendResponse(cl, resp, true);
 	
 	delete resp;
-	delete buf;
+	delete[] buf;
 }
 
 /**
diff --git a/src/HTTPServer.h b/src/HTTPServer.h
@@ -86,10 +86,10 @@ class HTTPServer {
 	bool canRun;
 
 public:
-    HTTPServer();
+    HTTPServer(std::string vhost, int port, std::string diskpath);
     ~HTTPServer();
 
-	bool start(int port);
+	bool start();
 	void stop();
 
 	// Main event loop
diff --git a/src/Resource.cpp b/src/Resource.cpp
@@ -28,7 +28,7 @@ Resource::Resource(std::string loc, bool dir) {
 
 Resource::~Resource() {
 	if(data != NULL) {
-		delete data;
+		delete [] data;
 		data = NULL;
 	}
 }
diff --git a/src/ResourceHost.h b/src/ResourceHost.h
@@ -34,9 +34,8 @@
 
 // Valid files to serve as an index of a directory
 const static char* const validIndexes[] = {
-	"index.html", // 0
-	"index.htm", // 1
-	//"index.php", // 2
+	"index.html",
+	"index.htm"
 };
 
 class ResourceHost {
diff --git a/src/main.cpp b/src/main.cpp
@@ -18,9 +18,12 @@
 
 #include <iostream>
 #include <string>
+#include <unordered_map>
+#include <fstream>
 #include <signal.h>
 
 #include "HTTPServer.h"
+#include "ResourceHost.h"
 
 static HTTPServer* svr;
 
@@ -36,6 +39,37 @@ void handleTermSig(int snum) {
 
 int main (int argc, const char * argv[])
 {
+	// Parse config file
+	std::map<std::string, std::string> config;
+	std::fstream cfile;
+	std::string line, key, val;
+	int epos;
+	cfile.open("server.config");
+	if (!cfile.is_open()) {
+		printf("Unable to open server.config file in working directory\n");
+		return -1;
+	}
+	while (getline(cfile, line)) {
+		// Skip lines beginning with a #
+		if (line.rfind("#", 0) == 0)
+			continue;
+
+		epos = line.find("=");
+		key = line.substr(0, epos);
+		val = line.substr(epos+1, line.length());
+		config.insert(std::pair<std::string, std::string> (key, val));
+	}
+	cfile.close();
+
+	// Validate at least vhost, port, and diskpath are present
+	auto it_vhost = config.find("vhost");
+	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");
+		return -1;
+	}
+
     // Ignore SIGPIPE "Broken pipe" signals when socket connections are broken.
     signal(SIGPIPE, handleSigPipe);
 
@@ -45,8 +79,8 @@ int main (int argc, const char * argv[])
 	signal(SIGTERM, &handleTermSig);
 
     // Instance and start the server
-	svr = new HTTPServer();
-	svr->start(8080);
+	svr = new HTTPServer(config["vhost"], atoi(config["port"].c_str()), config["diskpath"]);
+	svr->start();
 
 	// Run main event loop
 	svr->process();

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ Resource::Resource(std::string loc, bool dir) {`
`28`	`28`
`29`	`29`	`Resource::~Resource() {`
`30`	`30`	`if(data != NULL) {`
`31`		`- delete data;`
	`31`	`+ delete [] data;`
`32`	`32`	`data = NULL;`
`33`	`33`	`}`
`34`	`34`	`}`