s_user: clean up return types and can YES/NO.

[solanum.git] / modules / m_oper.c

diff --git a/modules/m_oper.c b/modules/m_oper.c
index 061a9b71e8a5419dafe461ed94e4da4703e16426..9ec15a5e075248f80ea0d827f888af3ebd277c49 100644 (file)
--- a/modules/m_oper.c
+++ b/modules/m_oper.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_oper.c 1483 2006-05-27 18:58:12Z jilles $
  */
 
 #include "stdinc.h"
@@ -41,15 +39,18 @@
 #include "packet.h"
 #include "cache.h"
 
-static int m_oper(struct Client *, struct Client *, int, const char **);
+static int m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message oper_msgtab = {
-       "OPER", 0, 0, 0, MFLG_SLOW,
+       "OPER", 0, 0, 0, 0,
        {mg_unreg, {m_oper, 3}, mg_ignore, mg_ignore, mg_ignore, {m_oper, 3}}
 };
 
 mapi_clist_av1 oper_clist[] = { &oper_msgtab, NULL };
-DECLARE_MODULE_AV1(oper, NULL, NULL, oper_clist, NULL, NULL, "$Revision: 1483 $");
+
+static const char oper_desc[] = "Provides the OPER command to become an IRC operator";
+
+DECLARE_MODULE_AV2(oper, NULL, NULL, oper_clist, NULL, NULL, NULL, NULL, oper_desc);
 
 static int match_oper_password(const char *password, struct oper_conf *oper_p);
 
@@ -59,7 +60,7 @@ static int match_oper_password(const char *password, struct oper_conf *oper_p);
  *      parv[2] = oper password
  */
 static int
-m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct oper_conf *oper_p;
        const char *name;
@@ -79,12 +80,12 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
        if(!IsFloodDone(source_p))
                flood_endgrace(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, name);
 
        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)",
                     name, source_p->name,
                     source_p->username, source_p->host, source_p->sockhost);
@@ -101,7 +102,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
        if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
        {
-               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) -- requires SSL/TLS",
                     name, source_p->name,
                     source_p->username, source_p->host, source_p->sockhost);
@@ -115,6 +116,25 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                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",
+                            name, 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(match_oper_password(password, oper_p))
        {
                oper_up(source_p, oper_p);
@@ -148,7 +168,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
  * match_oper_password
  *
  * inputs       - pointer to given password
- *              - pointer to Conf 
+ *              - pointer to Conf
  * output       - YES or NO if match
  * side effects - none
  */
@@ -164,7 +184,7 @@ match_oper_password(const char *password, struct oper_conf *oper_p)
        if(IsOperConfEncrypted(oper_p))
        {
                /* use first two chars of the password they send in as salt */
-               /* If the password in the conf is MD5, and ircd is linked   
+               /* If the password in the conf is MD5, and ircd is linked
                 * to scrypt on FreeBSD, or the standard crypt library on
                 * glibc Linux, then this code will work fine on generating
                 * the proper encrypted hash for comparison.
@@ -177,7 +197,7 @@ match_oper_password(const char *password, struct oper_conf *oper_p)
        else
                encr = password;
 
-       if(strcmp(encr, oper_p->passwd) == 0)
+       if(encr != NULL && strcmp(encr, oper_p->passwd) == 0)
                return YES;
        else
                return NO;