X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_stats.cpp;h=19e429a95e92089924cc590e47ea39f69b791116;hb=e0dc7691c4cff3a38bc12adf10b3709d8c4901ba;hp=bb20dd7612ab470cd9bd3b29dd1807222b8ddfff;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index bb20dd761..19e429a95 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -1,9 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 Puck Meerburg <puck@puckipedia.com>
+ *   Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
+ *   Copyright (C) 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2012 Adam <Adam@anope.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -36,14 +43,15 @@ class CommandStats : public Command
 	void DoStats(Stats::Context& stats);
 
  public:
-	/** Constructor for stats.
-	 */
+	/** STATS characters which non-opers can request. */
+	std::string userstats;
+
 	CommandStats(Module* Creator)
 		: Command(Creator, "STATS", 1, 2)
 		, statsevprov(Creator, "event/stats")
 	{
 		allow_empty_last_param = false;
-		syntax = "<stats-symbol> [<servername>]";
+		syntax = "<symbol> [<servername>]";
 	}
 
 	/** Handle command.
@@ -77,7 +85,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 	User* const user = stats.GetSource();
 	const char statschar = stats.GetSymbol();
 
-	bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos;
+	bool isPublic = userstats.find(statschar) != std::string::npos;
 	bool isRemoteOper = IS_REMOTE(user) && (user->IsOper());
 	bool isLocalOperWithPrivs = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex");
 
@@ -109,10 +117,21 @@ void CommandStats::DoStats(Stats::Context& stats)
 			for (std::vector<ListenSocket*>::const_iterator i = ServerInstance->ports.begin(); i != ServerInstance->ports.end(); ++i)
 			{
 				ListenSocket* ls = *i;
-				std::string type = ls->bind_tag->getString("type", "clients");
-				std::string hook = ls->bind_tag->getString("ssl", "plaintext");
+				std::stringstream portentry;
+
+				const std::string type = ls->bind_tag->getString("type", "clients", 1);
+				portentry << ls->bind_sa.str() << " (type: " << type;
+
+				const std::string hook = ls->bind_tag->getString("hook");
+				if (!hook.empty())
+					portentry << ", hook: " << hook;
+
+				const std::string sslprofile = ls->bind_tag->getString("sslprofile", ls->bind_tag->getString("ssl"));
+				if (!sslprofile.empty())
+					portentry << ", ssl profile: " << sslprofile;
 
-				stats.AddRow(249, ls->bind_sa.str() + " (" + type + ", " + hook + ")");
+				portentry << ')';
+				stats.AddRow(249, portentry.str());
 			}
 		}
 		break;
@@ -141,7 +160,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 				else
 					param.append(c->host);
 
-				row.push(param).push(c->config->getString("port", "*"));
+				row.push(param).push(c->config->getString("port", "*", 1));
 				row.push(ConvToStr(c->GetRecvqMax())).push(ConvToStr(c->GetSendqSoftMax())).push(ConvToStr(c->GetSendqHardMax())).push(ConvToStr(c->GetCommandRate()));
 
 				param = ConvToStr(c->GetPenaltyThreshold());
@@ -187,19 +206,19 @@ void CommandStats::DoStats(Stats::Context& stats)
 		break;
 
 		case 'k':
-			ServerInstance->XLines->InvokeStats("K",216,stats);
+			ServerInstance->XLines->InvokeStats("K", stats);
 		break;
 		case 'g':
-			ServerInstance->XLines->InvokeStats("G",223,stats);
+			ServerInstance->XLines->InvokeStats("G", stats);
 		break;
 		case 'q':
-			ServerInstance->XLines->InvokeStats("Q",217,stats);
+			ServerInstance->XLines->InvokeStats("Q", stats);
 		break;
 		case 'Z':
-			ServerInstance->XLines->InvokeStats("Z",223,stats);
+			ServerInstance->XLines->InvokeStats("Z", stats);
 		break;
 		case 'e':
-			ServerInstance->XLines->InvokeStats("E",223,stats);
+			ServerInstance->XLines->InvokeStats("E", stats);
 		break;
 		case 'E':
 		{
@@ -377,7 +396,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 
 CmdResult CommandStats::Handle(User* user, const Params& parameters)
 {
-	if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
+	if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName))
 	{
 		// Give extra penalty if a non-oper does /STATS <remoteserver>
 		LocalUser* localuser = IS_LOCAL(user);
@@ -397,4 +416,27 @@ CmdResult CommandStats::Handle(User* user, const Params& parameters)
 	return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandStats)
+class CoreModStats : public Module
+{
+ private:
+	CommandStats cmd;
+
+ public:
+	CoreModStats()
+		: cmd(this)
+	{
+	}
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* security = ServerInstance->Config->ConfValue("security");
+		cmd.userstats = security->getString("userstats");
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the STATS command", VF_CORE | VF_VENDOR);
+	}
+};
+
+MODULE_INIT(CoreModStats)