Merge branch 'master' into mplex

butterfly.server.py

@@ -147,7 +147,7 @@ if tornado.options.options.generate_certs:
         ca_cert.gmtime_adj_notAfter(315360000)  # to 10y
         ca_cert.set_issuer(ca_cert.get_subject())  # Self signed
         ca_cert.set_pubkey(ca_pk)
-        ca_cert.sign(ca_pk, 'sha1')
+        ca_cert.sign(ca_pk, 'sha512')
 
         write(ca, crypto.dump_certificate(crypto.FILETYPE_PEM, ca_cert))
         write(ca_key, crypto.dump_privatekey(crypto.FILETYPE_PEM, ca_pk))
@@ -167,7 +167,7 @@ if tornado.options.options.generate_certs:
     server_cert.gmtime_adj_notAfter(315360000)  # to 10y
     server_cert.set_issuer(ca_cert.get_subject())  # Signed by ca
     server_cert.set_pubkey(server_pk)
-    server_cert.sign(ca_pk, 'sha1')
+    server_cert.sign(ca_pk, 'sha512')
 
     write(cert % host, crypto.dump_certificate(
         crypto.FILETYPE_PEM, server_cert))
@@ -217,8 +217,8 @@ if (tornado.options.options.generate_current_user_pkcs or
     client_cert.gmtime_adj_notAfter(315360000)  # to 10y
     client_cert.set_issuer(ca_cert.get_subject())  # Signed by ca
     client_cert.set_pubkey(client_pk)
-    client_cert.sign(client_pk, 'sha1')
-    client_cert.sign(ca_pk, 'sha1')
+    client_cert.sign(client_pk, 'sha512')
+    client_cert.sign(ca_pk, 'sha512')
 
     pfx = crypto.PKCS12()
     pfx.set_certificate(client_cert)

butterfly/static/main.js

@@ -57,7 +57,6 @@
       }
     });
     treat = function() {
-      console.log("TERM IS " + term);
       term.write(queue);
       if (term.stop) {
         term.stop = false;
@@ -762,7 +761,7 @@
     };
 
     Terminal.prototype.write = function(data) {
-      var attr, b64, c, ch, content, cs, i, k, l, len, line, m, mime, num, pt, ref, ref1, ref2, ref3, safe, type, valid;
+      var attr, b64, c, ch, content, cs, i, k, l, len, line, m, mime, num, pt, ref, ref1, ref2, ref3, safe, type, valid, x, y;
       i = 0;
       l = data.length;
       while (i < l) {
@@ -803,6 +802,20 @@
                 this.state = State.escaped;
                 break;
               default:
+                if (("\u0300" <= ch && ch <= "\u036F") || ("\u1AB0" <= ch && ch <= "\u1AFF") || ("\u1DC0" <= ch && ch <= "\u1DFF") || ("\u20D0" <= ch && ch <= "\u20FF") || ("\uFE20" <= ch && ch <= "\uFE2F")) {
+                  x = this.x;
+                  y = this.y + this.shift;
+                  if (this.x > 0) {
+                    x -= 1;
+                  } else if (this.y > 0) {
+                    y -= 1;
+                    x = this.cols - 1;
+                  } else {
+                    break;
+                  }
+                  this.screen[y].chars[x].ch += ch;
+                  break;
+                }
                 if (ch >= " ") {
                   if ((ref = this.charset) != null ? ref[ch] : void 0) {
                     ch = this.charset[ch];
@@ -1491,6 +1504,7 @@
                   }
                   this.body.classList.add('stopped');
                   this.stop = true;
+                  return this.send(' \x7f');
                 } else if (this.stop) {
                   return true;
                 }

coffees/term.coffee

@@ -630,7 +630,26 @@ class Terminal
               @state = State.escaped
 
             else
-              # ' '
+              # Diacritical Marks
+              if ("\u0300" <= ch <= "\u036F" or
+                  "\u1AB0" <= ch <= "\u1AFF" or
+                  "\u1DC0" <= ch <= "\u1DFF" or
+                  "\u20D0" <= ch <= "\u20FF" or
+                  "\uFE20" <= ch <= "\uFE2F")
+
+                x = @x
+                y = @y + @shift
+                if @x > 0
+                  x -= 1
+                else if @y > 0
+                  y -= 1
+                  x = @cols - 1
+                else
+                  # ?!
+                  break
+                @screen[y].chars[x].ch += ch
+                break
+
               if ch >= " "
                 ch = @charset[ch] if @charset?[ch]
                 if @x >= @cols
@@ -1396,6 +1415,7 @@ class Terminal
                   @t_bell, @t_queue, @t_blink]) while id--
                 @body.classList.add 'stopped'
                 @stop = true
+                return @send ' \x7f'
               else if @stop
                 return true
               @lastcc = t

setup.py

@@ -31,6 +31,7 @@ options = dict(
             'static/fonts/*',
             'static/images/favicon.png',
             'static/main.css',
+            'static/html-sanitizer.js',
             'static/*.min.js',
             'templates/index.html',
             'bin/*',