X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/90a3c35b295b07ebe3793bf5d3b882c3c1a5dc7c..fc579e36e7201b9fcedf1f44f6d8746aa7fe1918:/modules/m_challenge.c diff --git a/modules/m_challenge.c b/modules/m_challenge.c index c5ed7c1..73f8e90 100644 --- a/modules/m_challenge.c +++ b/modules/m_challenge.c @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_challenge.c 3161 2007-01-25 07:23:01Z nenolod $ */ #include "stdinc.h" @@ -44,8 +43,8 @@ #include "s_conf.h" #include "msg.h" #include "parse.h" -#include "irc_string.h" -#include "s_log.h" +#include "match.h" +#include "logger.h" #include "s_user.h" #include "cache.h" #include "s_newconf.h" @@ -100,7 +99,6 @@ cleanup_challenge(struct Client *target_p) /* * m_challenge - generate RSA challenge for wouldbe oper - * parv[0] = sender prefix * parv[1] = operator to challenge for, or +response * */ @@ -128,7 +126,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch if(!source_p->localClient->challenge) return 0; - if((CurrentTime - source_p->localClient->chal_time) > CHALLENGE_EXPIRES) + if((rb_current_time() - source_p->localClient->chal_time) > CHALLENGE_EXPIRES) { sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name); ilog(L_FOPER, "EXPIRED CHALLENGE (%s) by (%s!%s@%s) (%s)", @@ -144,7 +142,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch return 0; } - b_response = ircd_base64_decode((const unsigned char *)++parv[1], strlen(parv[1]), &len); + 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)) @@ -173,8 +171,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch 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, @@ -205,7 +202,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch 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); @@ -223,13 +220,48 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch 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; - source_p->localClient->chal_time = CurrentTime; + source_p->localClient->chal_time = rb_current_time(); for(;;) { - cnt = strlcpy(chal_line, chal, CHALLENGE_WIDTH); + cnt = rb_strlcpy(chal_line, chal, CHALLENGE_WIDTH); sendto_one(source_p, form_str(RPL_RSACHALLENGE2), me.name, source_p->name, chal_line); if(cnt > CHALLENGE_WIDTH) chal += CHALLENGE_WIDTH - 1; @@ -240,7 +272,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2), me.name, source_p->name); rb_free(challenge); - DupString(source_p->localClient->opername, oper_p->name); + source_p->localClient->opername = rb_strdup(oper_p->name); } else sendto_one_notice(source_p, ":Failed to generate challenge."); @@ -248,28 +280,6 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch return 0; } -static int -get_randomness(unsigned char *buf, int length) -{ - /* Seed OpenSSL PRNG with EGD enthropy pool -kre */ - if(ConfigFileEntry.use_egd && (ConfigFileEntry.egdpool_path != NULL)) - { - if(RAND_egd(ConfigFileEntry.egdpool_path) == -1) - return -1; - } - - if(RAND_status()) - { - if(RAND_bytes(buf, length) > 0) - return 1; - } - else { - if(RAND_pseudo_bytes(buf, length) >= 0) - return 1; - } - return 0; -} - static int generate_challenge(char **r_challenge, char **r_response, RSA * rsa) { @@ -282,23 +292,24 @@ generate_challenge(char **r_challenge, char **r_response, RSA * rsa) if(!rsa) return -1; - if(get_randomness(secret, CHALLENGE_SECRET_LENGTH)) + if(rb_get_random(secret, CHALLENGE_SECRET_LENGTH)) { SHA1_Init(&ctx); - SHA1_Update(&ctx, (u_int8_t *)secret, CHALLENGE_SECRET_LENGTH); - *r_response = MyMalloc(SHA_DIGEST_LENGTH); - SHA1_Final((u_int8_t *)*r_response, &ctx); + SHA1_Update(&ctx, (uint8_t *)secret, CHALLENGE_SECRET_LENGTH); + *r_response = malloc(SHA_DIGEST_LENGTH); + SHA1_Final((uint8_t *)*r_response, &ctx); length = RSA_size(rsa); - tmp = MyMalloc(length); + tmp = rb_malloc(length); ret = RSA_public_encrypt(CHALLENGE_SECRET_LENGTH, secret, tmp, rsa, RSA_PKCS1_OAEP_PADDING); - if (ret >= 0) + if(ret >= 0) { - *r_challenge = (char *)ircd_base64_encode(tmp, ret); + *r_challenge = (char *)rb_base64_encode(tmp, ret); rb_free(tmp); return 0; } + rb_free(tmp); rb_free(*r_response); *r_response = NULL;