Changeset 626f420 in code for icb.c

Timestamp:

Mar 4, 2014, 5:09:42 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

b7bc432

Parents:

8ef8c4e

git-author:

Mike Belopuhov <mike@…> (03/04/14 17:09:08)

git-committer:

Mike Belopuhov <mike@…> (03/04/14 17:09:42)

Message:

Add icb_vis to escape '%' chars and do some other sanitizing

File:

• icb.c (modified) (9 diffs)

icb.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009, 2010, 2013 Mike Belopuhov
+ * Copyright (c) 2009, 2010, 2013, 2014 Mike Belopuhov
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -23 +23 @@
 #include <syslog.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <event.h>
 
@@ -141 +142 @@
  */
 void
-icb_login(struct icb_session *is, char *group, char *nick, char *client)
+icb_login(struct icb_session *is, char *grp, char *nick, char *client)
 {
         char *defgrp = "1";
         struct icb_group *ig;
         struct icb_session *s;
-
-        if (!nick || strlen(nick) == 0) {
+        char group[ICB_MAXGRPLEN];
+
+        if (!nick || strlen(nick) == 0 ||
+            icb_vis(is->nick, nick, ICB_MAXNICKLEN)) {
                 icb_error(is, "Invalid nick");
                 icb_drop(is, NULL);
                 return;
         }
-        if (!group || strlen(group) == 0)
-                group = defgrp;
+        if (!grp || strlen(grp) == 0)
+                strlcpy(group, defgrp, ICB_MAXGRPLEN);
+        else
+                icb_vis(group, grp, ICB_MAXNICKLEN);
         LIST_FOREACH(ig, &groups, entry) {
                 if (strcmp(ig->name, group) == 0)
@@ -169 +174 @@
                         }
                         icb_log(NULL, LOG_DEBUG, "%s created group %s",
-                            nick, group);
+                            is->nick, group);
                 }
         }
         LIST_FOREACH(s, &ig->sess, entry) {
-                if (strcmp(s->nick, nick) == 0) {
+                if (strcmp(s->nick, is->nick) == 0) {
                         icb_error(is, "Nick is already in use");
                         icb_drop(is, NULL);
@@ -181 +186 @@
 
         if (client && strlen(client) > 0)
-                strlcpy(is->client, client, sizeof is->client);
+                icb_vis(is->client, client, sizeof is->client);
         strlcpy(is->nick, nick, sizeof is->nick);
         is->group = ig;
@@ -240 +245 @@
  */
 void
-icb_privmsg(struct icb_session *is, char *whom, char *msg)
+icb_privmsg(struct icb_session *is, char *to, char *msg)
 {
         struct icb_group *ig = is->group;
         struct icb_session *s;
+        char whom[ICB_MAXNICKLEN];
+
+        icb_vis(whom, to, ICB_MAXNICKLEN);
 
         LIST_FOREACH(s, &ig->sess, entry) {
@@ -263 +271 @@
 {
         void (*handler)(struct icb_session *, char *);
-
-        if ((handler = icb_cmd_lookup(cmd)) == NULL) {
-                icb_error(is, "Unsupported command: %s", cmd);
+        char command[32]; /* XXX */
+
+        icb_vis(command, cmd, sizeof command);
+
+        if ((handler = icb_cmd_lookup(command)) == NULL) {
+                icb_error(is, "Unsupported command: %s", command);
                 return;
         }
@@ -510 +521 @@
  *  icb_ismod: checks whether group is moderated by "is"
  */
-int
+inline int
 icb_ismod(struct icb_group *ig, struct icb_session *is)
 {
-        if (ig->mod && ig->mod == is)
-                return (1);
-        return (0);
+        return (ig->mod == is);
 }
 
@@ -600 +609 @@
         icb_send(is, buf, buflen + 1);
 }
+
+/*
+ *  icb_vis: strnvis-like function that escapes percentages as well
+ */
+int
+icb_vis(char *dst, const char *src, size_t dstsize)
+{
+        int si = 0, di = 0, td;
+
+        while ((size_t)di < dstsize && src[si] != '\0') {
+                if (src[si] == '%')
+                        dst[di++] = '%', dst[di] = '%';
+                else if (isgraph(src[si]))
+                        dst[di] = src[si];
+                else {
+                        td = snprintf(&dst[di], dstsize - di,
+                            "\\%03o", (unsigned char)src[si]);
+                        di += td - 1;
+                }
+                si++, di++;
+        }
+        dst[MIN((size_t)di, dstsize)] = '\0';
+        return (0);
+}