don't reference external resources from browserid.org to not piss off SSL, and...

don't reference external resources from browserid.org to not piss off SSL, and also a small pile of fixes to the testing harness -- specifically its handling of binary data, etc.

don't reference external resources from browserid.org to not piss off SSL, and...
don't reference external resources from browserid.org to not piss off SSL, and also a small pile of fixes to the testing harness -- specifically its handling of binary data, etc.
a5a1c30b · Lloyd Hilaiel · 7593b218 · a5a1c30b · a5a1c30b · a5a1c30b
Commit a5a1c30b authored 13 years ago by Lloyd Hilaiel
--- a/authority/static/css/sil.ttf
+++ b/authority/static/css/sil.ttf
--- a/authority/static/css/style.css
+++ b/authority/static/css/style.css
+@font-face {
+  font-family: 'Shadows Into Light';
+  font-style: normal;
+  font-weight: normal;
+  src: local('Shadows Into Light'), local('ShadowsIntoLight'), url('sil.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Tenor Sans';
+  font-style: normal;
+  font-weight: normal;
+  src: local('Tenor Sans'), local('TenorSans'), url('ts.ttf') format('truetype');
+}
+
 body {
    padding: 0;
    margin: 0;

--- a/authority/static/css/ts.ttf
+++ b/authority/static/css/ts.ttf
--- a/authority/static/index.html
+++ b/authority/static/index.html
@@ -3,8 +3,6 @@
 <head>
  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
  <title>BrowserID: A better way to log in.</title>
-  <link href='http://fonts.googleapis.com/css?family=Tenor+Sans' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Shadows+Into+Light' rel='stylesheet' type='text/css'>
  <link rel="stylesheet" href="css/style.css"  type="text/css">
 </head>
 <body>

--- a/run.js
+++ b/run.js
@@ -18,7 +18,7 @@ function subHostNames(data) {
    var a = o.server.address();
    var from = o.name;
    var to = "http://" + a.address + ":" + a.port;
-    data = data.replace(new RegExp(from, 'g'), to);
+    data = data.toString().replace(new RegExp(from, 'g'), to);

    // now do another replacement to catch bare hostnames sans http(s)
    // and explicit cases where port is appended
@@ -51,20 +51,23 @@ function createServer(obj) {
        var realWrite = resp.write;
        var realEnd = resp.end;

-        var buf = "";
+        var buf = undefined;
        var enc = undefined;

        resp.write = function (chunk, encoding) {
-            buf += chunk;
+            if (buf) buf += chunk;
+            else buf = chunk;
            enc = encoding;
        };

        resp.end = function() {
-            buf = subHostNames(buf);
-            try { resp.setHeader('Content-Length', buf.length); } catch(e) { console.log("OOOH: ", e) }
-            if (buf.length) {
-                realWrite.call(resp, buf, enc);
+            var ct = resp.getHeader('content-type');
+            if (ct && (ct === "application/javascript" || ct.substr(4) === 'text')) {
+                var l = buf.length;
+                buf = subHostNames(buf);
+                if (l != buf.length) resp.setHeader('Content-Length', buf.length);
            }
+            if (buf && buf.length) realWrite.call(resp, buf, enc ? enc : "binary");
            realEnd.call(resp);
        }