ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/user.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 4856 by michael, Fri Nov 7 16:58:11 2014 UTC vs.
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 1997-2014 ircd-hybrid development team
4 > *  Copyright (c) 1997-2015 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 19 | Line 19
19   *  USA
20   */
21  
22 < /*! \file s_user.c
22 > /*! \file user.c
23   * \brief User related functions.
24   * \version $Id$
25   */
# Line 31 | Line 31
31   #include "channel_mode.h"
32   #include "client.h"
33   #include "hash.h"
34 + #include "id.h"
35   #include "irc_string.h"
36   #include "ircd.h"
37   #include "listener.h"
# Line 49 | Line 50
50   #include "watch.h"
51  
52   static char umode_buffer[IRCD_BUFSIZE];
52 – static const char *uid_get(void);
53  
54   /* Used for building up the isupport string,
55   * used with init_isupport, add_isupport, delete_isupport
# Line 65 | Line 65 | struct Isupport
65   static dlink_list support_list;
66   static dlink_list support_list_lines;
67  
68 < /* memory is cheap. map 0-255 to equivalent mode */
69 < const unsigned int user_modes[256] =
68 > const struct user_modes *umode_map[256];
69 > const struct user_modes  umode_tab[] =
70   {
71 <  /* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72 <  /* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73 <  /* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74 <  /* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75 <  0,                  /* @ */
76 <  0,                  /* A */
77 <  0,                  /* B */
78 <  0,                  /* C */
79 <  UMODE_DEAF,         /* D */
80 <  0,                  /* E */
81 <  UMODE_FARCONNECT,   /* F */
82 <  UMODE_SOFTCALLERID, /* G */
83 <  UMODE_HIDDEN,       /* H */
84 <  0,                  /* I */
85 <  0,                  /* J */
86 <  0,                  /* K */
87 <  0,                  /* L */
88 <  0,                  /* M */
89 <  0,                  /* N */
90 <  0,                  /* O */
91 <  0,                  /* P */
92 <  0,                  /* Q */
93 <  UMODE_REGONLY,      /* R */
94 <  UMODE_SSL,          /* S */
95 <  0,                  /* T */
96 <  0,                  /* U */
97 <  0,                  /* V */
98 <  UMODE_WEBIRC,       /* W */
99 <  0,                  /* X */
100 <  0,                  /* Y */
101 <  0,                  /* Z 0x5A */
102 <  0, 0, 0, 0, 0,      /* 0x5F   */
103 <  0,                  /* 0x60   */
104 <  UMODE_ADMIN,        /* a */
105 <  UMODE_BOTS,         /* b */
106 <  UMODE_CCONN,        /* c */
107 <  UMODE_DEBUG,        /* d */
108 <  UMODE_EXTERNAL,     /* e */
109 <  UMODE_FULL,         /* f */
110 <  UMODE_CALLERID,     /* g */
111 <  0,                  /* h */
112 <  UMODE_INVISIBLE,    /* i */
113 <  UMODE_REJ,          /* j */
114 <  UMODE_SKILL,        /* k */
115 <  UMODE_LOCOPS,       /* l */
116 <  0,                  /* m */
117 <  UMODE_NCHANGE,      /* n */
118 <  UMODE_OPER,         /* o */
119 <  UMODE_HIDECHANS,    /* p */
120 <  UMODE_HIDEIDLE,     /* q */
121 <  UMODE_REGISTERED,   /* r */
122 <  UMODE_SERVNOTICE,   /* s */
123 <  0,                  /* t */
124 <  UMODE_UNAUTH,       /* u */
125 <  0,                  /* v */
126 <  UMODE_WALLOP,       /* w */
127 <  UMODE_HIDDENHOST,   /* x */
128 <  UMODE_SPY,          /* y */
129 <  0,                  /* z      0x7A */
130 <  0,0,0,0,0,          /* 0x7B - 0x7F */
131 <
132 <  /* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
133 <  /* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134 <  /* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135 <  /* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136 <  /* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137 <  /* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138 <  /* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139 <  /* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71 >  { 'D', UMODE_DEAF         },
72 >  { 'F', UMODE_FARCONNECT   },
73 >  { 'G', UMODE_SOFTCALLERID },
74 >  { 'H', UMODE_HIDDEN       },
75 >  { 'R', UMODE_REGONLY      },
76 >  { 'S', UMODE_SSL          },
77 >  { 'W', UMODE_WEBIRC       },
78 >  { 'a', UMODE_ADMIN        },
79 >  { 'b', UMODE_BOTS         },
80 >  { 'c', UMODE_CCONN        },
81 >  { 'd', UMODE_DEBUG        },
82 >  { 'e', UMODE_EXTERNAL     },
83 >  { 'f', UMODE_FULL         },
84 >  { 'g', UMODE_CALLERID     },
85 >  { 'i', UMODE_INVISIBLE    },
86 >  { 'j', UMODE_REJ          },
87 >  { 'k', UMODE_SKILL        },
88 >  { 'l', UMODE_LOCOPS       },
89 >  { 'n', UMODE_NCHANGE      },
90 >  { 'o', UMODE_OPER         },
91 >  { 'p', UMODE_HIDECHANS    },
92 >  { 'q', UMODE_HIDEIDLE     },
93 >  { 'r', UMODE_REGISTERED   },
94 >  { 's', UMODE_SERVNOTICE   },
95 >  { 'u', UMODE_UNAUTH       },
96 >  { 'w', UMODE_WALLOP       },
97 >  { 'x', UMODE_HIDDENHOST   },
98 >  { 'y', UMODE_SPY          },
99 >  { '\0', 0 }
100   };
101  
102   void
103 < assemble_umode_buffer(void)
103 > user_usermodes_init(void)
104   {
145 –  unsigned int idx = 0;
105    char *umode_buffer_ptr = umode_buffer;
106  
107 <  for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108 <    if (user_modes[idx])
109 <      *umode_buffer_ptr++ = idx;
107 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108 >  {
109 >    umode_map[tab->c] = tab;
110 >    *umode_buffer_ptr++ = tab->c;
111 >  }
112  
113    *umode_buffer_ptr = '\0';
114   }
# Line 236 | Line 197 | report_and_set_user_flags(struct Client
197    if (IsConfExemptKline(conf))
198    {
199      SetExemptKline(source_p);
200 <    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
200 >    sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
201    }
202  
203 <  /*
243 <   * The else here is to make sure that G line exempt users
244 <   * do not get noticed twice.
245 <   */
246 <  else if (IsConfExemptGline(conf))
203 >  if (IsConfExemptXline(conf))
204    {
205 <    SetExemptGline(source_p);
206 <    sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
205 >    SetExemptXline(source_p);
206 >    sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
207    }
208  
209    if (IsConfExemptResv(conf))
# Line 305 | Line 262 | introduce_client(struct Client *source_p
262        continue;
263  
264      if (IsCapable(server, CAP_SVS))
265 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
265 >      sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
266                   source_p->servptr->id,
267                   source_p->name, source_p->hopcount+1,
268                   (unsigned long)source_p->tsinfo,
269                   ubuf, source_p->username, source_p->host,
270 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
314 <                 "0" : source_p->sockhost, source_p->id,
270 >                 source_p->sockhost, source_p->id,
271                   source_p->account,
272                   source_p->info);
273      else
274 <      sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
274 >      sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
275                   source_p->servptr->id,
276                   source_p->name, source_p->hopcount+1,
277                   (unsigned long)source_p->tsinfo,
278                   ubuf, source_p->username, source_p->host,
279 <                 (MyClient(source_p) && IsIPSpoof(source_p)) ?
324 <                 "0" : source_p->sockhost, source_p->id, source_p->info);
279 >                 source_p->sockhost, source_p->id, source_p->info);
280  
281      if (!EmptyString(source_p->certfp))
282        sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
# Line 375 | Line 330 | static int
330   check_xline(struct Client *source_p)
331   {
332    struct MaskItem *conf = NULL;
333 <  const char *reason = NULL;
333 >
334 >  if (IsExemptXline(source_p))
335 >    return 0;
336  
337    if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
338    {
339      ++conf->count;
383 –
384 –    if (conf->reason)
385 –      reason = conf->reason;
386 –    else
387 –      reason = CONF_NOREASON;
388 –
340      sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
341                           "X-line Rejecting [%s] [%s], user %s [%s]",
342 <                         source_p->info, reason,
342 >                         source_p->info, conf->reason,
343                           get_client_name(source_p, HIDE_IP),
344                           source_p->sockhost);
345  
# Line 413 | Line 364 | register_local_user(struct Client *sourc
364  
365    assert(source_p == source_p->from);
366    assert(MyConnect(source_p));
367 +  assert(IsUnknown(source_p));
368    assert(!source_p->connection->registration);
369  
418 –  ClearCap(source_p, CAP_TS6);
419 –
370    if (ConfigGeneral.ping_cookie)
371    {
372      if (!IsPingSent(source_p) && !source_p->connection->random_ping)
# Line 511 | Line 461 | register_local_user(struct Client *sourc
461     * probably be just a percentage of the MAXCLIENTS...
462     *   -Taner
463     */
464 <  if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
465 <      (Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
464 >  if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
465 >      (Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
466    {
467      sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
468                           "Too many clients, rejecting %s[%s].",
# Line 547 | Line 497 | register_local_user(struct Client *sourc
497    sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
498                         "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
499                         source_p->name, source_p->username, source_p->host,
500 <                       ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
551 <                       "255.255.255.255" : source_p->sockhost,
500 >                       source_p->sockhost,
501                         get_client_class(&source_p->connection->confs),
502                         source_p->info, source_p->id);
503  
# Line 612 | Line 561 | register_remote_user(struct Client *sour
561                           source_p->host, source_p->servptr->name,
562                           target_p->name, target_p->from->name);
563      sendto_one(source_p->from,
564 <               ":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
564 >               ":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565                 me.id, source_p->id, me.name, source_p->servptr->name,
566                 target_p->from->name);
567  
568      AddFlag(source_p, FLAGS_KILLED);
569 <    exit_client(source_p, "USER server wrong direction");
569 >    exit_client(source_p, "UID server wrong direction");
570      return;
571    }
572  
# Line 639 | Line 588 | register_remote_user(struct Client *sour
588  
589    if (HasFlag(source_p->servptr, FLAGS_EOB))
590      sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
591 <                         "Client connecting at %s: %s (%s@%s) [%s] <%s>",
591 >                         "Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
592                           source_p->servptr->name,
593                           source_p->name, source_p->username, source_p->host,
594 <                         source_p->info, source_p->id);
594 >                         source_p->sockhost, source_p->info, source_p->id);
595  
596    introduce_client(source_p);
597   }
# Line 740 | Line 689 | valid_nickname(const char *nickname, con
689   {
690    const char *p = nickname;
691  
692 <  assert(nickname && *nickname);
692 >  assert(p);
693  
694    /*
695     * Nicks can't start with a digit or - or be 0 length.
# Line 777 | Line 726 | send_umode(struct Client *client_p, stru
726     * Build a string in umode_buf to represent the change in the user's
727     * mode between the new (source_p->umodes) and 'old'.
728     */
729 <  for (unsigned int i = 0; i < 128; ++i)
729 >  for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
730    {
731 <    unsigned int flag = user_modes[i];
783 <
784 <    if (!flag)
785 <      continue;
786 <
787 <    if ((flag & old) && !HasUMode(source_p, flag))
731 >    if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
732      {
733        if (what == MODE_DEL)
734 <        *m++ = (char)i;
734 >        *m++ = tab->c;
735        else
736        {
737          what = MODE_DEL;
738          *m++ = '-';
739 <        *m++ = (char)i;
739 >        *m++ = tab->c;
740        }
741      }
742 <    else if (!(flag & old) && HasUMode(source_p, flag))
742 >    else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
743      {
744        if (what == MODE_ADD)
745 <        *m++ = (char)i;
745 >        *m++ = tab->c;
746        else
747        {
748          what = MODE_ADD;
749          *m++ = '+';
750 <        *m++ = (char)i;
750 >        *m++ = tab->c;
751        }
752      }
753    }
# Line 830 | Line 774 | send_umode_out(struct Client *source_p,
774    send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
775  
776    if (buf[0])
777 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
777 >    sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
778                    source_p->id, source_p->id, buf);
779   }
780  
# Line 846 | Line 790 | user_set_hostmask(struct Client *target_
790    {
791      case MODE_ADD:
792        AddUMode(target_p, UMODE_HIDDENHOST);
849 –      AddFlag(target_p, FLAGS_IP_SPOOFING);
793        break;
794      case MODE_DEL:
795        DelUMode(target_p, UMODE_HIDDENHOST);
853 –
854 –      if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
855 –        DelFlag(target_p, FLAGS_IP_SPOOFING);
796        break;
797      default: return;
798    }
# Line 906 | Line 846 | user_set_hostmask(struct Client *target_
846      *p = '\0';
847  
848  
849 <    sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
849 >    sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
850                                  target_p->name, target_p->username,
851                                  target_p->host, member->chptr->name,
852                                  (!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
853                                  target_p->info);
854 <    sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
854 >    sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
855                                  target_p->name, target_p->username,
856                                  target_p->host, member->chptr->name);
857  
# Line 962 | Line 902 | oper_up(struct Client *source_p)
902    if (HasOFlag(source_p, OPER_FLAG_ADMIN))
903      AddUMode(source_p, UMODE_ADMIN);
904  
905 +  if (!EmptyString(conf->whois))
906 +  {
907 +    client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
908 +    sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
909 +                  me.id, source_p->id, (unsigned long)source_p->tsinfo,
910 +                  RPL_WHOISOPERATOR, conf->whois);
911 +  }
912 +
913    sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
914                         get_oper_name(source_p));
915 <  sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
915 >  sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
916                  me.id, get_oper_name(source_p));
917    send_umode_out(source_p, old);
918    sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
919   }
920  
973 – static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
974 –
975 – int
976 – valid_sid(const char *sid)
977 – {
978 –  if (strlen(sid) == IRC_MAXSID)
979 –    if (IsDigit(*sid))
980 –      if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
981 –        return 1;
982 –
983 –  return 0;
984 – }
985 –
986 – /*
987 – * init_uid()
988 – *
989 – * inputs       - NONE
990 – * output       - NONE
991 – * side effects - new_uid is filled in with server id portion (sid)
992 – *                (first 3 bytes) or defaulted to 'A'.
993 – *                Rest is filled in with 'A'
994 – */
995 – void
996 – init_uid(void)
997 – {
998 –  memset(new_uid, 0, sizeof(new_uid));
999 –
1000 –  if (!EmptyString(ConfigServerInfo.sid))
1001 –    strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1002 –
1003 –  for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1004 –    if (new_uid[i] == '\0')
1005 –      new_uid[i] = 'A';
1006 –
1007 –  /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1008 –  memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1009 – }
1010 –
1011 – /*
1012 – * add_one_to_uid
1013 – *
1014 – * inputs       - index number into new_uid
1015 – * output       - NONE
1016 – * side effects - new_uid is incremented by one
1017 – *                note this is a recursive function
1018 – */
1019 – static void
1020 – add_one_to_uid(unsigned int i)
1021 – {
1022 –  if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1023 –  {
1024 –    if (new_uid[i] == 'Z')
1025 –      new_uid[i] = '0';
1026 –    else if (new_uid[i] == '9')
1027 –    {
1028 –      new_uid[i] = 'A';
1029 –      add_one_to_uid(i - 1);
1030 –    }
1031 –    else
1032 –      ++new_uid[i];
1033 –  }
1034 –  else
1035 –  {
1036 –    /* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1037 –    if (new_uid[i] == 'Z')
1038 –      memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1039 –    else
1040 –      ++new_uid[i];
1041 –  }
1042 – }
1043 –
1044 – /*
1045 – * uid_get
1046 – *
1047 – * inputs       - struct Client *
1048 – * output       - new UID is returned to caller
1049 – * side effects - new_uid is incremented by one.
1050 – */
1051 – static const char *
1052 – uid_get(void)
1053 – {
1054 –  add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1055 –  return new_uid;
1056 – }
1057 –
921   /*
922   * init_isupport()
923   *
# Line 1072 | Line 935 | init_isupport(void)
935    add_isupport("MODES", NULL, MAXMODEPARAMS);
936    add_isupport("PREFIX", "(ohv)@%+", -1);
937    add_isupport("STATUSMSG", "@%+", -1);
938 <  add_isupport("EXCEPTS", "e", -1);
939 <  add_isupport("INVEX", "I", -1);
938 >  add_isupport("EXCEPTS", NULL, -1);
939 >  add_isupport("INVEX", NULL, -1);
940   }
941  
942   /*

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)