extern time_t TIME;
extern user_hash clientlist;
extern chan_hash chanlist;
-extern whowas_hash whowas;
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];
snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
- for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++)
+ for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
{
- Config->ConfValue("oper","name",i,LoginName,&Config->config_f);
- 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)))
+ Config->ConfValue(Config->config_data, "oper", "name", i, LoginName, MAXBUF);
+ Config->ConfValue(Config->config_data, "oper", "password", i, Password, MAXBUF);
+ Config->ConfValue(Config->config_data, "oper", "type", i, OperType, MAXBUF);
+ Config->ConfValue(Config->config_data, "oper", "host", i, HostName, MAXBUF);
+
+ 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++)
+ for (j =0; j < Config->ConfValueEnum(Config->config_data, "type"); j++)
{
- Config->ConfValue("type","name",j,TypeName,&Config->config_f);
+ Config->ConfValue(Config->config_data, "type","name", j, TypeName, MAXBUF);
if (!strcmp(TypeName,OperType))
{
/* found this oper's opertype */
- Config->ConfValue("type","host",j,HostName,&Config->config_f);
+ Config->ConfValue(Config->config_data, "type","host", j, HostName, MAXBUF);
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;
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
}
return;
}
-
-