0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-27 07:54:05 +01:00

ircd: Add validations on init() origin/servername inputs.

This commit is contained in:
Jason Volk 2019-05-09 16:47:47 -07:00
parent 96dfcaa122
commit d90d06307d
2 changed files with 23 additions and 1 deletions

View file

@ -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

View file

@ -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;