X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=5058cfcc24503d18da5265b1aca3d8769af26b4e;hb=0ce252f05ced1a0dddfc9c353d68007a3faba239;hp=9c3d645f72c0a64b2ea6491269fedc18a32724db;hpb=59dc6b0ec277b76996014ea7350b0bcafa5396b5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 9c3d645f7..5058cfcc2 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -28,7 +28,6 @@
 #include "socketengine.h"
 #include "xline.h"
 #include "bancache.h"
-#include "commands/cmd_whowas.h"
 
 already_sent_t LocalUser::already_sent_id = 0;
 
@@ -114,11 +113,10 @@ void LocalUser::StartDNSLookup()
 	try
 	{
 		bool cached = false;
-		const char* sip = this->GetIPString();
 		UserResolver *res_reverse;
 
 		QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
-		res_reverse = new UserResolver(this, sip, resolvtype, cached);
+		res_reverse = new UserResolver(this, this->GetIPString(), resolvtype, cached);
 
 		ServerInstance->AddResolver(res_reverse, cached);
 	}
@@ -202,10 +200,9 @@ User::User(const std::string &uid, const std::string& sid, int type)
 	: uuid(uid), server(sid), usertype(type)
 {
 	age = ServerInstance->Time();
-	signon = idle_lastmsg = 0;
+	signon = 0;
 	registered = 0;
-	quietquit = quitting = exempt = dns_done = false;
-	quitting_sendq = false;
+	quietquit = quitting = false;
 	client_sa.sa.sa_family = AF_UNSPEC;
 
 	ServerInstance->Logs->Log("USERS", DEBUG, "New UUID for user: %s", uuid.c_str());
@@ -219,13 +216,18 @@ User::User(const std::string &uid, const std::string& sid, int type)
 
 LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
 	: User(ServerInstance->GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this),
+	localuseriter(ServerInstance->Users->local_users.end()),
 	bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0),
 	already_sent(0)
 {
+	exempt = quitting_sendq = dns_done = false;
+	idle_lastmsg = 0;
+	ident = "unknown";
 	lastping = 0;
 	eh.SetFd(myfd);
 	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
 	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
+	dhost = host = GetIPString();
 }
 
 User::~User()
@@ -265,7 +267,7 @@ const std::string& User::MakeHostIP()
 	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(const char* n = this->GetIPString(); *n; n++)
+	for(const char* n = this->GetIPString().c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
@@ -537,11 +539,11 @@ CullResult User::cull()
 
 CullResult LocalUser::cull()
 {
-	std::vector<LocalUser*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),this);
-	if (x != ServerInstance->Users->local_users.end())
-		ServerInstance->Users->local_users.erase(x);
-	else
-		ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
+	// The iterator is initialized to local_users.end() in the constructor. It is
+	// overwritten in UserManager::AddUser() with the real iterator so this check
+	// is only a precaution currently.
+	if (localuseriter != ServerInstance->Users->local_users.end())
+		ServerInstance->Users->local_users.erase(localuseriter);
 
 	ClearInvites();
 	eh.cull();
@@ -586,7 +588,7 @@ void User::Oper(OperInfo* info)
 		nick.c_str(), ident.c_str(), host.c_str(), oper->NameStr(), opername.c_str());
 	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->NameStr());
 
-	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), oper->NameStr());
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->NameStr());
 	ServerInstance->Users->all_opers.push_back(this);
 
 	// Expand permissions from config for faster lookup
@@ -621,7 +623,8 @@ void OperInfo::init()
 			AllowedPrivs.insert(mypriv);
 		}
 
-		for (unsigned char* c = (unsigned char*)tag->getString("usermodes").c_str(); *c; ++c)
+		std::string modes = tag->getString("usermodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
 		{
 			if (*c == '*')
 			{
@@ -633,7 +636,8 @@ void OperInfo::init()
 			}
 		}
 
-		for (unsigned char* c = (unsigned char*)tag->getString("chanmodes").c_str(); *c; ++c)
+		modes = tag->getString("chanmodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
 		{
 			if (*c == '*')
 			{
@@ -683,18 +687,6 @@ void User::UnOper()
 	this->modes[UM_OPERATOR] = 0;
 }
 
-/* adds or updates an entry in the whowas list */
-void User::AddToWhoWas()
-{
-	Module* whowas = ServerInstance->Modules->Find("cmd_whowas.so");
-	if (whowas)
-	{
-		WhowasRequest req(NULL, whowas, WhowasRequest::WHOWAS_ADD);
-		req.user = this;
-		req.Send();
-	}
-}
-
 /*
  * Check class restrictions
  */
@@ -716,21 +708,21 @@ void LocalUser::CheckClass()
 	{
 		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
 		if (a->maxconnwarn)
-			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
+			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString().c_str());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
 		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
 		if (a->maxconnwarn)
-			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+			ServerInstance->SNO->WriteToSnoMask('a', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString().c_str());
 		return;
 	}
 
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
 }
 
-bool User::CheckLines(bool doZline)
+bool LocalUser::CheckLines(bool doZline)
 {
 	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
 
@@ -770,11 +762,14 @@ void LocalUser::FullConnect()
 	if (quitting)
 		return;
 
-	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str());
-	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str());
-	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
 	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+
+	std::string umlist = ServerInstance->Modes->UserModeList();
+	std::string cmlist = ServerInstance->Modes->ChannelModeList();
+	std::string pmlist = ServerInstance->Modes->ParaModeList();
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str());
 
 	ServerInstance->Config->Send005(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
@@ -785,17 +780,17 @@ void LocalUser::FullConnect()
 
 	/* Trigger MOTD and LUSERS output, give modules a chance too */
 	ModResult MOD_RESULT;
-	std::string command("MOTD");
+	std::string command("LUSERS");
 	std::vector<std::string> parameters;
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	MOD_RESULT = MOD_RES_PASSTHRU;
-	command = "LUSERS";
+	command = "MOTD";
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	if (ServerInstance->Config->RawLog)
 		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
@@ -810,9 +805,9 @@ void LocalUser::FullConnect()
 
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s!%s@%s (%s) [%s]",
-		this->GetServerPort(), this->MyClass->name.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
-	ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
+		this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->fullname.c_str());
+	ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for " + this->GetIPString());
 	ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 	// reset the flood penalty (which could have been raised due to things like auto +x)
 	CommandFloodPenalty = 0;
@@ -866,8 +861,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 			{
 				if (this->registered == REG_ALL)
 				{
-					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s!%s@%s: %s",
-						newnick.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), mq->reason.c_str());
+					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
+						newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str());
 				}
 				this->WriteNumeric(432, "%s %s :Invalid nickname: %s",this->nick.c_str(), newnick.c_str(), mq->reason.c_str());
 				return false;
@@ -948,18 +943,18 @@ int LocalUser::GetServerPort()
 	return 0;
 }
 
-const char* User::GetIPString()
+const std::string& User::GetIPString()
 {
 	int port;
 	if (cachedip.empty())
 	{
 		irc::sockets::satoap(client_sa, cachedip, port);
 		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
-		if (cachedip.c_str()[0] == ':')
+		if (cachedip[0] == ':')
 			cachedip.insert(0,1,'0');
 	}
 
-	return cachedip.c_str();
+	return cachedip;
 }
 
 irc::sockets::cidr_mask User::GetCIDRMask()
@@ -977,12 +972,43 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-bool User::SetClientIP(const char* sip)
+bool User::SetClientIP(const char* sip, bool recheck_eline)
 {
-	this->cachedip = "";
+	cachedip.clear();
+	cached_hostip.clear();
 	return irc::sockets::aptosa(sip, 0, client_sa);
 }
 
+void User::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
+{
+	cachedip.clear();
+	cached_hostip.clear();
+	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
+}
+
+bool LocalUser::SetClientIP(const char* sip, bool recheck_eline)
+{
+	irc::sockets::sockaddrs sa;
+	if (!irc::sockets::aptosa(sip, 0, sa))
+		// Invalid
+		return false;
+
+	LocalUser::SetClientIP(sa, recheck_eline);
+	return true;
+}
+
+void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline)
+{
+	if (sa != client_sa)
+	{
+		User::SetClientIP(sa);
+		if (recheck_eline)
+			this->exempt = (ServerInstance->XLines->MatchesLine("E", this) != NULL);
+
+		FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this));
+	}
+}
+
 static std::string wide_newline("\r\n");
 
 void User::Write(const std::string& text)
@@ -1445,7 +1471,7 @@ bool User::ChangeIdent(const char* newident)
 
 	std::string quitstr = ":" + GetFullHost() + " QUIT :Changing ident";
 
-	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
+	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax);
 
 	this->InvalidateCache();
 
@@ -1467,9 +1493,10 @@ void User::SendAll(const char* command, const char* text, ...)
 	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost().c_str(), command, textbuffer);
 	std::string fmt = formatbuffer;
 
-	for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+	for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
-		(*i)->Write(fmt);
+		if ((*i)->registered == REG_ALL)
+			(*i)->Write(fmt);
 	}
 }