Serve static files from http

src/client/client.cpp

@@ -145,7 +145,7 @@ Client::Client(
 		tsrc, this
 	),
 	m_particle_manager(std::make_unique<ParticleManager>(&m_env)),
-	m_con(new con::Connection(PROTOCOL_ID, is_simple_singleplayer_game ? MAX_PACKET_SIZE_SINGLEPLAYER : MAX_PACKET_SIZE, CONNECTION_TIMEOUT, ipv6, this)),
+	m_con(new con_use::Connection(PROTOCOL_ID, is_simple_singleplayer_game ? MAX_PACKET_SIZE_SINGLEPLAYER : MAX_PACKET_SIZE, CONNECTION_TIMEOUT, ipv6, this)),
 	m_address_name(address_name),
 	m_allow_login_or_register(allow_login_or_register),
 	m_server_ser_ver(SER_FMT_VER_INVALID),

src/network/wssocket.cpp

@@ -21,15 +21,22 @@ along with Freeminer.  If not, see <http://www.gnu.org/licenses/>.
 
 // Todo: pass disconnect to Connection (need to change api)
 
+/* 
+openssl genrsa > privkey.pem                             
+openssl req -new -x509 -key privkey.pem > fullchain.pem  
+*/
+
 #include "config.h"
 #if USE_WEBSOCKET || USE_WEBSOCKET_SCTP
 
 #include "wssocket.h"
 #include "constants.h"
-#include "iostream_debug_helpers.h"
+#include "filesys.h"
 #include "log.h"
+#include "settings.h"
 #include "util/numeric.h"
 #include "util/string.h"
+#include <string>
 
 #ifdef _WIN32
 // Without this some of the network functions are not found on mingw
@@ -125,24 +132,57 @@ void WSSocket::on_http(const websocketpp::connection_hdl &hdl)
 
 	std::stringstream ss;
 	ss << "got HTTP request with " << res.size() << " bytes of body data.";
-	cs << ss.str() << std::endl;
+	cs << ss.str() << '\n';
+	std::string http_root = porting::path_share + DIR_DELIM + "http_root" + DIR_DELIM;
+	g_settings->getNoEx("http_root", http_root);
+
+	if (con->get_request().get_method() == "GET") {
+
+		if (con->get_request().get_uri().find("..") != std::string::npos) {
+			con->set_status(websocketpp::http::status_code::bad_request);
+			return;
+		}
+
+		std::string path_serve;
+
+		const auto uri = con->get_request().get_uri();
+		if (uri == "/") {
+			path_serve = http_root + DIR_DELIM + "index.html";
+		} else if (uri == "/favicon.ico") {
+			path_serve = porting::path_share + DIR_DELIM + "misc" + DIR_DELIM +
+						 PROJECT_NAME + ".ico";
+		} else if (!uri.empty()) {
+			path_serve = http_root + uri;
+		}
+
+		if (!path_serve.empty()) {
+			std::ifstream t(path_serve);
+			std::stringstream buffer;
+			buffer << t.rdbuf();
+			con->set_body(buffer.str());
+			con->set_status(websocketpp::http::status_code::ok);
+
+			// TODO: serve log here
+			return;
+		}
+	}
+	// DUMP(con->get_request().get_method(), con->get_request().get_version(), con->get_request().get_uri(), con->get_request().get_headers(), res);
 
 	con->set_body(ss.str());
-	con->set_status(websocketpp::http::status_code::ok);
+	con->set_status(websocketpp::http::status_code::not_found);
 }
 
 void WSSocket::on_fail(const websocketpp::connection_hdl &hdl)
 {
 	ws_server_t::connection_ptr con = server.get_con_from_hdl(hdl);
 
-	cs << "Fail handler: " << con->get_ec() << " " << con->get_ec().message()
-	   << std::endl;
-	   //auto ec = websocketpp::get_transport_ec();
+	cs << "Fail handler: " << con->get_ec() << " " << con->get_ec().message() << '\n';
+	//auto ec = websocketpp::get_transport_ec();
 }
 
 void WSSocket::on_close(const websocketpp::connection_hdl &hdl)
 {
-	cs << "Close handler" << std::endl;
+	cs << "Close handler" << '\n';
 
 	// auto ws = hdls.at(hdl);
 
@@ -152,7 +192,7 @@ void WSSocket::on_close(const websocketpp::connection_hdl &hdl)
 
 void WSSocket::on_open(const websocketpp::connection_hdl &)
 {
-	cs << "open handler" << std::endl;
+	cs << "open handler" << '\n';
 }
 
 void WSSocket::on_message(const websocketpp::connection_hdl &hdl, const message_ptr &msg)
@@ -178,22 +218,21 @@ void WSSocket::on_message(const websocketpp::connection_hdl &hdl, const message_
 		// con->get_remote_endpoint());
 
 		cs << "first message from " << a << " : " << msg->get_payload().size() << " "
-		   << msg->get_payload() << std::endl;
+		   << msg->get_payload() << '\n';
 
 		hdls.emplace(hdl, a);
 
 		websocketpp::lib::error_code ec;
 		server.send(hdl, "PROXY OK", msg->get_opcode(), ec);
 		if (ec) {
 			cs << "Echo failed because: "
-			   << "(" << ec.value() << ":" << ec.message() << ")" << std::endl;
+			   << "(" << ec.value() << ":" << ec.message() << ")" << '\n';
 		}
 		return;
 	}
 
 	std::string s{msg->get_payload().data(), msg->get_payload().size()};
-	cs << "A message: " << msg->get_payload().size() << " " << msg->get_payload()
-	   << std::endl;
+	cs << "A message: " << msg->get_payload().size() << " " << msg->get_payload() << '\n';
 
 	incoming_queue.emplace_back(queue_item{a, std::move(s)});
 }
@@ -258,9 +297,13 @@ WSSocket::context_ptr WSSocket::on_tls_init(const websocketpp::connection_hdl &
 		ctx->set_password_callback(std::bind([&]() {
 			return ""; /*GetSSLPassword();*/
 		}));
-		ctx->use_certificate_chain_file("fullchain.pem" /*GetSSLCertificateChain()*/);
-		ctx->use_private_key_file(
-				"privkey.pem" /*GetSSLPrivateKey()*/, asio::ssl::context::pem);
+
+		std::string chain = "fullchain.pem";
+		std::string key = "privkey.pem";
+		g_settings->getNoEx("https_chain", chain);
+		g_settings->getNoEx("https_key", key);
+		ctx->use_certificate_chain_file(chain /*GetSSLCertificateChain()*/);
+		ctx->use_private_key_file(key /*GetSSLPrivateKey()*/, asio::ssl::context::pem);
 		std::string ciphers; // = GetSSLCiphers();
 		if (ciphers.empty())
 			ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:"
@@ -289,7 +332,7 @@ WSSocket::~WSSocket()
 	if (socket_enable_debug_output) {
 		tracestream << "WSSocket( "
 					//<< (int)m_handle
-					<< ")::~WSSocket()" << std::endl;
+					<< ")::~WSSocket()" << '\n';
 	}
 }
 
@@ -298,18 +341,18 @@ void WSSocket::Bind(Address addr)
 	if (socket_enable_debug_output) {
 		tracestream << "WSSocket(" //<< (int)m_handle
 					<< ")::Bind(): " << addr.serializeString() << ":" << addr.getPort()
-					<< std::endl;
+					<< '\n';
 	}
 	websocketpp::lib::error_code ec;
 	server.listen(addr.getPort(), ec);
 	if (ec) {
-		errorstream << "WS listen fail: " << ec.message() << std::endl;
+		errorstream << "WS listen fail: " << ec.message() << '\n';
 		return;
 	}
 	// Start the server accept loop
 	server.start_accept(ec);
 	if (ec) {
-		errorstream << "WS listen fail: " << ec.message() << std::endl;
+		errorstream << "WS listen fail: " << ec.message() << '\n';
 		return;
 	}
 
@@ -344,13 +387,12 @@ void WSSocket::Send(const Address &destination, const void *data, int size)
 		if (dumping_packet)
 			tracestream << " (DUMPED BY INTERNET_SIMULATOR)";
 
-		tracestream << std::endl;
+		tracestream << '\n';
 	}
 
 	if (dumping_packet) {
 		// Lol let's forget it
-		tracestream << "WSSocket::Send(): INTERNET_SIMULATOR: dumping packet."
-					<< std::endl;
+		tracestream << "WSSocket::Send(): INTERNET_SIMULATOR: dumping packet." << '\n';
 		return;
 	}
 
@@ -363,14 +405,13 @@ void WSSocket::Send(const Address &destination, const void *data, int size)
 		}
 	}
 	if (!found) {
-		verbosestream << " Send to " << destination << " not found in peers" << std::endl;
+		verbosestream << " Send to " << destination << " not found in peers" << '\n';
 		return;
 	}
 	websocketpp::lib::error_code ec;
 	server.send(hdl, data, size, websocketpp::frame::opcode::value::binary, ec);
 	if (ec.value()) {
-		verbosestream << "WS Send failed " << ec.value() << ":" << ec.message()
-					  << std::endl;
+		verbosestream << "WS Send failed " << ec.value() << ":" << ec.message() << '\n';
 		// Maybe delete peer here?
 	}
 	// Server.run_one();
@@ -387,7 +428,7 @@ int WSSocket::Receive(Address &sender, void *data, int size)
 	int received = item.data.size();
 	if (size < received) {
 		tracestream << "Packet size " << size << " larger than buffer " << received
-					<< std::endl;
+					<< '\n';
 		return -1;
 	}
 	sender = item.address;
@@ -411,7 +452,7 @@ int WSSocket::Receive(Address &sender, void *data, int size)
 		if (received > 20)
 			tracestream << "...";
 
-		tracestream << std::endl;
+		tracestream << '\n';
 	}
 
 	return received;

src/network/wssocket.h

@@ -61,7 +61,7 @@ class WSSocket
 #if USE_SSL
 	using ws_server_t = websocketpp::server<websocketpp::config::asio_tls>;
 	//typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+	typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
 #else
 	using ws_server_t = websocketpp::server<websocketpp::config::asio>;
@@ -79,7 +79,6 @@ typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 	void on_message(const websocketpp::connection_hdl &hdl, const message_ptr &msg);
 	context_ptr on_tls_init(const websocketpp::connection_hdl &hdl);
 
-
 private:
 	struct queue_item
 	{

util/autotest/auto.pl

@@ -968,7 +968,7 @@ (@)
     say "task start $name ", @_;
     #$g = {task_name => $name, build_name => $name,};
     $g->{task_name}  = $name;
-    local $g->{build_name} = $config->{build_name};
+    local $g->{build_name} = $config->{build_name} if $config->{build_name};
     #task_run($name, @_);
     commands_run($name, @_);
 }