#include "s_conf.h"
#include "msg.h"
#include "parse.h"
-#include "irc_string.h"
+#include "match.h"
#include "logger.h"
#include "s_user.h"
#include "cache.h"
static int challenge_load(void)
{
#ifndef STATIC_MODULES
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Challenge module not loaded because OpenSSL is not available.");
ilog(L_MAIN, "Challenge module not loaded because OpenSSL is not available.");
return -1;
DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
#else
-static int m_challenge(struct Client *, struct Client *, int, const char **);
+static int m_challenge(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
/* We have openssl support, so include /CHALLENGE */
struct Message challenge_msgtab = {
- "CHALLENGE", 0, 0, 0, MFLG_SLOW,
+ "CHALLENGE", 0, 0, 0, 0,
{mg_unreg, {m_challenge, 2}, mg_ignore, mg_ignore, mg_ignore, {m_challenge, 2}}
};
{
if(target_p->localClient == NULL)
return;
-
+
rb_free(target_p->localClient->challenge);
rb_free(target_p->localClient->opername);
target_p->localClient->challenge = NULL;
/*
* m_challenge - generate RSA challenge for wouldbe oper
- * parv[0] = sender prefix
* parv[1] = operator to challenge for, or +response
*
*/
static int
-m_challenge(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_challenge(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct oper_conf *oper_p;
char *challenge = NULL; /* to placate gcc */
- char chal_line[CHALLENGE_WIDTH];
+ char chal_line[CHALLENGE_WIDTH];
unsigned char *b_response;
size_t cnt;
int len = 0;
source_p->name, source_p->username,
source_p->host);
cleanup_challenge(source_p);
- return 0;
+ return 0;
}
- b_response = rb_base64_decode((const unsigned char *)++parv[1], strlen(parv[1]), &len);
+ parv[1]++;
+ b_response = rb_base64_decode((const unsigned char *)parv[1], strlen(parv[1]), &len);
if(len != SHA_DIGEST_LENGTH ||
memcmp(source_p->localClient->challenge, b_response, SHA_DIGEST_LENGTH))
rb_free(b_response);
- oper_p = find_oper_conf(source_p->username, source_p->orighost,
- source_p->sockhost,
+ oper_p = find_oper_conf(source_p->username, source_p->orighost,
+ source_p->sockhost,
source_p->localClient->opername);
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)",
source_p->localClient->opername, source_p->name,
source_p->username, source_p->host,
oper_up(source_p, oper_p);
ilog(L_OPERED, "OPER %s by %s!%s@%s (%s)",
- source_p->localClient->opername, source_p->name,
+ source_p->localClient->opername, source_p->name,
source_p->username, source_p->host, source_p->sockhost);
return 0;
}
cleanup_challenge(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, parv[1]);
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)",
parv[1], 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 CHALLENGE (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ parv[1], 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 CHALLENGE 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",
+ parv[1], 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(!generate_challenge(&challenge, &(source_p->localClient->challenge), oper_p->rsa_pubkey))
{
char *chal = challenge;
chal += CHALLENGE_WIDTH - 1;
else
break;
-
+
}
- sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2),
+ sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2),
me.name, source_p->name);
rb_free(challenge);
source_p->localClient->opername = rb_strdup(oper_p->name);