Changeset 1d2125a in code

Timestamp:

Mar 2, 2014, 1:50:57 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

59a7416

Parents:

d554223

git-author:

Mike Belopuhov <mike@…> (03/02/14 01:48:34)

git-committer:

Mike Belopuhov <mike@…> (03/02/14 01:50:57)

Message:

Add support for the moderator table that specifies (currently up
to 50) users that are allowed to become moderators.

Files:

• icb.c (modified) (3 diffs)
• icb.h (modified) (2 diffs)
• icbd.c (modified) (6 diffs)

icb.c

@@ -35 +35 @@
 void   icb_login(struct icb_session *, char *, char *, char *);
 int    icb_dowho(struct icb_session *, struct icb_group *);
+int    icb_modpermit(struct icb_session *);
 char  *icb_nextfield(char **);
 
@@ -518 +519 @@
 
 /*
+ *  icb_modpermit: checks user against the moderators table if it has
+ *                 been populated
+ */
+int
+icb_modpermit(struct icb_session *is)
+{
+        extern char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
+        extern int modtabcnt;
+
+        if (modtabcnt == 0 ||
+            bsearch(is->nick, modtab, modtabcnt, ICB_MAXNICKLEN,
+            (int (*)(const void *, const void *))strcmp))
+                return (1);
+        return (0);
+}
+
+/*
  *  icb_pass: passes moderation of group "ig" from "from" to "to",
  *            returns -1 if "from" is not a moderator, 1 if passed
@@ -530 +548 @@
                 return (-1);
         if (!from && !to)
+                return (-1);
+        if (to && !icb_modpermit(to))
                 return (-1);
         ig->mod = to;

icb.h

@@ -23 +23 @@
 #define ICB_MAXPASSLEN           32
 #define ICB_MAXTOPICLEN          160
+#define ICB_MTABLEN              50 /* XXX */
 
 #define ICB_M_LOGIN              'a'
@@ -120 +121 @@
 void icb_input(struct icb_session *);
 int  icb_ismod(struct icb_group *, struct icb_session *);
+int  icb_modpermit(struct icb_session *);
 int  icb_pass(struct icb_group *, struct icb_session *, struct icb_session *);
 void icb_privmsg(struct icb_session *, char *, char *);

icbd.c

@@ -44 +44 @@
 extern char *__progname;
 
+char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
+int  modtabcnt;
 char srvname[MAXHOSTNAMELEN];
 int  creategroups;
@@ -57 +59 @@
 void icbd_log(struct icb_session *, int, const char *, ...);
 void icbd_grplist(char *);
+void icbd_modtab(char *);
 void icbd_restrict(void);
 void icbd_write(struct icb_session *, char *, ssize_t);
@@ -71 +74 @@
         icb_init(&ic);
 
-        while ((ch = getopt(argc, argv, "46CdG:S:v")) != -1)
+        while ((ch = getopt(argc, argv, "46CdG:M:S:v")) != -1)
                 switch (ch) {
                 case '4':
@@ -87 +90 @@
                 case 'G':
                         icbd_grplist(optarg);
+                        break;
+                case 'M':
+                        icbd_modtab(optarg);
                         break;
                 case 'S':
@@ -276 +282 @@
 {
         (void)fprintf(stderr, "usage: %s [-46Cdv] [-G group1[,group2,...]] "
-           "[-S name] [[addr][:port] ...]\n",  __progname);
+           "[-M modtab]\n\t[-S name] [[addr][:port] ...]\n",  __progname);
         exit(EX_USAGE);
 }
@@ -455 +461 @@
 }
 
+void
+icbd_modtab(char *mtab)
+{
+        FILE *fp;
+        char *buf, *lbuf;
+        size_t len;
+
+        if ((fp = fopen(mtab, "r")) == NULL)
+                err(EX_NOINPUT, "%s", mtab);
+
+        bzero(modtab, ICB_MTABLEN * ICB_MAXNICKLEN);
+        lbuf = NULL;
+        while ((buf = fgetln(fp, &len)) && modtabcnt < ICB_MTABLEN) {
+                if (buf[len - 1] == '\n')
+                        buf[len - 1] = '\0';
+                else {
+                        /* EOF without EOL, copy and add the NUL */
+                        if ((lbuf = malloc(len + 1)) == NULL)
+                                err(1, NULL);
+                        memcpy(lbuf, buf, len);
+                        lbuf[len] = '\0';
+                        buf = lbuf;
+                }
+                while (buf[0] == ' ' || buf[0] == '\t')
+                        buf++;
+                if (buf[0] == '#' || buf[0] == '\0')
+                        continue;
+                strlcpy(modtab[modtabcnt++], buf, ICB_MAXNICKLEN);
+        }
+        free(lbuf);
+
+        qsort(modtab, modtabcnt, ICB_MAXNICKLEN,
+            (int (*)(const void *, const void *))strcmp);
+
+        fclose(fp);
+}
+
 time_t
 getmonotime(void)