#include "packet.h"
#include "cache.h"
-static int m_oper(struct Client *, struct Client *, int, const char **);
+static int m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message oper_msgtab = {
- "OPER", 0, 0, 0, MFLG_SLOW,
+ "OPER", 0, 0, 0, 0,
{mg_unreg, {m_oper, 3}, mg_ignore, mg_ignore, mg_ignore, {m_oper, 3}}
};
DECLARE_MODULE_AV1(oper, NULL, NULL, oper_clist, NULL, NULL, "$Revision: 1483 $");
static int match_oper_password(const char *password, struct oper_conf *oper_p);
-extern char *crypt();
/*
* m_oper
- * parv[0] = sender prefix
* parv[1] = oper name
* parv[2] = oper password
*/
static int
-m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct oper_conf *oper_p;
const char *name;
if(!IsFloodDone(source_p))
flood_endgrace(source_p);
- oper_p = find_oper_conf(source_p->username, source_p->orighost,
+ oper_p = find_oper_conf(source_p->username, source_p->orighost,
source_p->sockhost, name);
if(oper_p == NULL)
{
- sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name);
+ sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
name, source_p->name,
source_p->username, source_p->host, source_p->sockhost);
return 0;
}
+ if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
+ {
+ sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
+ ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ name, source_p->name,
+ source_p->username, source_p->host, source_p->sockhost);
+
+ if(ConfigFileEntry.failed_oper_notice)
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Failed OPER attempt - missing SSL/TLS by %s (%s@%s)",
+ source_p->name, source_p->username, source_p->host);
+ }
+ return 0;
+ }
+
+ if (oper_p->certfp != NULL)
+ {
+ if (source_p->certfp == NULL || 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",
+ name, source_p->name,
+ source_p->username, source_p->host, source_p->sockhost);
+
+ if(ConfigFileEntry.failed_oper_notice)
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Failed OPER attempt - client certificate fingerprint mismatch by %s (%s@%s)",
+ source_p->name, source_p->username, source_p->host);
+ }
+ return 0;
+ }
+ }
+
if(match_oper_password(password, oper_p))
{
oper_up(source_p, oper_p);
* match_oper_password
*
* inputs - pointer to given password
- * - pointer to Conf
+ * - pointer to Conf
* output - YES or NO if match
* side effects - none
*/
if(IsOperConfEncrypted(oper_p))
{
/* use first two chars of the password they send in as salt */
- /* If the password in the conf is MD5, and ircd is linked
+ /* If the password in the conf is MD5, and ircd is linked
* to scrypt on FreeBSD, or the standard crypt library on
* glibc Linux, then this code will work fine on generating
* the proper encrypted hash for comparison.
*/
if(!EmptyString(password))
- encr = crypt(password, oper_p->passwd);
+ encr = rb_crypt(password, oper_p->passwd);
else
encr = "";
}
else
encr = password;
- if(strcmp(encr, oper_p->passwd) == 0)
+ if(encr != NULL && strcmp(encr, oper_p->passwd) == 0)
return YES;
else
return NO;