From d90d06307d7ecd31f80a1567218a056e66b84dd0 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 9 May 2019 16:47:47 -0700
Subject: [PATCH] ircd: Add validations on init() origin/servername inputs.

---
 ircd/ircd.cc | 18 +++++++++++++++++-
 ircd/m.cc    |  6 ++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ircd/ircd.cc b/ircd/ircd.cc
index 17663a4e8..f0e2507fc 100644
--- a/ircd/ircd.cc
+++ b/ircd/ircd.cc
@@ -64,18 +64,34 @@ ircd::init(boost::asio::io_context &user_ios,
            const string_view &servername)
 try
 {
+	// This function must only be called from a HALT state.
 	if(run::level != run::level::HALT)
 		throw error
 		{
 			"Cannot init() IRCd from runlevel %s", reflect(run::level)
 		};
 
-	ios::init(user_ios);
+	// Check that the supplied origin string is properly formatted.
+	if(!rfc3986::valid_remote(std::nothrow, origin))
+		throw user_error
+		{
+			"The 'origin' argument \"%s\" is not a valid hostname.", origin
+		};
+
+	// Check that the supplied servername string is properly formatted.
+	if(!rfc3986::valid_remote(std::nothrow, servername))
+		throw user_error
+		{
+			"The 'servername' argument \"%s\" is not a valid hostname.", servername
+		};
 
 	// Save the params used for m::init later.
 	_origin = std::string{origin};
 	_servername = std::string{servername};
 
+	// Setup the core event loop system starting with the user's supplied ios.
+	ios::init(user_ios);
+
 	// The log is available. but it is console-only until conf opens files.
 	log::init();
 	log::mark("DEADSTART"); // 6600
diff --git a/ircd/m.cc b/ircd/m.cc
index c878ce495..b497029a3 100644
--- a/ircd/m.cc
+++ b/ircd/m.cc
@@ -402,6 +402,12 @@ extern ircd::m::room::id::buf nodes_room_id;
 ircd::m::self::init::init(const string_view &origin,
                           const string_view &servername)
 {
+	// Sanity check that these are valid hostname strings. This was likely
+	// already checked, so these validators will simply throw without very
+	// useful error messages if invalid strings ever make it this far.
+	rfc3986::valid_host(origin);
+	rfc3986::valid_host(servername);
+
 	self::origin = origin;
 	self::servername = servername;