Merge branch 'insp3' into master.

5 files changed, 75 insertions, 33 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index f127c41fb..fa04a232b 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -57,6 +57,7 @@ ServerConfig::ServerPaths::ServerPaths(std::shared_ptr<ConfigTag> tag)
 	, Data(tag->getString("datadir", INSPIRCD_DATA_PATH, 1))
 	, Log(tag->getString("logdir", INSPIRCD_LOG_PATH, 1))
 	, Module(tag->getString("moduledir", INSPIRCD_MODULE_PATH, 1))
+	, Runtime(tag->getString("runtimedir", INSPIRCD_RUNTIME_PATH, 1))
 {
 }
 
diff --git a/src/coremods/core_oper/umode_s.cpp b/src/coremods/core_oper/umode_s.cpp
index c3472411e..16c7e23b8 100644
--- a/src/coremods/core_oper/umode_s.cpp
+++ b/src/coremods/core_oper/umode_s.cpp
@@ -104,6 +104,13 @@ std::string ModeUserServerNoticeMask::ProcessNoticeMasks(User* user, const std::
 						user->WriteNumeric(ERR_UNKNOWNSNOMASK, *i, "is an unknown snomask character");
 						continue;
 					}
+					else if (!user->IsOper())
+					{
+						user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Only operators may %sset snomask %c",
+							adding ? "" : "un", *i));
+						continue;
+
+					}
 					else if (!user->HasSnomaskPermission(*i))
 					{
 						user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper type %s does not have access to snomask %c",
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a33ec4bc3..8c3503410 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -332,7 +332,7 @@ namespace
 
 		if (do_version)
 		{
-			std::cout << std::endl << INSPIRCD_VERSION << std::endl;
+			std::cout << INSPIRCD_VERSION << std::endl;
 			ServerInstance->Exit(EXIT_STATUS_NOERROR);
 		}
 
@@ -446,7 +446,7 @@ void InspIRCd::WritePID(bool exitonfail)
 	}
 
 	const std::string pidfile = ServerInstance->Config->ConfValue("pid")->getString("file", "inspircd.pid", 1);
-	std::ofstream outfile(ServerInstance->Config->Paths.PrependData(pidfile));
+	std::ofstream outfile(ServerInstance->Config->Paths.PrependRuntime(pidfile));
 	if (outfile.is_open())
 	{
 		outfile << getpid();
@@ -485,6 +485,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	this->Config->cmdline.argv = argv;
 	this->Config->cmdline.argc = argc;
+	ParseOptions();
 
 #ifdef _WIN32
 	// Initialize the console values
@@ -516,7 +517,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
 		<< "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl
 		<< std::endl;
 
-	ParseOptions();
 	if (Config->cmdline.forcedebug)
 	{
 		FileWriter* fw = new FileWriter(stdout, 1);
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 376ada344..98b121a0d 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -43,8 +43,16 @@ class DNSBLConfEntry
 		unsigned long duration;
 		unsigned int bitmask;
 		unsigned char records[256];
-		unsigned long stats_hits, stats_misses;
-		DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
+		unsigned long stats_hits, stats_misses, stats_errors;
+		DNSBLConfEntry()
+			: type(A_BITMASK)
+			, duration(86400)
+			, bitmask(0)
+			, stats_hits(0)
+			, stats_misses(0)
+			, stats_errors(0)
+		{
+		}
 };
 
 
@@ -78,41 +86,55 @@ class DNSBLResolver : public DNS::Request
 		if (!them || them->client_sa != theirsa)
 			return;
 
+		int i = countExt.get(them);
+		if (i)
+			countExt.set(them, i - 1);
+
+		// The DNSBL reply must contain an A result.
 		const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(DNS::QUERY_A);
 		if (!ans_record)
+		{
+			ConfEntry->stats_errors++;
+			ServerInstance->SNO.WriteGlobalSno('d', "%s returned an result with no IPv4 address.",
+				ConfEntry->name.c_str());
 			return;
+		}
 
-		// All replies should be in 127.0.0.0/8
-		if (ans_record->rdata.compare(0, 4, "127.") != 0)
+		// The DNSBL reply must be a valid IPv4 address.
+		in_addr resultip;
+		if (inet_pton(AF_INET, ans_record->rdata.c_str(), &resultip) != 1)
 		{
-			ServerInstance->SNO.WriteGlobalSno('d', "DNSBL: %s returned address outside of acceptable subnet 127.0.0.0/8: %s", ConfEntry->domain.c_str(), ans_record->rdata.c_str());
-			ConfEntry->stats_misses++;
+			ConfEntry->stats_errors++;
+			ServerInstance->SNO.WriteGlobalSno('d', "%s returned an invalid IPv4 address: %s",
+				ConfEntry->name.c_str(), ans_record->rdata.c_str());
 			return;
 		}
 
-		int i = countExt.get(them);
-		if (i)
-			countExt.set(them, i - 1);
-
-		// Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
+		// The DNSBL reply should be in the 127.0.0.0/8 range.
+		if ((resultip.s_addr & 0xFF) != 127)
+		{
+			ConfEntry->stats_errors++;
+			ServerInstance->SNO.WriteGlobalSno('d', "%s returned an IPv4 address which is outside of the 127.0.0.0/8 subnet: %s",
+				ConfEntry->name.c_str(), ans_record->rdata.c_str());
+			return;
+		}
 
-		unsigned int bitmask = 0, record = 0;
 		bool match = false;
-		in_addr resultip;
-
-		inet_pton(AF_INET, ans_record->rdata.c_str(), &resultip);
-
+		unsigned int result = 0;
 		switch (ConfEntry->type)
 		{
 			case DNSBLConfEntry::A_BITMASK:
-				bitmask = resultip.s_addr >> 24; /* Last octet (network byte order) */
-				bitmask &= ConfEntry->bitmask;
-				match = (bitmask != 0);
-			break;
+			{
+				result = (resultip.s_addr >> 24) & ConfEntry->bitmask;
+				match = (result != 0);
+				break;
+			}
 			case DNSBLConfEntry::A_RECORD:
-				record = resultip.s_addr >> 24; /* Last octet */
-				match = (ConfEntry->records[record] == 1);
-			break;
+			{
+				result = resultip.s_addr >> 24;
+				match = (ConfEntry->records[result] == 1);
+				break;
+			}
 		}
 
 		if (match)
@@ -212,7 +234,7 @@ class DNSBLResolver : public DNS::Request
 			}
 
 			ServerInstance->SNO.WriteGlobalSno('d', "Connecting user %s (%s) detected as being on the '%s' DNS blacklist with result %d",
-				them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
+				them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), result);
 		}
 		else
 			ConfEntry->stats_misses++;
@@ -234,6 +256,7 @@ class DNSBLResolver : public DNS::Request
 			return;
 		}
 
+		ConfEntry->stats_errors++;
 		ServerInstance->SNO.WriteGlobalSno('d', "An error occurred whilst checking whether %s (%s) is on the '%s' DNS blacklist: %s",
 			them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), this->manager->GetErrorStr(q->error).c_str());
 	}
@@ -456,20 +479,22 @@ class ModuleDNSBL : public Module, public Stats::EventListener
 		if (stats.GetSymbol() != 'd')
 			return MOD_RES_PASSTHRU;
 
-		unsigned long total_hits = 0, total_misses = 0;
-
+		unsigned long total_hits = 0;
+		unsigned long total_misses = 0;
+		unsigned long total_errors = 0;
 		for (std::shared_ptr<DNSBLConfEntry> e : DNSBLConfEntries)
 		{
 			total_hits += e->stats_hits;
 			total_misses += e->stats_misses;
+			total_errors += e->stats_errors;
 
-			stats.AddRow(304, "DNSBLSTATS DNSbl \"" + e->name + "\" had " +
-					ConvToStr(e->stats_hits) + " hits and " + ConvToStr(e->stats_misses) + " misses");
+			stats.AddRow(304, InspIRCd::Format("DNSBLSTATS \"%s\" had %lu hits, %lu misses, and %lu errors",
+				e->name.c_str(), e->stats_hits, e->stats_misses, e->stats_errors));
 		}
 
 		stats.AddRow(304, "DNSBLSTATS Total hits: " + ConvToStr(total_hits));
 		stats.AddRow(304, "DNSBLSTATS Total misses: " + ConvToStr(total_misses));
-
+		stats.AddRow(304, "DNSBLSTATS Total errors: " + ConvToStr(total_errors));
 		return MOD_RES_PASSTHRU;
 	}
 };
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 3bb1e9bff..3b79890db 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -89,6 +89,8 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		unsigned int MaxBacklog = 0;
 		unsigned int MaxDiff = 0;
 		unsigned int MaxMessageSize = 0;
+		std::string KickMessage;
+
 	};
 
 	std::vector<unsigned int> mx[2];
@@ -249,6 +251,8 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		if (newsize > ServerInstance->Config->Limits.MaxLine)
 			newsize = ServerInstance->Config->Limits.MaxLine;
 		Resize(newsize);
+
+		ms.KickMessage = conf->getString("kickmessage", "Repeat flood");
 	}
 
 	std::string GetModuleSettings() const
@@ -256,6 +260,11 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		return ConvToStr(ms.MaxLines) + ":" + ConvToStr(ms.MaxSecs) + ":" + ConvToStr(ms.MaxDiff) + ":" + ConvToStr(ms.MaxBacklog);
 	}
 
+	std::string GetKickMessage() const
+	{
+		return ms.KickMessage;
+	}
+
 	void SerializeParam(Channel* chan, const ChannelSettings* chset, std::string& out)
 	{
 		chset->serialize(out);
@@ -401,7 +410,7 @@ class RepeatModule : public Module
 				ServerInstance->Modes.Process(ServerInstance->FakeClient, chan, NULL, changelist);
 			}
 
-			memb->chan->KickUser(ServerInstance->FakeClient, user, "Repeat flood");
+			memb->chan->KickUser(ServerInstance->FakeClient, user, rm.GetKickMessage());
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;