X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/f427c8b00d445a30d73b24ff39d953b0be7c3ec5..fc939ca58f179a59fda915a9041e0fc1970cedab:/modules/m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 0d2278e4..51b4fa4e 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  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,7 +42,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"
@@ -60,7 +58,7 @@
 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;
@@ -69,19 +67,26 @@ static int	challenge_load(void)
 #endif
 }
 
-DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
+static const char challenge_desc[] = "Does nothing as OpenSSL was not enabled.";
+
+DECLARE_MODULE_AV2(challenge, challenge_load, NULL, NULL, NULL, NULL, NULL, NULL, challenge_desc);
 #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}}
 };
 
 mapi_clist_av1 challenge_clist[] = { &challenge_msgtab, NULL };
-DECLARE_MODULE_AV1(challenge, NULL, NULL, challenge_clist, NULL, NULL, "$Revision: 3161 $");
+
+static const char challenge_desc[] =
+	"Provides the challenge-response facility used for becoming an IRC operator";
+
+
+DECLARE_MODULE_AV2(challenge, NULL, NULL, challenge_clist, NULL, NULL, NULL, NULL, challenge_desc);
 
 static int generate_challenge(char **r_challenge, char **r_response, RSA * key);
 
@@ -90,7 +95,7 @@ cleanup_challenge(struct Client *target_p)
 {
 	if(target_p->localClient == NULL)
 		return;
-	
+
 	rb_free(target_p->localClient->challenge);
 	rb_free(target_p->localClient->opername);
 	target_p->localClient->challenge = NULL;
@@ -100,16 +105,14 @@ 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
- *
  */
 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;
@@ -141,10 +144,11 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 						     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))
@@ -167,14 +171,13 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 		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,
@@ -193,19 +196,19 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 		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);
@@ -223,6 +226,41 @@ 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;
@@ -235,9 +273,9 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 				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);