X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=bf61d76ea480b63cc0689baa7ab2ad830926245e;hb=66ecf04088b747c00e7fdf8380fbece7848018be;hp=3eb556234d3a12a16bb9cb851725cdc5c4cd65c3;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 3eb556234..bf61d76ea 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -23,6 +23,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/stats.h"
 
 /** An XLineFactory specialized to generate GLine* pointers
  */
@@ -33,7 +34,7 @@ class GLineFactory : public XLineFactory
 
 	/** Generate a GLine
 	 */
-	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+	XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
 	{
 		IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
 		return new GLine(set_time, duration, source, reason, ih.first, ih.second);
@@ -49,7 +50,7 @@ class ELineFactory : public XLineFactory
 
 	/** Generate an ELine
 	 */
-	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+	XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
 	{
 		IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
 		return new ELine(set_time, duration, source, reason, ih.first, ih.second);
@@ -65,7 +66,7 @@ class KLineFactory : public XLineFactory
 
 	/** Generate a KLine
 	 */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
         {
                 IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
                 return new KLine(set_time, duration, source, reason, ih.first, ih.second);
@@ -81,7 +82,7 @@ class QLineFactory : public XLineFactory
 
 	/** Generate a QLine
 	 */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
         {
                 return new QLine(set_time, duration, source, reason, xline_specific_mask);
         }
@@ -96,7 +97,7 @@ class ZLineFactory : public XLineFactory
 
 	/** Generate a ZLine
 	 */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
         {
                 return new ZLine(set_time, duration, source, reason, xline_specific_mask);
         }
@@ -159,6 +160,7 @@ void XLineManager::CheckELines()
 	for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
 	{
 		LocalUser* u = *u2;
+		u->exempt = false;
 
 		/* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
 		LookupIter safei;
@@ -169,7 +171,8 @@ void XLineManager::CheckELines()
 			safei++;
 
 			XLine *e = i->second;
-			u->exempt = e->Matches(u);
+			if ((!e->duration || ServerInstance->Time() < e->expiry) && e->Matches(u))
+				u->exempt = true;
 
 			i = safei;
 		}
@@ -259,15 +262,34 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	ContainerIter x = lookup_lines.find(line->type);
 	if (x != lookup_lines.end())
 	{
-		LookupIter i = x->second.find(line->Displayable().c_str());
+		LookupIter i = x->second.find(line->Displayable());
 		if (i != x->second.end())
 		{
-			// XLine propagation bug was here, if the line to be added already exists and
-			// it's expired then expire it and add the new one instead of returning false
-			if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
-				return false;
+			bool silent = false;
 
-			ExpireLine(x, i);
+			// Allow replacing a config line for an updated config line.
+			if (i->second->from_config && line->from_config)
+			{
+				// Nothing changed, skip adding this one.
+				if (i->second->reason == line->reason)
+					return false;
+
+				silent = true;
+			}
+			// Allow replacing a non-config line for a new config line.
+			else if (!line->from_config)
+			{
+				// X-line propagation bug was here, if the line to be added already exists and
+				// it's expired then expire it and add the new one instead of returning false
+				if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+					return false;
+			}
+			else
+			{
+				silent = true;
+			}
+
+			ExpireLine(x, i, silent);
 		}
 	}
 
@@ -281,7 +303,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	if (xlf->AutoApplyToUserList(line))
 		pending_lines.push_back(line);
 
-	lookup_lines[line->type][line->Displayable().c_str()] = line;
+	lookup_lines[line->type][line->Displayable()] = line;
 	line->OnAdd();
 
 	FOREACH_MOD(OnAddLine, (user, line));
@@ -291,7 +313,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
 
 // deletes a line, returns true if the line existed and was removed
 
-bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
+bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate)
 {
 	ContainerIter x = lookup_lines.find(type);
 
@@ -303,6 +325,8 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 	if (y == x->second.end())
 		return false;
 
+	reason.assign(y->second->reason);
+
 	if (simulate)
 		return true;
 
@@ -312,9 +336,7 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 
 	y->second->Unset();
 
-	std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second);
-	if (pptr != pending_lines.end())
-		pending_lines.erase(pptr);
+	stdalgo::erase(pending_lines, y->second);
 
 	delete y->second;
 	x->second.erase(y);
@@ -325,18 +347,10 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 
 void ELine::Unset()
 {
-	/* remove exempt from everyone and force recheck after deleting eline */
-	const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-	for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
-	{
-		LocalUser* u = *u2;
-		u->exempt = false;
-	}
-
 	ServerInstance->XLines->CheckELines();
 }
 
-// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+// returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match
 
 XLine* XLineManager::MatchesLine(const std::string &type, User* user)
 {
@@ -408,20 +422,20 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 }
 
 // removes lines that have expired
-void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool silent)
 {
 	FOREACH_MOD(OnExpireLine, (item->second));
 
-	item->second->DisplayExpiry();
+	if (!silent)
+		item->second->DisplayExpiry();
+
 	item->second->Unset();
 
 	/* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
 	 * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
 	 * -- Brain
 	 */
-	std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
-	if (pptr != pending_lines.end())
-		pending_lines.erase(pptr);
+	stdalgo::erase(pending_lines, item->second);
 
 	delete item->second;
 	container->second.erase(item);
@@ -451,7 +465,7 @@ void XLineManager::ApplyLines()
 	pending_lines.clear();
 }
 
-void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
+void XLineManager::InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats)
 {
 	ContainerIter n = lookup_lines.find(type);
 
@@ -472,7 +486,7 @@ void XLineManager::InvokeStats(const std::string &type, int numeric, User* user,
 				ExpireLine(n, i);
 			}
 			else
-				results.push_back(ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+				stats.AddRow(numeric, i->second->Displayable()+" "+
 					ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
 			i = safei;
 		}
@@ -527,18 +541,18 @@ void XLine::Apply(User* u)
 
 bool XLine::IsBurstable()
 {
-	return true;
+	return !from_config;
 }
 
 void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 {
-	const std::string banReason = line + "-Lined: " + reason;
+	const std::string banReason = line + "-lined: " + reason;
 
 	if (!ServerInstance->Config->XLineMessage.empty())
-		u->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
+		u->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
 
 	if (ServerInstance->Config->HideBans)
-		ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);
+		ServerInstance->Users->QuitUser(u, line + "-lined", &banReason);
 	else
 		ServerInstance->Users->QuitUser(u, banReason);
 
@@ -546,7 +560,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	if (bancache)
 	{
 		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
-		ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, this->duration);
+		ServerInstance->BanCache.AddHit(u->GetIPString(), this->type, banReason, (this->duration > 0 ? (this->expiry - ServerInstance->Time()) : 0));
 	}
 }
 
@@ -558,7 +572,7 @@ bool KLine::Matches(User *u)
 
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
 		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
@@ -581,7 +595,7 @@ bool GLine::Matches(User *u)
 
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
 		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
@@ -598,13 +612,9 @@ void GLine::Apply(User* u)
 
 bool ELine::Matches(User *u)
 {
-	LocalUser* lu = IS_LOCAL(u);
-	if (lu && lu->exempt)
-		return false;
-
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||
 		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
@@ -642,7 +652,7 @@ bool QLine::Matches(User *u)
 
 void QLine::Apply(User* u)
 {
-	/* Force to uuid on apply of qline, no need to disconnect any more :) */
+	/* Force to uuid on apply of Q-line, no need to disconnect anymore :) */
 	u->ChangeNick(u->uuid);
 }
 
@@ -680,7 +690,7 @@ bool GLine::Matches(const std::string &str)
 
 void ELine::OnAdd()
 {
-	/* When adding one eline, only check the one eline */
+	/* When adding one E-line, only check the one E-line */
 	const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
 	for (UserManager::LocalList::const_iterator u2 = list.begin(); u2 != list.end(); u2++)
 	{
@@ -693,8 +703,8 @@ void ELine::OnAdd()
 void XLine::DisplayExpiry()
 {
 	bool onechar = (type.length() == 1);
-	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)",
-		type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %s ago): %s",
+		type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
 }
 
 const std::string& ELine::Displayable()
@@ -760,3 +770,24 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
 
 	return n->second;
 }
+
+void XLineManager::ExpireRemovedConfigLines(const std::string& type, const insp::flat_set<std::string>& configlines)
+{
+	// Nothing to do.
+	if (lookup_lines.empty())
+		return;
+
+	ContainerIter xlines = lookup_lines.find(type);
+	if (xlines == lookup_lines.end())
+		return;
+
+	for (LookupIter xline = xlines->second.begin(); xline != xlines->second.end(); )
+	{
+		LookupIter cachedxline = xline++;
+		if (!cachedxline->second->from_config)
+			continue;
+
+		if (!configlines.count(cachedxline->second->Displayable()))
+			ExpireLine(xlines, cachedxline);
+	}
+}