X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/76169ea73407a2eba1e9051914708b28d256bea3..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 92f19d3c..68070df7 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -143,7 +143,8 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 			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))
@@ -237,6 +238,25 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 		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;