summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/commands/cmd_eline.cpp27
-rw-r--r--src/commands/cmd_gline.cpp29
-rw-r--r--src/commands/cmd_kline.cpp29
-rw-r--r--src/commands/cmd_zline.cpp26
-rw-r--r--src/xline.cpp1
5 files changed, 68 insertions, 44 deletions
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index ca95955b7..5893fd9b7 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -24,19 +24,26 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
*/
CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
{
+ std::string target = parameters[0];
+
if (pcnt >= 3)
{
IdentHostPair ih;
- User* find = ServerInstance->FindNick(parameters[0]);
+ User* find = ServerInstance->FindNick(target.c_str());
if (find)
{
ih.first = "*";
ih.second = find->GetIPString();
- std::string c = std::string("*@") + find->GetIPString();
- parameters[0] = c.c_str();
+ target = std::string("*@") + find->GetIPString();
}
else
- ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+ ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+ if (ih.first.empty())
+ {
+ user->WriteServ("NOTICE %s :*** Target not found", user->nick);
+ return CMD_FAILURE;
+ }
if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
return CMD_FAILURE;
@@ -48,30 +55,30 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,target.c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0],
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,target.c_str(),
ServerInstance->TimeString(c_requires_crap).c_str());
}
}
else
{
delete el;
- user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,target.c_str());
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0], "E", user))
+ if (ServerInstance->XLines->DelLine(target.c_str(), "E", user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,target.c_str());
}
else
{
- user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,target.c_str());
}
}
diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 30112b74a..0061bfe00 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -24,24 +24,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
*/
CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
{
+ std::string target = parameters[0];
+
if (pcnt >= 3)
{
IdentHostPair ih;
- User* find = ServerInstance->FindNick(parameters[0]);
+ User* find = ServerInstance->FindNick(target.c_str());
if (find)
{
ih.first = "*";
ih.second = find->GetIPString();
- std::string c = std::string("*@") + find->GetIPString();
- parameters[0] = c.c_str();
+ target = std::string("*@") + find->GetIPString();
}
else
- ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+ ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+ if (ih.first.empty())
+ {
+ user->WriteServ("NOTICE %s :*** Target not found", user->nick);
+ return CMD_FAILURE;
+ }
if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
return CMD_FAILURE;
- else if (strchr(parameters[0],'!'))
+ else if (strchr(target.c_str(),'!'))
{
user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick);
return CMD_FAILURE;
@@ -53,12 +60,12 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,target.c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0],
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,target.c_str(),
ServerInstance->TimeString(c_requires_crap).c_str());
}
@@ -67,19 +74,19 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
else
{
delete gl;
- user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,target.c_str());
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0],"G",user))
+ if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,target.c_str());
}
else
{
- user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,target.c_str());
}
}
diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 1b5764bdc..d96873dc1 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -24,24 +24,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
*/
CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
{
+ std::string target = parameters[0];
+
if (pcnt >= 3)
{
IdentHostPair ih;
- User* find = ServerInstance->FindNick(parameters[0]);
+ User* find = ServerInstance->FindNick(target.c_str());
if (find)
{
ih.first = "*";
ih.second = find->GetIPString();
- std::string c = std::string("*@") + find->GetIPString();
- parameters[0] = c.c_str();
+ target = std::string("*@") + find->GetIPString();
}
else
- ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+ ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+ if (ih.first.empty())
+ {
+ user->WriteServ("NOTICE %s :*** Target not found", user->nick);
+ return CMD_FAILURE;
+ }
if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
return CMD_FAILURE;
- if (strchr(parameters[0],'!'))
+ if (strchr(target.c_str(),'!'))
{
user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick);
return CMD_FAILURE;
@@ -53,12 +60,12 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,target.c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,parameters[0],
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s",user->nick,target.c_str(),
ServerInstance->TimeString(c_requires_crap).c_str());
}
@@ -67,18 +74,18 @@ CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
else
{
delete kl;
- user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,target.c_str());
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0],"K",user))
+ if (ServerInstance->XLines->DelLine(target.c_str(),"K",user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,target.c_str());
}
else
{
- user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** K-Line %s not found in list, try /stats k.",user->nick,target.c_str());
}
}
diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index a9f76a932..2a12ee5b5 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -24,28 +24,30 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
{
+ std::string target = parameters[0];
+
if (pcnt >= 3)
{
- if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
+ if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!'))
{
user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
return CMD_FAILURE;
}
- User *u = ServerInstance->FindNick(parameters[0]);
+ User *u = ServerInstance->FindNick(target.c_str());
if (u)
{
- parameters[0] = u->GetIPString();
+ target = u->GetIPString();
}
- if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+ if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
return CMD_FAILURE;
long duration = ServerInstance->Duration(parameters[1]);
- const char* ipaddr = parameters[0];
- User* find = ServerInstance->FindNick(parameters[0]);
+ const char* ipaddr = target.c_str();
+ User* find = ServerInstance->FindNick(target.c_str());
if (find)
{
@@ -65,12 +67,12 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,target.c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,target.c_str(),
ServerInstance->TimeString(c_requires_crap).c_str());
}
ServerInstance->XLines->ApplyLines();
@@ -78,18 +80,18 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
else
{
delete zl;
- user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
}
}
else
{
- if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
+ if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
}
else
{
- user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,target.c_str());
return CMD_FAILURE;
}
}
diff --git a/src/xline.cpp b/src/xline.cpp
index 20f824da0..57e6221c4 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -139,6 +139,7 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
}
else
{
+ n.first = "";
n.second = ident_and_host;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 21:46:28 +0000