Merge remote-tracking branch 'upstream/insp4' into insp4

Author: siniStar7

docs/Doxyfile

@@ -37,6 +37,7 @@ MARKDOWN_SUPPORT       = YES
 TOC_INCLUDE_HEADINGS   = 5
 MARKDOWN_ID_STYLE      = GITHUB
 AUTOLINK_SUPPORT       = YES
+AUTOLINK_IGNORE_WORDS  =
 BUILTIN_STL_SUPPORT    = YES
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
@@ -61,6 +62,7 @@ EXTRACT_ANON_NSPACES   = NO
 RESOLVE_UNNAMED_PARAMS = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_NAMESPACES  = YES
 HIDE_FRIEND_COMPOUNDS  = NO
 HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
@@ -90,13 +92,15 @@ SHOW_NAMESPACES        = YES
 FILE_VERSION_FILTER    =
 LAYOUT_FILE            =
 CITE_BIB_FILES         =
+EXTERNAL_TOOL_PATH     =
 QUIET                  = NO
 WARNINGS               = NO
 WARN_IF_UNDOCUMENTED   = NO
 WARN_IF_DOC_ERROR      = YES
 WARN_IF_INCOMPLETE_DOC = YES
 WARN_NO_PARAMDOC       = NO
 WARN_IF_UNDOC_ENUM_VAL = NO
+WARN_LAYOUT_FILE       = YES
 WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LINE_FORMAT       = "at line $line of file $file"
@@ -121,6 +125,7 @@ FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
 USE_MDFILE_AS_MAINPAGE = README.md
+IMPLICIT_DIR_DOCS      = YES
 FORTRAN_COMMENT_AFTER  = 72
 SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
@@ -179,6 +184,7 @@ DISABLE_INDEX          = NO
 GENERATE_TREEVIEW      = NO
 FULL_SIDEBAR           = NO
 ENUM_VALUES_PER_LINE   = 4
+SHOW_ENUM_VALUES       = NO
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
 OBFUSCATE_EMAILS       = YES
@@ -289,6 +295,7 @@ DIAFILE_DIRS           =
 PLANTUML_JAR_PATH      =
 PLANTUML_CFG_FILE      =
 PLANTUML_INCLUDE_PATH  =
+PLANTUMLFILE_DIRS      =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_MULTI_TARGETS      = NO

src/configreader.cpp

@@ -52,7 +52,7 @@ ServerConfig::ServerLimits::ServerLimits(const std::shared_ptr<ConfigTag>& tag)
 	, MaxKick(tag->getNum<size_t>("maxkick", 300, 1, MaxLine))
 	, MaxReal(tag->getNum<size_t>("maxreal", 130, 1, MaxLine))
 	, MaxAway(tag->getNum<size_t>("maxaway", 200, 1, MaxLine))
-	, MaxHost(tag->getNum<size_t>("maxhost", 64, 1, MaxLine))
+	, MaxHost(tag->getNum<size_t>("maxhost", 64, 45, MaxLine))
 {
 }
 

src/helperfuncs.cpp

@@ -277,7 +277,7 @@ bool InspIRCd::DefaultIsNick(const std::string_view& n)
 /* return true for good username, false else */
 bool InspIRCd::DefaultIsUser(const std::string_view& n)
 {
-	if (n.empty())
+	if (n.empty() || n.length() > ServerInstance->Config->Limits.MaxUser)
 		return false;
 
 	for (const auto chr : n)

src/users.cpp

@@ -901,26 +901,28 @@ bool User::SharesChannelWith(User* other) const
 
 void User::ChangeRealName(const std::string& real)
 {
-	if (!this->realname.compare(real))
+	const auto treal = real.substr(0, ServerInstance->Config->Limits.MaxReal);
+	if (!this->realname.compare(treal))
 		return;
 
-	FOREACH_MOD(OnChangeRealName, (this, real));
+	FOREACH_MOD(OnChangeRealName, (this, treal));
 
-	this->realname.assign(real, 0, ServerInstance->Config->Limits.MaxReal);
+	this->realname.assign(treal);
 	this->realname.shrink_to_fit();
 }
 
 void User::ChangeDisplayedHost(const std::string& newhost)
 {
-	if (GetDisplayedHost() == newhost)
+	const auto tnewhost = newhost.substr(0, ServerInstance->Config->Limits.MaxHost);
+	if (GetDisplayedHost() == tnewhost)
 		return;
 
-	FOREACH_MOD(OnChangeHost, (this, newhost));
+	FOREACH_MOD(OnChangeHost, (this, tnewhost));
 
-	if (realhost == newhost)
+	if (realhost == tnewhost)
 		this->displayhost.clear();
 	else
-		this->displayhost.assign(newhost, 0, ServerInstance->Config->Limits.MaxHost);
+		this->displayhost.assign(tnewhost);
 	this->displayhost.shrink_to_fit();
 
 	this->InvalidateCache();
@@ -933,7 +935,8 @@ void User::ChangeRealHost(const std::string& newhost, bool resetdisplay)
 {
 	// If the real host is the new host and we are not resetting the
 	// display host then we have nothing to do.
-	const bool changehost = (realhost != newhost);
+	const auto tnewhost = newhost.substr(0, ServerInstance->Config->Limits.MaxHost);
+	const bool changehost = (realhost != tnewhost);
 	if (!changehost && !resetdisplay)
 		return;
 
@@ -944,7 +947,7 @@ void User::ChangeRealHost(const std::string& newhost, bool resetdisplay)
 
 	// If the displayhost is the new host or we are resetting it then
 	// we clear its contents to save memory.
-	else if (displayhost == newhost || resetdisplay)
+	else if (displayhost == tnewhost || resetdisplay)
 		displayhost.clear();
 
 	// If we are just resetting the display host then we don't need to
@@ -958,9 +961,9 @@ void User::ChangeRealHost(const std::string& newhost, bool resetdisplay)
 	// Don't call the OnChangeRealHost event when initialising a user.
 	const bool initializing = realhost.empty();
 	if (!initializing)
-		FOREACH_MOD(OnChangeRealHost, (this, newhost));
+		FOREACH_MOD(OnChangeRealHost, (this, tnewhost));
 
-	realhost = newhost;
+	realhost = tnewhost;
 	realhost.shrink_to_fit();
 
 	this->InvalidateCache();
@@ -974,7 +977,8 @@ void User::ChangeRealUser(const std::string& newuser, bool resetdisplay)
 {
 	// If the real user is the new user and we are not resetting the
 	// display user then we have nothing to do.
-	const bool changeuser = (realuser != newuser);
+	const auto tnewuser = newuser.substr(0, ServerInstance->Config->Limits.MaxUser);
+	const bool changeuser = (realuser != tnewuser);
 	if (!changeuser && !resetdisplay)
 		return;
 
@@ -985,7 +989,7 @@ void User::ChangeRealUser(const std::string& newuser, bool resetdisplay)
 
 	// If the displayuser is the new user or we are resetting it then
 	// we clear its contents to save memory.
-	else if (displayuser == newuser || resetdisplay)
+	else if (displayuser == tnewuser || resetdisplay)
 		displayuser.clear();
 
 	// If we are just resetting the display user then we don't need to
@@ -996,9 +1000,9 @@ void User::ChangeRealUser(const std::string& newuser, bool resetdisplay)
 	// Don't call the OnChangeRealUser event when initialising a user.
 	const bool initializing = realuser.empty();
 	if (!initializing)
-		FOREACH_MOD(OnChangeRealUser, (this, newuser));
+		FOREACH_MOD(OnChangeRealUser, (this, tnewuser));
 
-	realuser = newuser;
+	realuser = tnewuser;
 	realuser.shrink_to_fit();
 
 	this->InvalidateCache();
@@ -1010,15 +1014,16 @@ void User::ChangeRealUser(const std::string& newuser, bool resetdisplay)
 
 void User::ChangeDisplayedUser(const std::string& newuser)
 {
-	if (GetDisplayedUser() == newuser)
+	const auto tnewuser = newuser.substr(0, ServerInstance->Config->Limits.MaxUser);
+	if (GetDisplayedUser() == tnewuser)
 		return;
 
-	FOREACH_MOD(OnChangeUser, (this, newuser));
+	FOREACH_MOD(OnChangeUser, (this, tnewuser));
 
-	if (realuser == newuser)
+	if (realuser == tnewuser)
 		this->displayuser.clear();
 	else
-		this->displayuser.assign(newuser, 0, ServerInstance->Config->Limits.MaxUser);
+		this->displayuser.assign(tnewuser);
 	this->displayuser.shrink_to_fit();
 
 	this->InvalidateCache();