X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nicklock.cpp;h=755ae6da4114a4f0a349389ad1830b6c16cbc628;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=731c0433dd165012c5889a423891e323e8ef1bc6;hpb=fb6fa4c48e5fd0e0f068e8c31f977e64a4264b11;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 731c0433d..755ae6da4 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,141 +17,182 @@
 
 /** Handle /NICKLOCK
  */
-class cmd_nicklock : public command_t
+class CommandNicklock : public Command
 {
-	char* dummy;
  public:
-	cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
+	LocalIntExt& locked;
+	CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKLOCK", 2),
+		locked(ext)
 	{
-		this->source = "m_nicklock.so";
+		flags_needed = 'o';
 		syntax = "<oldnick> <newnick>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
-		irc::string server;
-		irc::string me;
+		User* target = ServerInstance->FindNick(parameters[0]);
 
-		// check user exists
-		if (!source)
+		/* Do local sanity checks and bails */
+		if (IS_LOCAL(user))
 		{
-			return CMD_FAILURE;
+			if (target && ServerInstance->ULine(target->server))
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKLOCK command on a u-lined client",user->nick.c_str());
+				return CMD_FAILURE;
+			}
+
+			if (!target)
+			{
+				user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
+			}
+
+			if (!ServerInstance->IsNick(parameters[1].c_str(), ServerInstance->Config->Limits.NickMax))
+			{
+				user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
+				return CMD_FAILURE;
+			}
+
+			user->WriteServ("947 %s %s :Nickname now locked.", user->nick.c_str(), parameters[1].c_str());
 		}
 
-		// check if user is locked
-		if (source->GetExt("nick_locked", dummy))
+		/* If we made it this far, extend the user */
+		if (target && IS_LOCAL(target))
 		{
-			user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
-			return CMD_FAILURE;
+			locked.set(target, 1);
+
+			std::string oldnick = target->nick;
+			if (target->ForceNickChange(parameters[1].c_str()))
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK to change and hold "+oldnick+" to "+parameters[1]);
+			else
+			{
+				std::string newnick = target->nick;
+				ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used NICKLOCK, but "+oldnick+" failed nick change to "+parameters[1]+" and was locked to "+newnick+" instead");
+			}
 		}
 
-		// check nick is valid
-		if (!ServerInstance->IsNick(parameters[1]))
-		{
-			return CMD_FAILURE;
-		}
-
-		// let others know
-		ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
-
-		if (!source->ForceNickChange(parameters[1]))
-		{
-			// ugh, nickchange failed for some reason -- possibly existing nick?
-			userrec::QuitUser(ServerInstance, source, "Nickname collision");
-		}
-
-		// give them a lock flag
-		source->Extend("nick_locked", "ON");
-
-		/* route */
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
+	}
 };
 
 /** Handle /NICKUNLOCK
  */
-class cmd_nickunlock : public command_t
+class CommandNickunlock : public Command
 {
  public:
-	cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
+	LocalIntExt& locked;
+	CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(Creator,"NICKUNLOCK", 1),
+		locked(ext)
 	{
-		this->source = "m_nicklock.so";
+		flags_needed = 'o';
 		syntax = "<locked-nick>";
+		TRANSLATE2(TR_NICK, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
-		if (source)
+		User* target = ServerInstance->FindNick(parameters[0]);
+
+		/* Do local sanity checks and bails */
+		if (IS_LOCAL(user))
+		{
+			if (target && ServerInstance->ULine(target->server))
+			{
+				user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an NICKUNLOCK command on a u-lined client",user->nick.c_str());
+				return CMD_FAILURE;
+			}
+
+			if (!target)
+			{
+				user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
+			}
+		}
+
+		if (target && IS_LOCAL(target))
 		{
-			source->Shrink("nick_locked");
-			user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick);
-			ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
-			return CMD_SUCCESS;
+			if (locked.set(target, 0))
+			{
+				ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]);
+				user->WriteNumeric(945, "%s %s :Nickname now unlocked.",user->nick.c_str(),target->nick.c_str());
+			}
+			else
+			{
+				user->WriteNumeric(946, "%s %s :This user's nickname is not locked.",user->nick.c_str(),target->nick.c_str());
+				return CMD_FAILURE;
+			}
 		}
 
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		if (dest)
+			return ROUTE_OPT_UCAST(dest->server);
+		return ROUTE_LOCALONLY;
 	}
 };
 
 
 class ModuleNickLock : public Module
 {
-	cmd_nicklock*	cmd1;
-	cmd_nickunlock*	cmd2;
-	char* n;
+	LocalIntExt locked;
+	CommandNicklock cmd1;
+	CommandNickunlock cmd2;
  public:
-	ModuleNickLock(InspIRCd* Me)
-		: Module(Me)
+	ModuleNickLock()
+		: locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked)
 	{
-		
-		cmd1 = new cmd_nicklock(ServerInstance);
-		cmd2 = new cmd_nickunlock(ServerInstance);
-		ServerInstance->AddCommand(cmd1);
-		ServerInstance->AddCommand(cmd2);
+		ServerInstance->AddCommand(&cmd1);
+		ServerInstance->AddCommand(&cmd2);
+		Extensible::Register(&locked);
+		ServerInstance->Modules->Attach(I_OnUserPreNick, this);
 	}
-	
-	virtual ~ModuleNickLock()
-	{
-	}
-	
-	virtual Version GetVersion()
+
+	~ModuleNickLock()
 	{
-		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
+	Version GetVersion()
 	{
-		List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
+		return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+
+	ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
-		if (isdigit(newnick[0])) /* allow a switch to a UID */
-			return 0;
+		if (!IS_LOCAL(user))
+			return MOD_RES_PASSTHRU;
 
-		if (user->GetExt("nick_locked", n))
+		if (isdigit(newnick[0])) /* Allow a switch to a UID */
+			return MOD_RES_PASSTHRU;
+
+		if (User::NICKForced.get(user)) /* Allow forced nick changes */
+			return MOD_RES_PASSTHRU;
+
+		if (locked.get(user))
 		{
-			user->WriteServ("447 %s :You cannot change your nickname (your nick is locked)",user->nick);
-			return 1;
+			user->WriteNumeric(447, "%s :You cannot change your nickname (your nick is locked)",user->nick.c_str());
+			return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	void Prioritize()
 	{
-		user->Shrink("nick_locked");
-	}
-
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		if(target_type == TYPE_USER)
-		{
-			userrec* user = (userrec*)item;
-			user->Shrink("nick_locked");
-		}
+		Module *nflood = ServerInstance->Modules->Find("m_nickflood.so");
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &nflood);
 	}
 };