Skip to content
Browse files

bugfix for text! data encoding

  • Loading branch information...
1 parent 601b864 commit e436bf09b85fab41d22d861c82194076bf86c92a @cadorn cadorn committed Sep 29, 2011
Showing with 317 additions and 183 deletions.
  1. +1 −0 README.md
  2. +312 −180 lib/pinf-loader-js/bravojs/plugins/packages/packages.js
  3. +4 −3 lib/pinf-loader-js/sandbox.js
View
1 README.md
@@ -201,6 +201,7 @@ This project uses code from:
* [https://github.com/Gozala/jetpack-protocol/](https://github.com/Gozala/jetpack-protocol/)
* [http://pajhome.org.uk/crypt/md5/sha1.html](http://pajhome.org.uk/crypt/md5/sha1.html)
* [http://membres-liglab.imag.fr/donsez/cours/exemplescourstechnoweb/js_securehash/md5src.html](http://membres-liglab.imag.fr/donsez/cours/exemplescourstechnoweb/js_securehash/md5src.html)
+ * [http://www.webtoolkit.info/javascript-base64.html](http://www.webtoolkit.info/javascript-base64.html)
Documentation License
View
492 lib/pinf-loader-js/bravojs/plugins/packages/packages.js
@@ -12,6 +12,314 @@
(function packages() {
+var calcMD5 = function() {
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Copyright (C) Paul Johnston 1999 - 2000.
+ * Updated by Greg Holt 2000 - 2001.
+ * See http://pajhome.org.uk/site/legal.html for details.
+ */
+/*
+ * Convert a 32-bit number to a hex string with ls-byte first
+ */
+var hex_chr = "0123456789abcdef";
+function rhex(num)
+{
+ var str = "";
+ for(var j = 0; j <= 3; j++)
+ str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
+ hex_chr.charAt((num >> (j * 8)) & 0x0F);
+ return str;
+}
+/*
+ * Convert a string to a sequence of 16-word blocks, stored as an array.
+ * Append padding bits and the length, as described in the MD5 standard.
+ */
+function str2blks_MD5(str)
+{
+ var nblk = ((str.length + 8) >> 6) + 1;
+ var blks = new Array(nblk * 16);
+ for(var i = 0; i < nblk * 16; i++) blks[i] = 0;
+ for(var i = 0; i < str.length; i++)
+ blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8);
+ blks[i >> 2] |= 0x80 << ((i % 4) * 8);
+ blks[nblk * 16 - 2] = str.length * 8;
+ return blks;
+}
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function add(x, y)
+{
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+}
+/*
+ * Bitwise rotate a 32-bit number to the left
+ */
+function rol(num, cnt)
+{
+ return (num << cnt) | (num >>> (32 - cnt));
+}
+/*
+ * These functions implement the basic operation for each round of the
+ * algorithm.
+ */
+function cmn(q, a, b, x, s, t)
+{
+ return add(rol(add(add(a, q), add(x, t)), s), b);
+}
+function ff(a, b, c, d, x, s, t)
+{
+ return cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function gg(a, b, c, d, x, s, t)
+{
+ return cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function hh(a, b, c, d, x, s, t)
+{
+ return cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function ii(a, b, c, d, x, s, t)
+{
+ return cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+/*
+ * Take a string and return the hex representation of its MD5.
+ */
+return function calcMD5(str)
+{
+ var x = str2blks_MD5(str);
+ var a = 1732584193;
+ var b = -271733879;
+ var c = -1732584194;
+ var d = 271733878;
+
+ for(var i = 0; i < x.length; i += 16)
+ {
+ var olda = a;
+ var oldb = b;
+ var oldc = c;
+ var oldd = d;
+
+ a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+ d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
+ c = ff(c, d, a, b, x[i+ 2], 17, 606105819);
+ b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+ a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+ d = ff(d, a, b, c, x[i+ 5], 12, 1200080426);
+ c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+ b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
+ a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
+ d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+ c = ff(c, d, a, b, x[i+10], 17, -42063);
+ b = ff(b, c, d, a, x[i+11], 22, -1990404162);
+ a = ff(a, b, c, d, x[i+12], 7 , 1804603682);
+ d = ff(d, a, b, c, x[i+13], 12, -40341101);
+ c = ff(c, d, a, b, x[i+14], 17, -1502002290);
+ b = ff(b, c, d, a, x[i+15], 22, 1236535329);
+
+ a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+ d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+ c = gg(c, d, a, b, x[i+11], 14, 643717713);
+ b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
+ a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+ d = gg(d, a, b, c, x[i+10], 9 , 38016083);
+ c = gg(c, d, a, b, x[i+15], 14, -660478335);
+ b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
+ a = gg(a, b, c, d, x[i+ 9], 5 , 568446438);
+ d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
+ c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
+ b = gg(b, c, d, a, x[i+ 8], 20, 1163531501);
+ a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
+ d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+ c = gg(c, d, a, b, x[i+ 7], 14, 1735328473);
+ b = gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+ a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
+ d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+ c = hh(c, d, a, b, x[i+11], 16, 1839030562);
+ b = hh(b, c, d, a, x[i+14], 23, -35309556);
+ a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+ d = hh(d, a, b, c, x[i+ 4], 11, 1272893353);
+ c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
+ b = hh(b, c, d, a, x[i+10], 23, -1094730640);
+ a = hh(a, b, c, d, x[i+13], 4 , 681279174);
+ d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
+ c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
+ b = hh(b, c, d, a, x[i+ 6], 23, 76029189);
+ a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+ d = hh(d, a, b, c, x[i+12], 11, -421815835);
+ c = hh(c, d, a, b, x[i+15], 16, 530742520);
+ b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+ a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+ d = ii(d, a, b, c, x[i+ 7], 10, 1126891415);
+ c = ii(c, d, a, b, x[i+14], 15, -1416354905);
+ b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
+ a = ii(a, b, c, d, x[i+12], 6 , 1700485571);
+ d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+ c = ii(c, d, a, b, x[i+10], 15, -1051523);
+ b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+ a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
+ d = ii(d, a, b, c, x[i+15], 10, -30611744);
+ c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+ b = ii(b, c, d, a, x[i+13], 21, 1309151649);
+ a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+ d = ii(d, a, b, c, x[i+11], 10, -1120210379);
+ c = ii(c, d, a, b, x[i+ 2], 15, 718787259);
+ b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+ a = add(a, olda);
+ b = add(b, oldb);
+ c = add(c, oldc);
+ d = add(d, oldd);
+ }
+ return rhex(a) + rhex(b) + rhex(c) + rhex(d);
+}
+}();
+
+//@see http://www.webtoolkit.info/javascript-base64.html
+var Base64 = {
+
+ // private property
+ _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+ // public method for encoding
+ encode : function (input) {
+ var output = "";
+ var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+ var i = 0;
+
+ input = Base64._utf8_encode(input);
+
+ while (i < input.length) {
+
+ chr1 = input.charCodeAt(i++);
+ chr2 = input.charCodeAt(i++);
+ chr3 = input.charCodeAt(i++);
+
+ enc1 = chr1 >> 2;
+ enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+ enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+ enc4 = chr3 & 63;
+
+ if (isNaN(chr2)) {
+ enc3 = enc4 = 64;
+ } else if (isNaN(chr3)) {
+ enc4 = 64;
+ }
+
+ output = output +
+ Base64._keyStr.charAt(enc1) + Base64._keyStr.charAt(enc2) +
+ Base64._keyStr.charAt(enc3) + Base64._keyStr.charAt(enc4);
+
+ }
+
+ return output;
+ },
+
+ // public method for decoding
+ decode : function (input) {
+ var output = "";
+ var chr1, chr2, chr3;
+ var enc1, enc2, enc3, enc4;
+ var i = 0;
+
+ input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+ while (i < input.length) {
+
+ enc1 = Base64._keyStr.indexOf(input.charAt(i++));
+ enc2 = Base64._keyStr.indexOf(input.charAt(i++));
+ enc3 = Base64._keyStr.indexOf(input.charAt(i++));
+ enc4 = Base64._keyStr.indexOf(input.charAt(i++));
+
+ chr1 = (enc1 << 2) | (enc2 >> 4);
+ chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+ chr3 = ((enc3 & 3) << 6) | enc4;
+
+ output = output + String.fromCharCode(chr1);
+
+ if (enc3 != 64) {
+ output = output + String.fromCharCode(chr2);
+ }
+ if (enc4 != 64) {
+ output = output + String.fromCharCode(chr3);
+ }
+
+ }
+
+ output = Base64._utf8_decode(output);
+
+ return output;
+
+ },
+
+ // private method for UTF-8 encoding
+ _utf8_encode : function (string) {
+ string = string.replace(/\r\n/g,"\n");
+ var utftext = "";
+
+ for (var n = 0; n < string.length; n++) {
+
+ var c = string.charCodeAt(n);
+
+ if (c < 128) {
+ utftext += String.fromCharCode(c);
+ }
+ else if((c > 127) && (c < 2048)) {
+ utftext += String.fromCharCode((c >> 6) | 192);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+ else {
+ utftext += String.fromCharCode((c >> 12) | 224);
+ utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+ utftext += String.fromCharCode((c & 63) | 128);
+ }
+
+ }
+
+ return utftext;
+ },
+
+ // private method for UTF-8 decoding
+ _utf8_decode : function (utftext) {
+ var string = "";
+ var i = 0;
+ var c = c1 = c2 = 0;
+
+ while ( i < utftext.length ) {
+
+ c = utftext.charCodeAt(i);
+
+ if (c < 128) {
+ string += String.fromCharCode(c);
+ i++;
+ }
+ else if((c > 191) && (c < 224)) {
+ c2 = utftext.charCodeAt(i+1);
+ string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+ i += 2;
+ }
+ else {
+ c2 = utftext.charCodeAt(i+1);
+ c3 = utftext.charCodeAt(i+2);
+ string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+ i += 3;
+ }
+
+ }
+
+ return string;
+ }
+
+}
+
var Plugin = function()
{
}
@@ -208,6 +516,9 @@ Plugin.prototype.init = function()
this.hashId = calcMD5(this.id);
}
+
+ bravojs.base64encode = Base64.encode;
+ bravojs.base64decode = Base64.decode;
// We need to reset bravojs to use the Context object from above (but keep registered plugins)
bravojs.reset(null, bravojs.plugins);
@@ -500,7 +811,7 @@ Plugin.prototype.normalizeModuleIdentifier = function(moduleIdentifier, relative
return finalNormalization(this.bravojs.realpath(id + "@/" + moduleIdentifier.descriptor.main, false));
var newContext = this.bravojs.contextForId(id);
-
+
if (typeof moduleIdentifier.module !== "undefined")
{
return finalNormalization(this.bravojs.realpath(newContext.id + "@/" + moduleIdentifier.module, false));
@@ -633,183 +944,4 @@ if (typeof exports != "undefined")
exports.Plugin = Plugin;
}
-
-var calcMD5 = function() {
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Copyright (C) Paul Johnston 1999 - 2000.
- * Updated by Greg Holt 2000 - 2001.
- * See http://pajhome.org.uk/site/legal.html for details.
- */
-
-/*
- * Convert a 32-bit number to a hex string with ls-byte first
- */
-var hex_chr = "0123456789abcdef";
-function rhex(num)
-{
- var str = "";
- for(var j = 0; j <= 3; j++)
- str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
- hex_chr.charAt((num >> (j * 8)) & 0x0F);
- return str;
-}
-
-/*
- * Convert a string to a sequence of 16-word blocks, stored as an array.
- * Append padding bits and the length, as described in the MD5 standard.
- */
-function str2blks_MD5(str)
-{
- var nblk = ((str.length + 8) >> 6) + 1;
- var blks = new Array(nblk * 16);
- for(var i = 0; i < nblk * 16; i++) blks[i] = 0;
- for(var i = 0; i < str.length; i++)
- blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8);
- blks[i >> 2] |= 0x80 << ((i % 4) * 8);
- blks[nblk * 16 - 2] = str.length * 8;
- return blks;
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
- * to work around bugs in some JS interpreters.
- */
-function add(x, y)
-{
- var lsw = (x & 0xFFFF) + (y & 0xFFFF);
- var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
- return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left
- */
-function rol(num, cnt)
-{
- return (num << cnt) | (num >>> (32 - cnt));
-}
-
-/*
- * These functions implement the basic operation for each round of the
- * algorithm.
- */
-function cmn(q, a, b, x, s, t)
-{
- return add(rol(add(add(a, q), add(x, t)), s), b);
-}
-function ff(a, b, c, d, x, s, t)
-{
- return cmn((b & c) | ((~b) & d), a, b, x, s, t);
-}
-function gg(a, b, c, d, x, s, t)
-{
- return cmn((b & d) | (c & (~d)), a, b, x, s, t);
-}
-function hh(a, b, c, d, x, s, t)
-{
- return cmn(b ^ c ^ d, a, b, x, s, t);
-}
-function ii(a, b, c, d, x, s, t)
-{
- return cmn(c ^ (b | (~d)), a, b, x, s, t);
-}
-
-/*
- * Take a string and return the hex representation of its MD5.
- */
-return function calcMD5(str)
-{
- var x = str2blks_MD5(str);
- var a = 1732584193;
- var b = -271733879;
- var c = -1732584194;
- var d = 271733878;
-
- for(var i = 0; i < x.length; i += 16)
- {
- var olda = a;
- var oldb = b;
- var oldc = c;
- var oldd = d;
-
- a = ff(a, b, c, d, x[i+ 0], 7 , -680876936);
- d = ff(d, a, b, c, x[i+ 1], 12, -389564586);
- c = ff(c, d, a, b, x[i+ 2], 17, 606105819);
- b = ff(b, c, d, a, x[i+ 3], 22, -1044525330);
- a = ff(a, b, c, d, x[i+ 4], 7 , -176418897);
- d = ff(d, a, b, c, x[i+ 5], 12, 1200080426);
- c = ff(c, d, a, b, x[i+ 6], 17, -1473231341);
- b = ff(b, c, d, a, x[i+ 7], 22, -45705983);
- a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
- d = ff(d, a, b, c, x[i+ 9], 12, -1958414417);
- c = ff(c, d, a, b, x[i+10], 17, -42063);
- b = ff(b, c, d, a, x[i+11], 22, -1990404162);
- a = ff(a, b, c, d, x[i+12], 7 , 1804603682);
- d = ff(d, a, b, c, x[i+13], 12, -40341101);
- c = ff(c, d, a, b, x[i+14], 17, -1502002290);
- b = ff(b, c, d, a, x[i+15], 22, 1236535329);
-
- a = gg(a, b, c, d, x[i+ 1], 5 , -165796510);
- d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
- c = gg(c, d, a, b, x[i+11], 14, 643717713);
- b = gg(b, c, d, a, x[i+ 0], 20, -373897302);
- a = gg(a, b, c, d, x[i+ 5], 5 , -701558691);
- d = gg(d, a, b, c, x[i+10], 9 , 38016083);
- c = gg(c, d, a, b, x[i+15], 14, -660478335);
- b = gg(b, c, d, a, x[i+ 4], 20, -405537848);
- a = gg(a, b, c, d, x[i+ 9], 5 , 568446438);
- d = gg(d, a, b, c, x[i+14], 9 , -1019803690);
- c = gg(c, d, a, b, x[i+ 3], 14, -187363961);
- b = gg(b, c, d, a, x[i+ 8], 20, 1163531501);
- a = gg(a, b, c, d, x[i+13], 5 , -1444681467);
- d = gg(d, a, b, c, x[i+ 2], 9 , -51403784);
- c = gg(c, d, a, b, x[i+ 7], 14, 1735328473);
- b = gg(b, c, d, a, x[i+12], 20, -1926607734);
-
- a = hh(a, b, c, d, x[i+ 5], 4 , -378558);
- d = hh(d, a, b, c, x[i+ 8], 11, -2022574463);
- c = hh(c, d, a, b, x[i+11], 16, 1839030562);
- b = hh(b, c, d, a, x[i+14], 23, -35309556);
- a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
- d = hh(d, a, b, c, x[i+ 4], 11, 1272893353);
- c = hh(c, d, a, b, x[i+ 7], 16, -155497632);
- b = hh(b, c, d, a, x[i+10], 23, -1094730640);
- a = hh(a, b, c, d, x[i+13], 4 , 681279174);
- d = hh(d, a, b, c, x[i+ 0], 11, -358537222);
- c = hh(c, d, a, b, x[i+ 3], 16, -722521979);
- b = hh(b, c, d, a, x[i+ 6], 23, 76029189);
- a = hh(a, b, c, d, x[i+ 9], 4 , -640364487);
- d = hh(d, a, b, c, x[i+12], 11, -421815835);
- c = hh(c, d, a, b, x[i+15], 16, 530742520);
- b = hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
- a = ii(a, b, c, d, x[i+ 0], 6 , -198630844);
- d = ii(d, a, b, c, x[i+ 7], 10, 1126891415);
- c = ii(c, d, a, b, x[i+14], 15, -1416354905);
- b = ii(b, c, d, a, x[i+ 5], 21, -57434055);
- a = ii(a, b, c, d, x[i+12], 6 , 1700485571);
- d = ii(d, a, b, c, x[i+ 3], 10, -1894986606);
- c = ii(c, d, a, b, x[i+10], 15, -1051523);
- b = ii(b, c, d, a, x[i+ 1], 21, -2054922799);
- a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
- d = ii(d, a, b, c, x[i+15], 10, -30611744);
- c = ii(c, d, a, b, x[i+ 6], 15, -1560198380);
- b = ii(b, c, d, a, x[i+13], 21, 1309151649);
- a = ii(a, b, c, d, x[i+ 4], 6 , -145523070);
- d = ii(d, a, b, c, x[i+11], 10, -1120210379);
- c = ii(c, d, a, b, x[i+ 2], 15, 718787259);
- b = ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
- a = add(a, olda);
- b = add(b, oldb);
- c = add(c, oldc);
- d = add(d, oldd);
- }
- return rhex(a) + rhex(b) + rhex(c) + rhex(d);
-}
-
-}();
-
})();
View
7 lib/pinf-loader-js/sandbox.js
@@ -287,10 +287,10 @@ Sandbox.prototype.init = function()
var code;
if (/^text!/.test(moduleIdentifier))
{
- // text plugin
+ // text plugin
code =
"loader.bravojs.module.declare([], function() {\n" +
- 'return ["' + data.replace(/"/g, '\\"').replace(/\r/g, '').replace(/\n/g, '","') + '"].join("\\n");' +
+ 'return ((typeof bravojs !== "undefined")?bravojs:loader.bravojs).base64decode("' + loader.bravojs.base64encode(data) + '");' +
"\n});";
}
else
@@ -542,7 +542,8 @@ Sandbox.prototype.ensurePackageForLocator = function(locator, options)
// We first ask the program descriptor to augment the locator with any additional info
var newLocator = this.program.descriptor.augmentLocator(locator, options);
- if (locator.resource === true)
+ // TODO: Can probably get rid of `locator.resource === true` check here.
+ if (locator.resource === true || !API.FILE.exists(path.replace(/\/$/, "/package.json")))
{
this.packages[path] = new PACKAGE.Package(new DESCRIPTORS.Dummy(path, {
extendsDescriptorJSON: newLocator.descriptor

0 comments on commit e436bf0

Please sign in to comment.
Something went wrong with that request. Please try again.