whois: Fix UID leak.

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 331630c7b3093ccec6eaa4892e97c7c73dc3a115..65b169b0f2169bbca787b1426a6f56460c89d04e 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,15 +35,16 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
+#include "ipv4_from_ipv6.h"
+#include "ratelimit.h"
 
 static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
@@ -70,7 +71,6 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision
 
 /*
  * m_whois
- *      parv[0] = sender prefix
  *      parv[1] = nickname masklist
  */
 static int
@@ -90,7 +90,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(!IsOper(source_p))
                {
                        /* seeing as this is going across servers, we should limit it */
-                       if((last_used + ConfigFileEntry.pace_wait_simple) > CurrentTime)
+                       if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time() || !ratelimit_client(source_p, 2))
                        {
                                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                           me.name, source_p->name, "WHOIS");
@@ -99,7 +99,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
                                return 0;
                        }
                        else
-                               last_used = CurrentTime;
+                               last_used = rb_current_time();
                }
 
                if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) !=
@@ -116,7 +116,6 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_whois
- *      parv[0] = sender prefix
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
@@ -191,14 +190,13 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
        }
 
        target_p = find_named_person(nick);
-
        if(target_p != NULL)
        {
                if(operspy)
                {
                        char buffer[BUFSIZE];
 
-                       snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
                                target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
@@ -237,15 +235,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        char *t;
        int tlen;
        hook_data_client hdata;
-       char *name;
-       char quest[] = "?";
        int visible;
        int extra_space = 0;
-
-       if(target_p->name[0] == '\0')
-               name = quest;
-       else
-               name = target_p->name;
+#ifdef RB_IPV6
+       struct sockaddr_in ip4;
+#endif
 
        if(target_p->user == NULL)
        {
@@ -324,6 +318,15 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
+       if(IsSSLClient(target_p))
+               sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
+                                  target_p->name);
+       if((source_p == target_p || IsOper(source_p)) &&
+                       target_p->certfp != NULL)
+               sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+                               form_str(RPL_WHOISCERTFP),
+                               target_p->name, target_p->certfp);
+
        if(MyClient(target_p))
        {
                if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
@@ -343,9 +346,23 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           form_str(RPL_WHOISACTUALLY),
                                           target_p->name, target_p->sockhost);
 
+#ifdef RB_IPV6
+               if (target_p->localClient->ip.ss_family == AF_INET6 &&
+                               (show_ip(source_p, target_p) ||
+                                (source_p == target_p && !IsIPSpoof(target_p))) &&
+                               ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4))
+               {
+                       rb_inet_ntop_sock((struct sockaddr *)&ip4,
+                                       buf, sizeof buf);
+                       sendto_one_numeric(source_p, RPL_WHOISTEXT,
+                                       "%s :Underlying IPv4 is %s",
+                                       target_p->name, buf);
+               }
+#endif /* RB_IPV6 */
+
                sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
                                   target_p->name, 
-                                  CurrentTime - target_p->localClient->last, 
+                                  rb_current_time() - target_p->localClient->last, 
                                   target_p->localClient->firsttime);
        }
        else
@@ -367,7 +384,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           target_p->name, target_p->sockhost);
                        
                }
-       
        }
 
        hdata.client = source_p;