Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / cmd_oper.cpp

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 33507775042c9a75391a90275112ac917d7ce353..7cbf4b79f62d10318dc3f18f975ada330072171f 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -62,6 +62,21 @@ extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
+bool OneOfMatches(const char* host, const char* hostlist)
+{
+       std::stringstream hl(hostlist);
+       std::string xhost;
+       while (hl >> xhost)
+       {
+               log(DEBUG,"Oper: Matching host %s",xhost.c_str());
+               if (match(host,xhost.c_str()))
+               {
+                       return true;
+               }
+       }
+       return false;
+}
+
 void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
 {
        char LoginName[MAXBUF];
@@ -82,7 +97,7 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                Config->ConfValue("oper","password",i,Password,&Config->config_f);
                Config->ConfValue("oper","type",i,OperType,&Config->config_f);
                Config->ConfValue("oper","host",i,HostName,&Config->config_f);
-               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (match(TheHost,HostName)))
+               if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,HostName)))
                {
                        fail2 = true;
                        for (j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
@@ -95,7 +110,14 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                                        Config->ConfValue("type","host",j,HostName,&Config->config_f);
                                        if (*HostName)
                                                ChangeDisplayedHost(user,HostName);
-                                       strlcpy(user->oper,TypeName,NICKMAX);
+                                       if (!isnick(TypeName))
+                                       {
+                                               WriteServ(user->fd,"491 %s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick);
+                                               WriteOpers("*** CONFIGURATION ERROR! Oper type invalid for OperType '%s'",OperType);
+                                               log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.",user->nick,user->ident,user->host);
+                                               return;
+                                       }
+                                       strlcpy(user->oper,TypeName,NICKMAX-1);
                                        found = true;
                                        fail2 = false;
                                        break;
@@ -117,6 +139,7 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                        FOREACH_MOD(I_OnOper,OnOper(user,OperType));
                        log(DEFAULT,"OPER: %s!%s@%s opered as type: %s",user->nick,user->ident,user->host,OperType);
                        AddOper(user);
+                       FOREACH_MOD(I_OnPostOper,OnPostOper(user,OperType));
                }
        }
        else