Fix telnet echo and esc bold codes

Author: michaelortmann

src/dcc.c

@@ -737,10 +737,8 @@ static void dcc_chat_pass(int idx, char *buf, int atr)
       dcc[idx].u.chat->con_flags = (atr & USER_MASTER) ? conmask : 0;
       dcc[idx].u.chat->channel = -2;
       /* Turn echo back on for telnet sessions (send IAC WON'T ECHO). */
-      if (dcc[idx].status & STAT_TELNET)
+      if (dcc[idx].status & (STAT_TELNET | STAT_WS))
         tputs(dcc[idx].sock, TLN_IAC_C TLN_WONT_C TLN_ECHO_C "\n", 4);
-      else if (dcc[idx].status & STAT_WS)
-        tputs(dcc[idx].sock, WS_ECHO_ON, 1);
       dcc_chatter(idx);
     }
   } else {
@@ -1851,20 +1849,14 @@ static void dcc_telnet_pass(int idx, int atr)
      *       <Cybah>
      */
 
-    /* Turn off remote telnet echo */
-    char buf[512];
-    if (dcc[idx].status & STAT_TELNET) {
-      /* For telnet sessions send IAC WILL ECHO */
+    /* Turn off remote telnet echo (send IAC WILL ECHO). */
+    if (dcc[idx].status & (STAT_TELNET | STAT_WS)) {
+      char buf[512];
       snprintf(buf, sizeof buf, "\n%s%s\r\n", escape_telnet(DCC_ENTERPASS),
                TLN_IAC_C TLN_WILL_C TLN_ECHO_C);
       tputs(dcc[idx].sock, buf, strlen(buf));
-    } else if (dcc[idx].status & STAT_WS) {
-      /* For webui sessions */
-      snprintf(buf, sizeof buf, "\n%s" WS_ECHO_OFF "\n", DCC_ENTERPASS);
-      tputs(dcc[idx].sock, buf, strlen(buf));
-    } else {
+    } else
       dprintf(idx, "\n%s\n", DCC_ENTERPASS);
-    }
   }
 }
 

src/eggdrop.h

@@ -758,7 +758,4 @@ struct dns_thread_node {
 extern struct dns_thread_node *dns_thread_head;
 #endif
 
-#define WS_ECHO_ON  "\x01" /* webui websocket echo on */
-#define WS_ECHO_OFF "\x02" /* webui websocket echo off */
-
 #endif /* _EGG_EGGDROP_H */

src/misc.c

@@ -1218,7 +1218,7 @@ static int display_tellhelp(int idx, char *file, FILE *f,
 
   if (f) {
     help_subst(NULL, NULL, 0,
-               (dcc[idx].status & STAT_TELNET) ? 0 : HELP_IRC, NULL);
+               (dcc[idx].status & (STAT_TELNET | STAT_WS)) ? 0 : HELP_IRC, NULL);
     /* don't check for feof after fgets, skips last line if it has no \n (ie on windows) */
     while (!feof(f) && fgets(s, HELP_BUF_LEN, f) != NULL) {
       if (s[strlen(s) - 1] == '\n')
@@ -1309,7 +1309,7 @@ void sub_lang(int idx, char *text)
 
   get_user_flagrec(dcc[idx].user, &fr, dcc[idx].u.chat->con_chan);
   help_subst(NULL, NULL, 0,
-             (dcc[idx].status & STAT_TELNET) ? 0 : HELP_IRC, NULL);
+             (dcc[idx].status & (STAT_TELNET | STAT_WS)) ? 0 : HELP_IRC, NULL);
   strlcpy(s, text, sizeof s);
   if (s[strlen(s) - 1] == '\n')
     s[strlen(s) - 1] = 0;
@@ -1350,7 +1350,7 @@ void show_motd(int idx)
   dprintf(idx, "\n");
   /* reset the help_subst variables to their defaults */
   help_subst(NULL, NULL, 0,
-             (dcc[idx].status & STAT_TELNET) ? 0 : HELP_IRC, NULL);
+             (dcc[idx].status & (STAT_TELNET | STAT_WS)) ? 0 : HELP_IRC, NULL);
   /* don't check for feof after fgets, skips last line if it has no \n (ie on windows) */
   while (!feof(vv) && fgets(s, sizeof s, vv) != NULL) {
     if (s[strlen(s) - 1] == '\n')

src/mod/webui.mod/webui.c

@@ -40,6 +40,8 @@
 #define WS_LEN    28 /* length of Sec-WebSocket-Accept header field value
                       * base64(len(sha1))
                       * import math; (4 * math.ceil(20 / 3)) */
+#define WS_ECHO_ON  0x01
+#define WS_ECHO_OFF 0x02
 
 static Function *global = NULL;
 
@@ -330,7 +332,7 @@ static size_t escape_html(char *dst, char *src, size_t size) {
   char *d = dst;
 
   for (i = 0; i < size; i++) {
-    switch (src[i]) {
+    switch ((unsigned char) src[i]) {
       case '"':
         *d++ = '&';
         *d++ = 'q';
@@ -366,6 +368,45 @@ static size_t escape_html(char *dst, char *src, size_t size) {
         *d++ = 't';
         *d++ = ';';
         break;
+      case ESC:
+        // debug0("escape_html(): ESC");
+        if ((i + 4) < size) {
+          if (     ((unsigned char) src[i + 1] == '[') &&
+                   ((unsigned char) src[i + 2] == '0') &&
+                   ((unsigned char) src[i + 3] == 'm')) {
+            *d++ = '<';
+            *d++ = 'b';
+            *d++ = '>';
+          } else if (((unsigned char) src[i + 1] == '[') &&
+                   ((unsigned char) src[i + 2] == '1') &&
+                   ((unsigned char) src[i + 3] == 'm')) {
+            *d++ = '<';
+            *d++ = 'b';
+            *d++ = '/';
+            *d++ = '>';
+          } else
+            debug3("webui: escape_html(): unknown escape sequence found, skipping, %x %x %x, PLEASE REPORT THIS BUG",
+                   (unsigned char) src[i + 1], (unsigned char) src[i + 2], (unsigned char) src[i + 3]);
+          i += 3;
+        } else
+          debug0("webui: escape_html(): unknown SHORT escape sequence found, skipping, PLEASE REPORT THIS BUG");
+        break;
+      case TLN_IAC:
+        // debug0("escape_html(): TLN_IAC_C");
+        if ((i + 2) < size) {
+          if (     ((unsigned char) src[i + 1] == TLN_WILL) &&
+                   ((unsigned char) src[i + 2] == TLN_ECHO))
+            *d++ = WS_ECHO_OFF;
+          else if (((unsigned char) src[i + 1] == TLN_WONT) &&
+                   ((unsigned char) src[i + 2] == TLN_ECHO))
+            *d++ = WS_ECHO_ON;
+          else
+            debug2("webui: escape_html(): unknown telnet command found, skipping, %x %x, PLEASE REPORT THIS BUG",
+                   (unsigned char) src[i + 1], (unsigned char) src[i + 2]);
+          i += 2;
+        } else
+          debug0("webui: escape_html(): unknown SHORT telnet command found, skipping, PLEASE REPORT THIS BUG");
+        break;
       default:
         *d++ = src[i];
     }
@@ -383,6 +424,7 @@ static size_t webui_frame(char **dst, char *src, size_t len) {
   len = escape_html(buf + 4, src, len);
   /* we must not use putlog() or debug() here or we get recursion */
   /* A server MUST NOT mask any frames that it sends to the client */
+  /* we use text, not binary, so escape_html() must output valid html */
   if (len < 0x7e) {
     buf[2] =0x81; /* FIN + text frame */
     buf[3] = len;