From a6b0d1f84b054d90986f862b6d41b2c93a55c8b7 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 26 Jul 2014 01:31:41 -0400 Subject: [PATCH] Add entirely untested secondary device init --- css/options.css | 17 +- js-deps/qrcode.min.js | 2 +- js/api.js | 98 ++++++++++-- js/crypto.js | 51 +++++- js/helpers.js | 307 ++++++++++++++++++------------------ js/options.js | 70 ++++++-- options.html | 40 +++-- protos/DeviceMessages.proto | 30 ++++ test.html | 8 +- 9 files changed, 425 insertions(+), 198 deletions(-) create mode 100644 protos/DeviceMessages.proto diff --git a/css/options.css b/css/options.css index 04408502..9af90e73 100644 --- a/css/options.css +++ b/css/options.css @@ -18,7 +18,7 @@ } html { - margin: 12px 0 0 100px; } + margin: 12px 100px 0 100px; } h1 { font-size: 30pt; @@ -30,6 +30,16 @@ h2 { font-size: 12pt; font-weight: normal; } +.left-column { + float: left; + width: 45%; + text-align: center; } + +.right-column { + float: right; + width: 50%; + text-align: center; } + .hidden { display: none; } @@ -37,12 +47,9 @@ h2 { width: 50px; height: 50px; } -#init-go-single-client { - display:block; } - #phonenumberspan { display: block; margin: .5em auto 1em auto; } #countrycode { - text-align: right; } \ No newline at end of file + text-align: right; } diff --git a/js-deps/qrcode.min.js b/js-deps/qrcode.min.js index d5f3ca88..c4e8332f 100644 --- a/js-deps/qrcode.min.js +++ b/js-deps/qrcode.min.js @@ -1 +1 @@ -var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="",this._elImage.style.width="100%",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); diff --git a/js/api.js b/js/api.js index fd65d16b..78f9e721 100644 --- a/js/api.js +++ b/js/api.js @@ -26,6 +26,7 @@ window.textsecure.api = function() { ************************************************/ // Staging server var URL_BASE = "https://textsecure-service-ca.whispersystems.org:4433"; + self.relay = "textsecure-service-staging.whispersystems.org"; // This is the real server //var URL_BASE = "https://textsecure-service.whispersystems.org"; @@ -35,6 +36,7 @@ window.textsecure.api = function() { URL_CALLS['devices'] = "/v1/devices"; URL_CALLS['keys'] = "/v2/keys"; URL_CALLS['push'] = "/v1/websocket"; + URL_CALLS['temp_push'] = "/v1/temp_websocket"; URL_CALLS['messages'] = "/v1/messages"; URL_CALLS['attachment'] = "/v1/attachments"; @@ -279,15 +281,93 @@ window.textsecure.api = function() { }); }; - self.getWebsocket = function() { - var user = textsecure.storage.getUnencrypted("number_id"); - var password = textsecure.storage.getEncrypted("password"); - var URL = URL_BASE.replace(/^http/g, 'ws') + URL_CALLS['push'] + '/?'; - var params = $.param({ - login: '+' + getString(user).substring(1), - password: getString(password) - }); - return new WebSocket(URL+params); + var getWebsocket = function(url, auth, reconnectTimeout) { + var URL = URL_BASE.replace(/^http/g, 'ws') + url + '/?'; + if (auth) { + var user = textsecure.storage.getUnencrypted("number_id"); + var password = textsecure.storage.getEncrypted("password"); + var params = $.param({ + login: '+' + getString(user).substring(1), + password: getString(password) + }); + } else + var params = $.param({}); + + var reconnectSemaphore = 0; + var pingInterval; + + var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} }; + + var connect = function() { + reconnectSemaphore++; + if (reconnectSemaphore <= 0) + return; + + var socket = new WebSocket(URL+params); + + socket.onerror = function(socketEvent) { + console.log('Server is down :('); + clearInterval(pingInterval); + reconnectSemaphore--; + setTimeout(function() { connect(); }, reconnectTimeout); + socketWrapper.ondisconnect(); + }; + + socket.onclose = function(socketEvent) { + console.log('Server closed :('); + clearInterval(pingInterval); + reconnectSemaphore--; + setTimeout(function() { connect(); }, reconnectTimeout); + socketWrapper.ondisconnect(); + }; + + socket.onopen = function(socketEvent) { + console.log('Connected to server!'); + pingInterval = setInterval(function() { + console.log("Sending server ping message."); + if (socket.readyState == socket.CLOSED || socket.readyState == socket.CLOSING) { + socket.close(); + socket.onclose(); + } else + socket.send(JSON.stringify({type: 2})); + }, reconnectTimeout / 2); + socketWrapper.onconnect(); + }; + + //TODO: wrap onmessage so that we reconnect on missing pong + socket.onmessage = function(response) { + try { + var message = JSON.parse(response.data); + } catch (e) { + console.log('Error parsing server JSON message: ' + response); + return; + } + + if (message.type == 3) + console.log("Got pong message"); + else if ((message.type === undefined && message.id !== undefined) || message.type === 4) + socketWrapper.onmessage(message); + else + console.log("Got invalid message from server: " + message); + }; + }; + connect(); + + return socketWrapper; + } + + self.getMessageWebsocket = function() { + return getWebsocket(URL_CALLS['push'], true, 60000); + } + + self.getTempWebsocket = function() { + //XXX + var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} }; + setTimeout(function() { + socketWrapper.onmessage({type: 4, message: "404-42-magic"}); + }, 1000); + return socketWrapper; + //return getWebsocket(URL_CALLS['temp_push'], false, 5000); } return self; diff --git a/js/crypto.js b/js/crypto.js index 66656eeb..eceabc3d 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -110,9 +110,13 @@ window.textsecure.crypto = function() { ***************************/ var crypto_storage = {}; + crypto_storage.putKeyPair = function(keyName, keyPair) { + textsecure.storage.putEncrypted("25519Key" + keyName, keyPair); + } + crypto_storage.getNewStoredKeyPair = function(keyName, isIdentity) { return createNewKeyPair(isIdentity).then(function(keyPair) { - textsecure.storage.putEncrypted("25519Key" + keyName, keyPair); + crypto_storage.putKeyPair(keyName, keyPair); return keyPair; }); } @@ -736,10 +740,10 @@ window.textsecure.crypto = function() { var iv = decodedMessage.slice(1, 1 + 16); var ciphertext = decodedMessage.slice(1 + 16, decodedMessage.byteLength - 10); - var ivAndCiphertext = decodedMessage.slice(1, decodedMessage.byteLength - 10); + var ivAndCiphertext = decodedMessage.slice(0, decodedMessage.byteLength - 10); var mac = decodedMessage.slice(decodedMessage.byteLength - 10, decodedMessage.byteLength); - return verifyMACWithVersionByte(ivAndCiphertext, mac_key, mac).then(function() { + return verifyMAC(ivAndCiphertext, mac_key, mac).then(function() { return window.crypto.subtle.decrypt({name: "AES-CBC", iv: iv}, aes_key, ciphertext); }); }; @@ -935,6 +939,47 @@ window.textsecure.crypto = function() { self.Ed25519Verify = Ed25519Verify; + self.prepareTempWebsocket = function() { + var socketInfo = {}; + var keyPair; + + socketInfo.decryptAndHandleDeviceInit = function(deviceInit) { + var masterEphemeral = toArrayBuffer(deviceInit.masterEphemeralPubKey); + var message = toArrayBuffer(deviceInit.identityKeyMessage); + + return ECDHE(masterEphemeral, keyPair.privKey).then(function(ecRes) { + return HKDF(ecRes, masterEphemeral, "WhisperDeviceInit").then(function(keys) { + if (new Uint8Array(message)[0] != (3 << 4) | 3) + throw new Error("Bad version number on IdentityKeyMessage"); + + var iv = message.slice(1, 16 + 1); + var mac = message.slice(message.length - 32, message.length); + var ivAndCiphertext = message.slice(0, message.length - 32); + var ciphertext = message.slice(16 + 1, message.length - 32); + + return verifyMAC(ivAndCiphertext, ecRes[1], mac).then(function() { + window.crypto.subtle.decrypt({name: "AES-CBC", iv: iv}, ecRes[0], ciphertext).then(function(plaintext) { + var identityKeyMsg = textsecure.protos.decodeIdentityKeyProtobuf(getString(plaintext)); + + privToPub(toArrayBuffer(identityKeyMsg.identityKey)).then(function(identityKeyPair) { + crypto_storage.putKeyPair("identityKey", identityKeyPair); + identityKeyMsg.identityKey = null; + + return identityKeyMsg; + }); + }); + }); + }); + }); + } + + return createNewKeyPair(false).then(function(newKeyPair) { + keyPair = newKeyPair; + socketInfo.pubKey = keyPair.pubKey; + return socketInfo; + }); + } + self.testing_only = testing_only; return self; }(); diff --git a/js/helpers.js b/js/helpers.js index 8f276461..9d5b5770 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -195,9 +195,19 @@ window.textsecure.protos = function() { return self.PreKeyWhisperMessageProtobuf.decode(btoa(string)); } - self.KeyExchangeMessageProtobuf = dcodeIO.ProtoBuf.loadProtoFile("protos/WhisperTextProtocol.proto").build("textsecure.KeyExchangeMessage"); - self.decodeKeyExchangeMessageProtobuf = function(string) { - return self.KeyExchangeMessageProtobuf.decode(btoa(string)); + self.DeviceInitProtobuf = dcodeIO.ProtoBuf.loadProtoFile("protos/DeviceMessages.proto").build("textsecure.DeviceInit"); + self.decodeDeviceInitProtobuf = function(string) { + return self.DeviceInitProtobuf.decode(btoa(string)); + } + + self.IdentityKeyProtobuf = dcodeIO.ProtoBuf.loadProtoFile("protos/DeviceMessages.proto").build("textsecure.IdentityKey"); + self.decodeIdentityKeyProtobuf = function(string) { + return self.IdentityKeyProtobuf.decode(btoa(string)); + } + + self.DeviceControlProtobuf = dcodeIO.ProtoBuf.loadProtoFile("protos/DeviceMessages.proto").build("textsecure.DeviceControl"); + self.decodeDeviceControlProtobuf = function(string) { + return self.DeviceControlProtobuf.decode(btoa(string)); } return self; @@ -635,154 +645,109 @@ window.textsecure.replay = function() { }(); // message_callback({message: decryptedMessage, pushMessage: server-providedPushMessage}) -window.textsecure.subscribeToPush = function() { - var subscribeToPushMessageSemaphore = 0; - return function(message_callback) { - subscribeToPushMessageSemaphore++; - if (subscribeToPushMessageSemaphore <= 0) - return; +window.textsecure.subscribeToPush = function(message_callback) { + var socket = textsecure.api.getMessageWebsocket(); - var socket = textsecure.api.getWebsocket(); + socket.onmessage = function(message) { + textsecure.crypto.decryptWebsocketMessage(message.message).then(function(plaintext) { + var proto = textsecure.protos.decodeIncomingPushMessageProtobuf(getString(plaintext)); + // After this point, a) decoding errors are not the server's fault, and + // b) we should handle them gracefully and tell the user they received an invalid message + console.log("Successfully decoded message with id: " + message.id); + socket.send(JSON.stringify({type: 1, id: message.id})); + return textsecure.crypto.handleIncomingPushMessageProto(proto).then(function(decrypted) { + // Now that its decrypted, validate the message and clean it up for consumer processing + // Note that messages may (generally) only perform one action and we ignore remaining fields + // after the first action. - var pingInterval; + if (decrypted.flags == null) + decrypted.flags = 0; - //TODO: GUI - socket.onerror = function(socketEvent) { - console.log('Server is down :('); - clearInterval(pingInterval); - subscribeToPushMessageSemaphore--; - setTimeout(function() { textsecure.subscribeToPush(message_callback); }, 60000); - }; - socket.onclose = function(socketEvent) { - console.log('Server closed :('); - clearInterval(pingInterval); - subscribeToPushMessageSemaphore--; - setTimeout(function() { textsecure.subscribeToPush(message_callback); }, 60000); - }; - socket.onopen = function(socketEvent) { - console.log('Connected to server!'); - pingInterval = setInterval(function() { - console.log("Sending server ping message."); - if (socket.readyState == socket.CLOSED || socket.readyState == socket.CLOSING) { - socket.close(); - socket.onclose(); - } else - socket.send(JSON.stringify({type: 2})); - }, 30000); - }; + if ((decrypted.flags & textsecure.protos.PushMessageContentProtobuf.Flags.END_SESSION) + == textsecure.protos.PushMessageContentProtobuf.Flags.END_SESSION) + return; + if (decrypted.flags != 0) + throw new Error("Unknown flags in message"); - socket.onmessage = function(response) { - try { - var message = JSON.parse(response.data); - } catch (e) { - console.log('Error parsing server JSON message: ' + response.responseBody.split("|")[1]); - return; - } - - if (message.type == 3) { - console.log("Got pong message"); - } else if (message.type === undefined && message.id !== undefined) { - textsecure.crypto.decryptWebsocketMessage(message.message).then(function(plaintext) { - var proto = textsecure.protos.decodeIncomingPushMessageProtobuf(getString(plaintext)); - // After this point, a) decoding errors are not the server's fault, and - // b) we should handle them gracefully and tell the user they received an invalid message - console.log("Successfully decoded message with id: " + message.id); - socket.send(JSON.stringify({type: 1, id: message.id})); - return textsecure.crypto.handleIncomingPushMessageProto(proto).then(function(decrypted) { - // Now that its decrypted, validate the message and clean it up for consumer processing - // Note that messages may (generally) only perform one action and we ignore remaining fields - // after the first action. - - if (decrypted.flags == null) - decrypted.flags = 0; - - if ((decrypted.flags & textsecure.protos.PushMessageContentProtobuf.Flags.END_SESSION) - == textsecure.protos.PushMessageContentProtobuf.Flags.END_SESSION) - return; - if (decrypted.flags != 0) - throw new Error("Unknown flags in message"); - - var handleAttachment = function(attachment) { - return textsecure.api.getAttachment(attachment.id).then(function(encryptedBin) { - return textsecure.crypto.decryptAttachment(encryptedBin, toArrayBuffer(attachment.key)).then(function(decryptedBin) { - attachment.decrypted = decryptedBin; - }); - }); - }; - - var promises = []; - - if (decrypted.group !== null) { - var existingGroup = textsecure.storage.groups.getNumbers(decrypted.group.id); - if (existingGroup === undefined) { - if (decrypted.group.type != textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE) - throw new Error("Got message for unknown group"); - textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id); - } else { - var fromIndex = existingGroup.indexOf(proto.source); - - if (fromIndex < 0) //TODO: This could be indication of a race... - throw new Error("Sender was not a member of the group they were sending from"); - - switch(decrypted.group.type) { - case textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE: - if (decrypted.group.avatar !== null) - promises.push(handleAttachment(decrypted.group.avatar)); - - if (existingGroup.filter(function(number) { decrypted.group.members.indexOf(number) < 0 }).length != 0) - throw new Error("Attempted to remove numbers from group with an UPDATE"); - decrypted.group.added = decrypted.group.members.filter(function(number) { return existingGroup.indexOf(number) < 0; }); - - var newGroup = textsecure.storage.groups.addNumbers(decrypted.group.id, decrypted.group.added); - if (newGroup.length != decrypted.group.members.length || - newGroup.filter(function(number) { return decrypted.group.members.indexOf(number) < 0; }).length != 0) - throw new Error("Error calculating group member difference"); - - //TODO: Also follow this path if avatar + name haven't changed (ie we should start storing those) - if (decrypted.group.avatar === null && decrypted.group.added.length == 0 && decrypted.group.name === null) - return; - - //TODO: Strictly verify all numbers (ie dont let verifyNumber do any user-magic tweaking) - - decrypted.body = null; - decrypted.attachments = []; - - break; - case textsecure.protos.PushMessageContentProtobuf.GroupContext.QUIT: - textsecure.storage.groups.removeNumber(decrypted.group.id, proto.source); - - decrypted.body = null; - decrypted.attachments = []; - case textsecure.protos.PushMessageContentProtobuf.GroupContext.DELIVER: - decrypted.group.name = null; - decrypted.group.members = []; - decrypted.group.avatar = null; - - break; - default: - throw new Error("Unknown group message type"); - } - } - } - - for (var i in decrypted.attachments) - promises.push(handleAttachment(decrypted.attachments[i])); - return Promise.all(promises).then(function() { - message_callback({pushMessage: proto, message: decrypted}); + var handleAttachment = function(attachment) { + return textsecure.api.getAttachment(attachment.id).then(function(encryptedBin) { + return textsecure.crypto.decryptAttachment(encryptedBin, toArrayBuffer(attachment.key)).then(function(decryptedBin) { + attachment.decrypted = decryptedBin; }); - }) - }).catch(function(e) { - // TODO: Show "Invalid message" messages? - console.log("Error handling incoming message: "); - console.log(e); - }); - } - }; - } -}(); + }); + }; -window.textsecure.register = function() { - return function(number, verificationCode, singleDevice, stepDone) { + var promises = []; + + if (decrypted.group !== null) { + var existingGroup = textsecure.storage.groups.getNumbers(decrypted.group.id); + if (existingGroup === undefined) { + if (decrypted.group.type != textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE) + throw new Error("Got message for unknown group"); + textsecure.storage.groups.createNewGroup(decrypted.group.members, decrypted.group.id); + } else { + var fromIndex = existingGroup.indexOf(proto.source); + + if (fromIndex < 0) //TODO: This could be indication of a race... + throw new Error("Sender was not a member of the group they were sending from"); + + switch(decrypted.group.type) { + case textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE: + if (decrypted.group.avatar !== null) + promises.push(handleAttachment(decrypted.group.avatar)); + + if (existingGroup.filter(function(number) { decrypted.group.members.indexOf(number) < 0 }).length != 0) + throw new Error("Attempted to remove numbers from group with an UPDATE"); + decrypted.group.added = decrypted.group.members.filter(function(number) { return existingGroup.indexOf(number) < 0; }); + + var newGroup = textsecure.storage.groups.addNumbers(decrypted.group.id, decrypted.group.added); + if (newGroup.length != decrypted.group.members.length || + newGroup.filter(function(number) { return decrypted.group.members.indexOf(number) < 0; }).length != 0) + throw new Error("Error calculating group member difference"); + + //TODO: Also follow this path if avatar + name haven't changed (ie we should start storing those) + if (decrypted.group.avatar === null && decrypted.group.added.length == 0 && decrypted.group.name === null) + return; + + //TODO: Strictly verify all numbers (ie dont let verifyNumber do any user-magic tweaking) + + decrypted.body = null; + decrypted.attachments = []; + + break; + case textsecure.protos.PushMessageContentProtobuf.GroupContext.QUIT: + textsecure.storage.groups.removeNumber(decrypted.group.id, proto.source); + + decrypted.body = null; + decrypted.attachments = []; + case textsecure.protos.PushMessageContentProtobuf.GroupContext.DELIVER: + decrypted.group.name = null; + decrypted.group.members = []; + decrypted.group.avatar = null; + + break; + default: + throw new Error("Unknown group message type"); + } + } + } + + for (var i in decrypted.attachments) + promises.push(handleAttachment(decrypted.attachments[i])); + return Promise.all(promises).then(function() { + message_callback({pushMessage: proto, message: decrypted}); + }); + }) + }).catch(function(e) { + // TODO: Show "Invalid message" messages? + console.log("Error handling incoming message: "); + console.log(e); + }); + }; +}; + +window.textsecure.registerSingleDevice = function() { + return function(number, verificationCode, stepDone) { var signalingKey = textsecure.crypto.getRandomBytes(32 + 20); textsecure.storage.putEncrypted('signaling_key', signalingKey); @@ -794,25 +759,55 @@ window.textsecure.register = function() { registrationId = registrationId & 0x3fff; textsecure.storage.putUnencrypted("registrationId", registrationId); - return textsecure.api.confirmCode(number, verificationCode, password, signalingKey, registrationId, singleDevice).then(function(response) { - if (singleDevice) - response = 1; - var numberId = number + "." + response; + return textsecure.api.confirmCode(number, verificationCode, password, signalingKey, registrationId, true).then(function() { + var numberId = number + ".1"; textsecure.storage.putUnencrypted("number_id", numberId); textsecure.storage.putUnencrypted("regionCode", textsecure.utils.getRegionCodeForNumber(number)); stepDone(1); - if (!singleDevice) { - //TODO: Do things??? - stepDone(2); - } - return textsecure.crypto.generateKeys().then(function(keys) { - stepDone(3); + stepDone(2); return textsecure.api.registerKeys(keys).then(function() { - stepDone(4); + stepDone(3); }); }); }); } }(); + +window.textsecure.registerSecondDevice = function(encodedDeviceInit, cryptoInfo, stepDone) { + var deviceInit = textsecure.protos.decodeDeviceInit(encodedDeviceInit); + return cryptoInfo.decryptAndHandleDeviceInit(deviceInit).then(function(identityKey) { + if (identityKey.server != textsecure.api.relay) + throw new Error("Unknown relay used by master"); + var number = identityKey.phoneNumber; + + stepDone(1); + + var signalingKey = textsecure.crypto.getRandomBytes(32 + 20); + textsecure.storage.putEncrypted('signaling_key', signalingKey); + + var password = btoa(getString(textsecure.crypto.getRandomBytes(16))); + password = password.substring(0, password.length - 2); + textsecure.storage.putEncrypted("password", password); + + var registrationId = new Uint16Array(textsecure.crypto.getRandomBytes(2))[0]; + registrationId = registrationId & 0x3fff; + textsecure.storage.putUnencrypted("registrationId", registrationId); + + return textsecure.api.confirmCode(number, identityKey.provisioningCode, password, signalingKey, registrationId, false).then(function(result) { + var numberId = number + "." + result; + textsecure.storage.putUnencrypted("number_id", numberId); + textsecure.storage.putUnencrypted("regionCode", textsecure.utils.getRegionCodeForNumber(number)); + stepDone(2); + + return textsecure.crypto.generateKeys().then(function(keys) { + stepDone(3); + return textsecure.api.registerKeys(keys).then(function() { + stepDone(4); + //TODO: Send DeviceControl.NEW_DEVICE_REGISTERED to all other devices + }); + }); + }); + }); +}; diff --git a/js/options.js b/js/options.js index 3d4ee4c7..f203f476 100644 --- a/js/options.js +++ b/js/options.js @@ -73,26 +73,23 @@ $('#init-go').click(function() { return; } - $('#init-setup').hide(); - $('#verify1done').text(''); - $('#verify2').hide(); + $('#verify1').hide(); + $('#verify2done').text(''); $('#verify3done').text(''); $('#verify4done').text(''); + $('#verify5').hide(); $('#verify').show(); - textsecure.register(parsedNumber, $('#code').val(), single_device, function(step) { + textsecure.registerSingleDevice(parsedNumber, $('#code').val(), function(step) { switch(step) { case 1: - $('#verify1done').text('done'); - break; - case 2: $('#verify2done').text('done'); break; - case 3: + case 2: $('#verify3done').text('done'); break; - case 4: + case 3: $('#complete-number').text(parsedNumber); $('#verify').hide(); $('#setup-complete').show(); @@ -136,6 +133,61 @@ textsecure.registerOnLoadFunction(function() { $('#regionCode').val(textsecure.utils.getRegionCodeForCountryCode($('#countrycode').val())); updateNumberColors(); + textsecure.crypto.prepareTempWebsocket().then(function(cryptoInfo) { + var qrCode = new QRCode(document.getElementById('setup-qr')); + var socket = textsecure.api.getTempWebsocket(); + + socket.onmessage = function(message) { + //TODO: Get a server format for this + if (message.type === 4) { + qrCode.makeCode('textsecure-device-init:/' + + '?channel_uuid=' + message.message + + '&channel_server=' + textsecure.api.relay + + '&publicKey=' + btoa(getString(cryptoInfo.publicKey))); + $('img').removeAttr('style'); + $('#left-connecting').hide(); + $('#left-setup').show(); + $('#left-reconnecting').hide(); + } else { + $('#init-setup').hide(); + $('#verify1done').text(''); + $('#verify2done').text(''); + $('#verify3done').text(''); + $('#verify4done').text(''); + $('#verify5done').text(''); + $('#verify').show(); + + + textsecure.registerSecondDevice(cryptoInfo, message.message, function(step) { + switch(step) { + case 1: + $('#verify1done').text('done'); + break; + case 2: + $('#verify2done').text('done'); + break; + case 3: + $('#verify3done').text('done'); + break; + case 4: + //TODO: User needs to verify number before we continue + $('#complete-number').text(parsedNumber); + $('#verify4done').text('done'); + case 5: + $('#verify').hide(); + $('#setup-complete').show(); + registrationDone(); + } + }); + } + }; + + socket.ondisconnect = function() { + $('#left-connecting').hide(); + $('#left-setup').hide(); + $('#left-reconnecting').show(); + }; + }); } else { $('#complete-number').text(textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]);//TODO: no $('#setup-complete').show(); diff --git a/options.html b/options.html index 08ddeacf..330480ac 100644 --- a/options.html +++ b/options.html @@ -27,23 +27,38 @@

TextSecure