X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver.cpp;h=cd0889fb2226993d3df5498b6e2604e49a39bcb4;hb=026c579e4cac7d4545b3c8c3a0d690c8509dc713;hp=6782187fe2989aaddbfbaf6ac48fbd8fb8e7158d;hpb=6ad780e527094d5d1cb68af1ec326b58db182c80;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 6782187fe..cd0889fb2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -64,8 +64,8 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
 	if (getFullVersion)
-		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
-	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+		return INSPIRCD_VERSION ". " + Config->ServerName + " :[" + Config->sid + "] " + Config->CustomVersion;
+	return INSPIRCD_BRANCH ". " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -155,6 +155,27 @@ std::string UIDGenerator::GetUID()
 	return current_uid;
 }
 
+void ISupportManager::AppendValue(std::string& buffer, const std::string& value)
+{
+	// If this token has no value then we have nothing to do.
+	if (value.empty())
+		return;
+
+	// This function implements value escaping according to the rules of the ISUPPORT draft:
+	// https://tools.ietf.org/html/draft-brocklesby-irc-isupport-03
+	buffer.push_back('=');
+	for (std::string::const_iterator iter = value.begin(); iter != value.end(); ++iter)
+	{
+		// The value must be escaped if:
+		//   (1) It is a banned character in an IRC <middle> parameter (NUL, LF, CR, SPACE).
+		//   (2) It has special meaning within an ISUPPORT token (EQUALS, BACKSLASH).
+		if (*iter == '\0' || *iter == '\n' || *iter == '\r' || *iter == ' ' || *iter == '=' || *iter == '\\')
+			buffer.append(InspIRCd::Format("\\x%X", *iter));
+		else
+			buffer.push_back(*iter);
+	}
+}
+
 void ISupportManager::Build()
 {
 	/**
@@ -164,12 +185,11 @@ void ISupportManager::Build()
 	std::map<std::string, std::string> tokens;
 
 	tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
-	tokens["CASEMAPPING"] = "rfc1459";
+	tokens["CASEMAPPING"] = ServerInstance->Config->CaseMapping;
 	tokens["CHANLIMIT"] = InspIRCd::Format("#:%u", ServerInstance->Config->MaxChans);
 	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
 	tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
 	tokens["CHANTYPES"] = "#";
-	tokens["ELIST"] = "MU";
 	tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
 	tokens["MAXTARGETS"] = ConvToStr(ServerInstance->Config->MaxTargets);
 	tokens["MODES"] = ConvToStr(ServerInstance->Config->Limits.MaxModes);
@@ -200,10 +220,7 @@ void ISupportManager::Build()
 	{
 		numeric.push(it->first);
 		std::string& token = numeric.GetParams().back();
-
-		// If this token has a value then append a '=' char after the name and then the value itself
-		if (!it->second.empty())
-			token.append(1, '=').append(it->second);
+		AppendValue(token, it->second);
 
 		token_count++;