X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=eea27f6f713f300fd27ab791616a90778540a99b;hb=a14cf3eed86b9ce638a0465e0c4dbb817710fb79;hp=d1a4b252850f7ff6a13f068733e24c7ee3b59d1c;hpb=b43fc66c17c2bef6dca66a966676b8128d5774ee;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index d1a4b2528..eea27f6f7 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -104,7 +104,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 			break;
 		}
 
-		*c++;
+		c++;
 	}
 
 	std::string s = this->FormatNoticeMasks();
@@ -203,32 +203,13 @@ const char* User::FormatModes(bool showparameters)
 	return data;
 }
 
-void User::DecrementModes()
+User::User(const std::string &uid, const std::string& sid, int type)
+	: uuid(uid), server(sid), usertype(type)
 {
-	ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
-	for (unsigned char n = 'A'; n <= 'z'; n++)
-	{
-		if (modes[n-65])
-		{
-			ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
-			ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
-			if (mh)
-			{
-				ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
-				mh->ChangeCount(-1);
-			}
-		}
-	}
-}
-
-User::User(const std::string &uid)
-{
-	server = ServerInstance->Config->ServerName;
 	age = ServerInstance->Time();
-	signon = idle_lastmsg = registered = 0;
+	signon = idle_lastmsg = 0;
+	registered = 0;
 	quietquit = quitting = exempt = dns_done = false;
-	fd = -1;
-	uuid = uid;
 	client_sa.sa.sa_family = AF_UNSPEC;
 
 	ServerInstance->Logs->Log("USERS", DEBUG, "New UUID for user: %s", uuid.c_str());
@@ -240,18 +221,22 @@ User::User(const std::string &uid)
 		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
-LocalUser::LocalUser() : User(ServerInstance->GetUID())
+LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* servaddr)
+	: User(ServerInstance->GetUID(), ServerInstance->Config->ServerName, USERTYPE_LOCAL), eh(this)
 {
 	bytes_in = bytes_out = cmds_in = cmds_out = 0;
 	server_sa.sa.sa_family = AF_UNSPEC;
-	Penalty = 0;
+	CommandFloodPenalty = 0;
 	lastping = nping = 0;
+	eh.SetFd(myfd);
+	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
+	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
 }
 
 User::~User()
 {
-	if (uuid.length())
-		ServerInstance->Logs->Log("USERS", ERROR, "User destructor for %s called without cull", uuid.c_str());
+	if (ServerInstance->Users->uuidlist->find(uuid) != ServerInstance->Users->uuidlist->end())
+		ServerInstance->Logs->Log("USERS", DEFAULT, "User destructor for %s called without cull", uuid.c_str());
 }
 
 const std::string& User::MakeHost()
@@ -294,7 +279,7 @@ const std::string& User::MakeHostIP()
 	return this->cached_hostip;
 }
 
-const std::string User::GetFullHost()
+const std::string& User::GetFullHost()
 {
 	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
@@ -328,7 +313,7 @@ char* User::MakeWildHost()
 	return nresult;
 }
 
-const std::string User::GetFullRealHost()
+const std::string& User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
@@ -492,29 +477,25 @@ bool LocalUser::HasPrivPermission(const std::string &privstr, bool noisy)
 	return false;
 }
 
-void User::OnDataReady()
+void UserIOHandler::OnDataReady()
 {
-}
-
-void LocalUser::OnDataReady()
-{
-	if (quitting)
+	if (user->quitting)
 		return;
 
-	if (recvq.length() > MyClass->GetRecvqMax() && !HasPrivPermission("users/flood/increased-buffers"))
+	if (recvq.length() > user->MyClass->GetRecvqMax() && !user->HasPrivPermission("users/flood/increased-buffers"))
 	{
-		ServerInstance->Users->QuitUser(this, "RecvQ exceeded");
+		ServerInstance->Users->QuitUser(user, "RecvQ exceeded");
 		ServerInstance->SNO->WriteToSnoMask('a', "User %s RecvQ of %lu exceeds connect class maximum of %lu",
-			nick.c_str(), (unsigned long)recvq.length(), MyClass->GetRecvqMax());
+			user->nick.c_str(), (unsigned long)recvq.length(), user->MyClass->GetRecvqMax());
 	}
 	unsigned long sendqmax = ULONG_MAX;
-	if (!HasPrivPermission("users/flood/increased-buffers"))
-		sendqmax = MyClass->GetSendqSoftMax();
-	int penaltymax = MyClass->GetPenaltyThreshold();
-	if (penaltymax == 0 || HasPrivPermission("users/flood/no-fakelag"))
-		penaltymax = INT_MAX;
+	if (!user->HasPrivPermission("users/flood/increased-buffers"))
+		sendqmax = user->MyClass->GetSendqSoftMax();
+	unsigned long penaltymax = ULONG_MAX;
+	if (!user->HasPrivPermission("users/flood/no-fakelag"))
+		penaltymax = user->MyClass->GetPenaltyThreshold() * 1000;
 
-	while (Penalty < penaltymax && getSendQSize() < sendqmax)
+	while (user->CommandFloodPenalty < penaltymax && getSendQSize() < sendqmax)
 	{
 		std::string line;
 		line.reserve(MAXBUF);
@@ -543,29 +524,32 @@ eol_found:
 
 		// TODO should this be moved to when it was inserted in recvq?
 		ServerInstance->stats->statsRecv += qpos;
-		this->bytes_in += qpos;
-		this->cmds_in++;
+		user->bytes_in += qpos;
+		user->cmds_in++;
 
-		ServerInstance->Parser->ProcessBuffer(line, this);
-		if (quitting)
+		ServerInstance->Parser->ProcessBuffer(line, user);
+		if (user->quitting)
 			return;
 	}
 	// Add pseudo-penalty so that we continue processing after sendq recedes
-	if (Penalty == 0 && getSendQSize() >= sendqmax)
-		Penalty++;
+	if (user->CommandFloodPenalty == 0 && getSendQSize() >= sendqmax)
+		user->CommandFloodPenalty++;
+	if (user->CommandFloodPenalty >= penaltymax && !user->MyClass->fakelag)
+		ServerInstance->Users->QuitUser(user, "Excess Flood");
 }
 
-void LocalUser::AddWriteBuf(const std::string &data)
+void UserIOHandler::AddWriteBuf(const std::string &data)
 {
-	if (!quitting && getSendQSize() + data.length() > MyClass->GetSendqHardMax() && !HasPrivPermission("users/flood/increased-buffers"))
+	if (!user->quitting && getSendQSize() + data.length() > user->MyClass->GetSendqHardMax() &&
+		!user->HasPrivPermission("users/flood/increased-buffers"))
 	{
 		/*
 		 * Quit the user FIRST, because otherwise we could recurse
 		 * here and hit the same limit.
 		 */
-		ServerInstance->Users->QuitUser(this, "SendQ exceeded");
+		ServerInstance->Users->QuitUser(user, "SendQ exceeded");
 		ServerInstance->SNO->WriteToSnoMask('a', "User %s SendQ exceeds connect class maximum of %lu",
-			nick.c_str(), MyClass->GetSendqHardMax());
+			user->nick.c_str(), user->MyClass->GetSendqHardMax());
 		return;
 	}
 
@@ -575,29 +559,22 @@ void LocalUser::AddWriteBuf(const std::string &data)
 	WriteData(data);
 }
 
-void User::OnError(BufferedSocketError)
+void UserIOHandler::OnError(BufferedSocketError)
 {
-	ServerInstance->Users->QuitUser(this, getError());
+	ServerInstance->Users->QuitUser(user, getError());
 }
 
 CullResult User::cull()
 {
 	if (!quitting)
 		ServerInstance->Users->QuitUser(this, "Culled without QuitUser");
-	if (uuid.empty())
-	{
-		ServerInstance->Logs->Log("USERS", DEBUG, "User culled twice? UUID empty");
-		return Extensible::cull();
-	}
 	PurgeEmptyChannels();
-	if (IS_LOCAL(this) && fd != INT_MAX)
-		Close();
 
 	this->InvalidateCache();
-	this->DecrementModes();
 
-	ServerInstance->Users->uuidlist->erase(uuid);
-	uuid.clear();
+	if (client_sa.sa.sa_family != AF_UNSPEC)
+		ServerInstance->Users->RemoveCloneCounts(this);
+
 	return Extensible::cull();
 }
 
@@ -609,8 +586,14 @@ CullResult LocalUser::cull()
 	else
 		ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
 
-	if (client_sa.sa.sa_family != AF_UNSPEC)
-		ServerInstance->Users->RemoveCloneCounts(this);
+	eh.cull();
+	return User::cull();
+}
+
+CullResult FakeUser::cull()
+{
+	// Fake users don't quit, they just get culled.
+	quitting = true;
 	return User::cull();
 }
 
@@ -628,18 +611,32 @@ void User::Oper(OperInfo* info)
 	if (info->oper_block)
 		opername = info->oper_block->getString("name");
 
+	if (IS_LOCAL(this))
+	{
+		LocalUser* l = IS_LOCAL(this);
+		std::string vhost = oper->getConfig("vhost");
+		if (!vhost.empty())
+			l->ChangeDisplayedHost(vhost.c_str());
+		std::string opClass = oper->getConfig("class");
+		if (!opClass.empty())
+		{
+			l->SetClass(opClass);
+			l->CheckClass();
+		}
+	}
+
 	ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')",
-		nick.c_str(), ident.c_str(), host.c_str(), info->NameStr(), opername.c_str());
-	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", info->name[0]) ? "an" : "a", info->NameStr());
+		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(), info->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->Users->all_opers.push_back(this);
 
 	// Expand permissions from config for faster lookup
 	if (IS_LOCAL(this))
 		oper->init();
 
-	FOREACH_MOD(I_OnPostOper,OnPostOper(this, info->name, opername));
+	FOREACH_MOD(I_OnPostOper,OnPostOper(this, oper->name, opername));
 }
 
 void OperInfo::init()
@@ -831,18 +828,21 @@ void LocalUser::FullConnect()
 	ServerInstance->Config->Send005(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
-
-	this->ShowMOTD();
-
 	/* Now registered */
 	if (ServerInstance->Users->unregistered_count)
 		ServerInstance->Users->unregistered_count--;
 
-	/* Trigger LUSERS output, give modules a chance too */
+	/* Trigger MOTD and LUSERS output, give modules a chance too */
 	ModResult MOD_RESULT;
-	std::string command("LUSERS");
+	std::string command("MOTD");
 	std::vector<std::string> parameters;
-	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, "LUSERS"));
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
+	if (!MOD_RESULT)
+		ServerInstance->CallCommandHandler(command, parameters, this);
+
+	MOD_RESULT = MOD_RES_PASSTHRU;
+	command = "LUSERS";
+	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
 		ServerInstance->CallCommandHandler(command, parameters, this);
 
@@ -950,7 +950,7 @@ const char* User::GetIPString()
 	return cachedip.c_str();
 }
 
-irc::string User::GetCIDRMask()
+irc::sockets::cidr_mask User::GetCIDRMask()
 {
 	int range = 0;
 	switch (client_sa.sa.sa_family)
@@ -962,7 +962,7 @@ irc::string User::GetCIDRMask()
 			range = ServerInstance->Config->c_ipv4_range;
 			break;
 	}
-	return assign(irc::sockets::mask(client_sa, range));
+	return irc::sockets::cidr_mask(client_sa, range);
 }
 
 bool User::SetClientIP(const char* sip)
@@ -983,7 +983,7 @@ void User::Write(const char *text, ...)
 
 void LocalUser::Write(const std::string& text)
 {
-	if (!ServerInstance->SE->BoundsCheckFd(this))
+	if (!ServerInstance->SE->BoundsCheckFd(&eh))
 		return;
 
 	if (text.length() > MAXBUF - 2)
@@ -994,10 +994,10 @@ void LocalUser::Write(const std::string& text)
 		return;
 	}
 
-	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
+	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%s] O %s", uuid.c_str(), text.c_str());
 
-	this->AddWriteBuf(text);
-	this->AddWriteBuf(wide_newline);
+	eh.AddWriteBuf(text);
+	eh.AddWriteBuf(wide_newline);
 
 	ServerInstance->stats->statsSent += text.length() + 2;
 	this->bytes_out += text.length() + 2;
@@ -1159,10 +1159,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
-			already_sent[u->fd] = uniq_id;
+			already_sent[u->GetFd()] = uniq_id;
 			if (i->second)
 				u->Write(line);
 		}
@@ -1173,10 +1173,10 @@ void User::WriteCommonRaw(const std::string &line, bool include_self)
 		const UserMembList* ulist = c->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (IS_LOCAL(u) && !u->quitting && already_sent[u->fd] != uniq_id)
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && already_sent[u->GetFd()] != uniq_id)
 			{
-				already_sent[u->fd] = uniq_id;
+				already_sent[u->GetFd()] = uniq_id;
 				u->Write(line);
 			}
 		}
@@ -1205,10 +1205,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
-			already_sent[u->fd] = uniq_id;
+			already_sent[u->GetFd()] = uniq_id;
 			if (i->second)
 				u->Write(IS_OPER(u) ? out2 : out1);
 		}
@@ -1218,10 +1218,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 		const UserMembList* ulist = (*v)->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (IS_LOCAL(u) && !u->quitting && (already_sent[u->fd] != uniq_id))
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u && !u->quitting && (already_sent[u->GetFd()] != uniq_id))
 			{
-				already_sent[u->fd] = uniq_id;
+				already_sent[u->GetFd()] = uniq_id;
 				u->Write(IS_OPER(u) ? out2 : out1);
 			}
 		}
@@ -1342,17 +1342,17 @@ void User::DoHostCycle(const std::string &quitline)
 
 	for (std::map<User*,bool>::iterator i = exceptions.begin(); i != exceptions.end(); ++i)
 	{
-		User* u = i->first;
-		if (IS_LOCAL(u) && !u->quitting)
+		LocalUser* u = IS_LOCAL(i->first);
+		if (u && !u->quitting)
 		{
 			if (i->second)
 			{
-				already_sent[u->fd] = seen_id;
+				already_sent[u->GetFd()] = seen_id;
 				u->Write(quitline);
 			}
 			else
 			{
-				already_sent[u->fd] = silent_id;
+				already_sent[u->GetFd()] = silent_id;
 			}
 		}
 	}
@@ -1361,9 +1361,12 @@ void User::DoHostCycle(const std::string &quitline)
 		Channel* c = *v;
 		snprintf(buffer, MAXBUF, ":%s JOIN %s", GetFullHost().c_str(), c->name.c_str());
 		std::string joinline(buffer);
-		std::string modeline = ServerInstance->Modes->ModeString(this, c);
+		Membership* memb = c->GetUser(this);
+		std::string modeline = memb->modes;
 		if (modeline.length() > 0)
 		{
+			for(unsigned int i=0; i < memb->modes.length(); i++)
+				modeline.append(" ").append(nick);
 			snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str());
 			modeline = buffer;
 		}
@@ -1371,16 +1374,16 @@ void User::DoHostCycle(const std::string &quitline)
 		const UserMembList *ulist = c->GetUsers();
 		for (UserMembList::const_iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			User* u = i->first;
-			if (u == this || !IS_LOCAL(u))
+			LocalUser* u = IS_LOCAL(i->first);
+			if (u == NULL || u == this)
 				continue;
-			if (already_sent[u->fd] == silent_id)
+			if (already_sent[u->GetFd()] == silent_id)
 				continue;
 
-			if (already_sent[u->fd] != seen_id)
+			if (already_sent[u->GetFd()] != seen_id)
 			{
 				u->Write(quitline);
-				already_sent[i->first->fd] = seen_id;
+				already_sent[u->GetFd()] = seen_id;
 			}
 			u->Write(joinline);
 			if (modeline.length() > 0)
@@ -1625,71 +1628,34 @@ void User::PurgeEmptyChannels()
 	this->UnOper();
 }
 
-void User::ShowMOTD()
-{
-	if (!ServerInstance->Config->MOTD.size())
-	{
-		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
-		return;
-	}
-	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName.c_str());
-
-	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-		this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
-
-	this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
-}
-
-void User::ShowRULES()
-{
-	if (!ServerInstance->Config->RULES.size())
-	{
-		this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
-		return;
-	}
-
-	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
-
-	for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
-		this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
-
-	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
-}
-
-void FakeUser::SetFakeServer(std::string name)
-{
-	this->nick = name;
-	this->server = name;
-}
-
-const std::string FakeUser::GetFullHost()
+const std::string& FakeUser::GetFullHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return nick;
+	return server;
 }
 
-const std::string FakeUser::GetFullRealHost()
+const std::string& FakeUser::GetFullRealHost()
 {
 	if (!ServerInstance->Config->HideWhoisServer.empty())
 		return ServerInstance->Config->HideWhoisServer;
-	return nick;
+	return server;
 }
 
 ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask)
-	: config(tag), type(t), name("unnamed"), registration_timeout(0), host(mask),
-	pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0),
-	recvqmax(0), penaltythreshold(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
+	: config(tag), type(t), fakelag(true), name("unnamed"), registration_timeout(0), host(mask),
+	pingtime(0), pass(""), hash(""), softsendqmax(0), hardsendqmax(0), recvqmax(0),
+	penaltythreshold(0), commandrate(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0)
 {
 }
 
 ConnectClass::ConnectClass(ConfigTag* tag, char t, const std::string& mask, const ConnectClass& parent)
-	: config(tag), type(t), name("unnamed"),
-	registration_timeout(parent.registration_timeout), host(mask),
-	pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash),
-	softsendqmax(parent.softsendqmax), hardsendqmax(parent.hardsendqmax),
-	recvqmax(parent.recvqmax), penaltythreshold(parent.penaltythreshold), maxlocal(parent.maxlocal),
-	maxglobal(parent.maxglobal), maxchans(parent.maxchans),
+	: config(tag), type(t), fakelag(parent.fakelag), name("unnamed"),
+	registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime),
+	pass(parent.pass), hash(parent.hash), softsendqmax(parent.softsendqmax),
+	hardsendqmax(parent.hardsendqmax), recvqmax(parent.recvqmax),
+	penaltythreshold(parent.penaltythreshold), commandrate(parent.commandrate),
+	maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans),
 	port(parent.port), limit(parent.limit)
 {
 }