X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2667396968156a8210dda62f551783d7f7cbcc2b..12c4f819fadcc5fac4de0c9f510c02c560ad0f20:/modules/m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 6b5c6e1..19729e3 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -44,7 +44,7 @@
 #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"
@@ -100,7 +100,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
  *
  */
@@ -144,7 +143,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))
@@ -223,13 +222,29 @@ 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(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name);
+		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(!generate_challenge(&challenge, &(source_p->localClient->challenge), oper_p->rsa_pubkey))
 	{
 		char *chal = challenge;
 		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;