"WHO <hostmask>": use displayed hostname for matching

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index b4c951f3a63345c92daa755c1bf88ab48bc4f555..f9c9b0d2423c97b2ed8e2bf596a5f56fa1efa3ca 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -727,7 +727,7 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
                                strlcat(rpl, "+", sizeof(rpl));
                        strlcat(rpl, Client_User(c), sizeof(rpl));
                        strlcat(rpl, "@", sizeof(rpl));
-                       strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl));
+                       strlcat(rpl, Client_HostnameDisplayed(c), sizeof(rpl));
                        strlcat(rpl, " ", sizeof(rpl));
                }
        }
@@ -792,7 +792,7 @@ write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *f
 {
        return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client),
                                  channelname, Client_User(c),
-                                 Client_HostnameCloaked(c),
+                                 Client_HostnameDisplayed(c),
                                  Client_ID(Client_Introducer(c)), Client_ID(c),
                                  flags, Client_Hops(c), Client_Info(c));
 }
@@ -807,8 +807,18 @@ who_flags_status(const char *client_modes)
 }
 
 
+/**
+ * Return channel user mode prefix(es).
+ *
+ * @param Client The client requesting the mode prefixes.
+ * @param chan_user_modes String with channel user modes.
+ * @param str String buffer to which the prefix(es) will be appended.
+ * @param len Size of "str" buffer.
+ * @return Pointer to "str".
+ */
 static char *
-who_flags_qualifier(CLIENT *Client, const char *chan_user_modes, char *str, size_t len)
+who_flags_qualifier(CLIENT *Client, const char *chan_user_modes,
+                   char *str, size_t len)
 {
        assert(Client != NULL);
 
@@ -856,7 +866,6 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
        bool is_visible, is_member, is_ircop;
        CL2CHAN *cl2chan;
        const char *client_modes;
-       const char *chan_user_modes;
        char flags[10];
        CLIENT *c;
        int count = 0;
@@ -884,12 +893,13 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
 
                is_visible = strchr(client_modes, 'i') == NULL;
                if (is_member || is_visible) {
-                       strcpy(flags, who_flags_status(client_modes));
+                       strlcpy(flags, who_flags_status(client_modes),
+                               sizeof(flags));
                        if (is_ircop)
                                strlcat(flags, "*", sizeof(flags));
 
-                       chan_user_modes = Channel_UserModes(Chan, c);
-                       who_flags_qualifier(c, chan_user_modes, flags, sizeof(flags));
+                       who_flags_qualifier(Client, Channel_UserModes(Chan, c),
+                                           flags, sizeof(flags));
 
                        if (!write_whoreply(Client, c, Channel_Name(Chan),
                                            flags))
@@ -941,7 +951,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
                if (Mask) {
                        /* Match pattern against user host/server/name/nick */
                        client_match = MatchCaseInsensitive(Mask,
-                                               Client_Hostname(c));
+                                               Client_HostnameDisplayed(c));
                        if (!client_match)
                                client_match = MatchCaseInsensitive(Mask,
                                                Client_ID(Client_Introducer(c)));
@@ -978,7 +988,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
                if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
                        break;
 
-               strcpy(flags, who_flags_status(Client_Modes(c)));
+               strlcpy(flags, who_flags_status(Client_Modes(c)), sizeof(flags));
                if (strchr(Client_Modes(c), 'o'))
                        strlcat(flags, "*", sizeof(flags));
 
@@ -1071,7 +1081,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
        /* Nick, user, hostname and client info */
        if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from),
                                Client_ID(c), Client_User(c),
-                               Client_HostnameCloaked(c), Client_Info(c)))
+                               Client_HostnameDisplayed(c), Client_Info(c)))
                return DISCONNECTED;
 
        /* Server */
@@ -1105,7 +1115,8 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                if (str[strlen(str) - 1] != ':')
                        strlcat(str, " ", sizeof(str));
 
-               who_flags_qualifier(c, Channel_UserModes(chan, c), str, sizeof(str));
+               who_flags_qualifier(Client, Channel_UserModes(chan, c),
+                                   str, sizeof(str));
                strlcat(str, Channel_Name(chan), sizeof(str));
 
                if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) {
@@ -1122,14 +1133,20 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                        return DISCONNECTED;
        }
 
+       /* Service? */
+       if (Client_Type(c) == CLIENT_SERVICE &&
+           !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG,
+                               Client_ID(from), Client_ID(c)))
+               return DISCONNECTED;
+
        /* IRC-Operator? */
-       if (Client_HasMode(c, 'o') &&
+       if (Client_HasMode(c, 'o') && Client_Type(c) != CLIENT_SERVICE &&
            !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
 
        /* IRC-Bot? */
-       if (Client_HasMode(c, 'B') &&
+       if (Client_HasMode(c, 'B') && Client_Type(c) != CLIENT_SERVICE &&
            !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG,
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
@@ -1140,17 +1157,25 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                                Client_ID(c)))
                return DISCONNECTED;
 
-       /* Registered nick name? */
+       /* Registered nickname? */
        if (Client_HasMode(c, 'R') &&
            !IRC_WriteStrClient(from, RPL_WHOISREGNICK_MSG,
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
 
-       if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) &&
-           !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from),
-                               Client_ID(c), Client_Hostname(c),
-                               Conn_GetIPAInfo(Client_Conn(c))))
-               return DISCONNECTED;
+       /* Local client and requester is the user itself or an IRC Op? */
+       if (Client_Conn(c) > NONE &&
+           (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
+               /* Client hostname */
+               if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
+                   Client_ID(from), Client_ID(c), Client_Hostname(c),
+                   Conn_GetIPAInfo(Client_Conn(c))))
+                       return DISCONNECTED;
+               /* Client modes */
+               if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG,
+                   Client_ID(from), Client_ID(c), Client_Modes(c)))
+                       return DISCONNECTED;
+       }
 
        /* Idle and signon time (local clients only!) */
        if (!Conf_MorePrivacy && Client_Conn(c) > NONE &&
@@ -1210,7 +1235,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
        /* Get target server for this command */
        if (Req->argc > 1) {
                /* Search the target server, which can be specified as a
-                * nick name on that server as well: */
+                * nickname on that server as well: */
                target = Client_Search(Req->argv[0]);
                if (!target)
                        return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
@@ -1243,7 +1268,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                 */
                if (!has_wildcards || is_remote) {
                        c = Client_Search(query);
-                       if (c && Client_Type(c) == CLIENT_USER) {
+                       if (c && (Client_Type(c) == CLIENT_USER
+                                 || Client_Type(c) == CLIENT_SERVICE)) {
                                if (!IRC_WHOIS_SendReply(Client, from, c))
                                        return DISCONNECTED;
                        } else {
@@ -1610,7 +1636,8 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
                        if (str[strlen(str) - 1] != ':')
                                strlcat(str, " ", sizeof(str));
 
-                       who_flags_qualifier(cl, Channel_UserModes(Chan, cl), str, sizeof(str));
+                       who_flags_qualifier(Client, Channel_UserModes(Chan, cl),
+                                           str, sizeof(str));
                        strlcat(str, Client_ID(cl), sizeof(str));
 
                        if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {