#include "stdinc.h"
#include "client.h"
-#include "common.h"
#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "s_newconf.h"
#include "logger.h"
#include "s_user.h"
+#include "s_serv.h"
#include "send.h"
#include "msg.h"
#include "parse.h"
#include "packet.h"
#include "cache.h"
-static int m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char oper_desc[] = "Provides the OPER command to become an IRC operator";
+
+static void m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mc_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static bool match_oper_password(const char *password, struct oper_conf *oper_p);
struct Message oper_msgtab = {
"OPER", 0, 0, 0, 0,
- {mg_unreg, {m_oper, 3}, mg_ignore, mg_ignore, mg_ignore, {m_oper, 3}}
+ {mg_unreg, {m_oper, 3}, {mc_oper, 3}, mg_ignore, mg_ignore, {m_oper, 3}}
};
mapi_clist_av1 oper_clist[] = { &oper_msgtab, NULL };
-static const char oper_desc[] = "Provides the OPER command to become an IRC operator";
-
DECLARE_MODULE_AV2(oper, NULL, NULL, oper_clist, NULL, NULL, NULL, NULL, oper_desc);
-static int match_oper_password(const char *password, struct oper_conf *oper_p);
-
/*
* m_oper
* parv[1] = oper name
* parv[2] = oper password
*/
-static int
+static void
m_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct oper_conf *oper_p;
{
sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
send_oper_motd(source_p);
- return 0;
+ return;
}
/* end the grace period */
source_p->name, source_p->username, source_p->host);
}
- return 0;
+ return;
}
if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
"Failed OPER attempt - missing SSL/TLS by %s (%s@%s)",
source_p->name, source_p->username, source_p->host);
}
- return 0;
+ return;
}
if (oper_p->certfp != NULL)
{
- if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+ if (source_p->certfp == NULL || rb_strcasecmp(source_p->certfp, oper_p->certfp))
{
sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
"Failed OPER attempt - client certificate fingerprint mismatch by %s (%s@%s)",
source_p->name, source_p->username, source_p->host);
}
- return 0;
+ return;
}
}
ilog(L_OPERED, "OPER %s by %s!%s@%s (%s)",
name, source_p->name, source_p->username, source_p->host,
source_p->sockhost);
- return 0;
+ return;
}
else
{
source_p->name, source_p->username, source_p->host);
}
}
+}
+
+/*
+ * mc_oper - server-to-server OPER propagation
+ * parv[1] = opername
+ * parv[2] = privset
+ */
+static void
+mc_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+ struct PrivilegeSet *privset;
+ sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPER %s %s", use_id(source_p), parv[1], parv[2]);
+
+ privset = privilegeset_get(parv[2]);
+ if(privset == NULL)
+ {
+ /* if we don't have a matching privset, we'll create an empty one and
+ * mark it illegal, so it gets picked up on a rehash later */
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Received OPER for %s with unknown privset %s", source_p->name, parv[2]);
+ privset = privilegeset_set_new(parv[2], "", 0);
+ privset->status |= CONF_ILLEGAL;
+ }
+
+ privset = privilegeset_ref(privset);
+ if (source_p->user->privset != NULL)
+ privilegeset_unref(source_p->user->privset);
- return 0;
+ source_p->user->privset = privset;
+ source_p->user->opername = rb_strdup(parv[1]);
}
/*
*
* inputs - pointer to given password
* - pointer to Conf
- * output - YES or NO if match
+ * output - true if match, false otherwise
* side effects - none
*/
-static int
+static bool
match_oper_password(const char *password, struct oper_conf *oper_p)
{
const char *encr;
/* passwd may be NULL pointer. Head it off at the pass... */
if(EmptyString(oper_p->passwd))
- return NO;
+ return false;
if(IsOperConfEncrypted(oper_p))
{
encr = password;
if(encr != NULL && strcmp(encr, oper_p->passwd) == 0)
- return YES;
+ return true;
else
- return NO;
+ return false;
}