diff --git a/onionr/api.py b/onionr/api.py index be793772..69f775c7 100755 --- a/onionr/api.py +++ b/onionr/api.py @@ -355,12 +355,13 @@ class API: blocks = self._core.getBlocksByType(name) return Response(','.join(blocks)) - @app.route('/gethtmlsafeblockdata/') - def getSafeData(name): + @app.route('/getblockbody/') + def getBlockBodyData(name): resp = '' if self._core._utils.validateHash(name): try: - resp = cgi.escape(Block(name).bcontent, quote=True) + resp = Block(name, decrypt=True).bcontent + #resp = cgi.escape(Block(name, decrypt=True).bcontent, quote=True) except TypeError: pass else: @@ -382,6 +383,11 @@ class API: abort(404) return Response(resp) + @app.route('/getblockheader/') + def getBlockHeader(name): + resp = self.getBlockData(name, decrypt=True, headerOnly=True) + return Response(resp) + @app.route('/site/', endpoint='site') def site(name): bHash = name @@ -475,7 +481,8 @@ class API: # Don't error on race condition with startup pass - def getBlockData(self, bHash, decrypt=False, raw=False): + def getBlockData(self, bHash, decrypt=False, raw=False, headerOnly=False): + assert self._core._utils.validateHash(bHash) bl = Block(bHash, core=self._core) if decrypt: bl.decrypt() @@ -483,12 +490,16 @@ class API: raise ValueError if not raw: - retData = {'meta':bl.bheader, 'metadata': bl.bmetadata, 'content': bl.bcontent} - for x in list(retData.keys()): - try: - retData[x] = retData[x].decode() - except AttributeError: - pass + if not headerOnly: + retData = {'meta':bl.bheader, 'metadata': bl.bmetadata, 'content': bl.bcontent} + for x in list(retData.keys()): + try: + retData[x] = retData[x].decode() + except AttributeError: + pass + else: + bl.bheader['meta'] = '' + retData = {'meta': bl.bheader, 'metadata': bl.bmetadata} return json.dumps(retData) else: return bl.raw diff --git a/onionr/static-data/www/mail/index.html b/onionr/static-data/www/mail/index.html index 2723677a..dc7e6c65 100755 --- a/onionr/static-data/www/mail/index.html +++ b/onionr/static-data/www/mail/index.html @@ -5,6 +5,7 @@ Onionr Mail + @@ -23,7 +24,9 @@
Nothing here yet 😞
+
+ diff --git a/onionr/static-data/www/mail/mail.css b/onionr/static-data/www/mail/mail.css index 50b86b49..fc39509b 100755 --- a/onionr/static-data/www/mail/mail.css +++ b/onionr/static-data/www/mail/mail.css @@ -3,7 +3,7 @@ } .threads div span{ padding-left: 0.1em; - padding-right: 0.1em; + padding-right: 0.2em; } #threadPlaceholder{ diff --git a/onionr/static-data/www/mail/mail.js b/onionr/static-data/www/mail/mail.js index 8199e35f..5f26f694 100755 --- a/onionr/static-data/www/mail/mail.js +++ b/onionr/static-data/www/mail/mail.js @@ -21,9 +21,16 @@ pms = '' threadPart = document.getElementById('threads') threadPlaceholder = document.getElementById('threadPlaceholder') tabBtns = document.getElementById('tabBtns') - +threadContent = {} myPub = httpGet('/getActivePubkey') +function openThread(bHash, sender, date){ + var messageDisplay = document.getElementById('threadDisplay') + stuff = httpGet('/getblockbody/' + bHash) + messageDisplay.innerText = stuff + overlay('messageDisplay') +} + function setActiveTab(tabName){ threadPart.innerHTML = "" switch(tabName){ @@ -42,8 +49,52 @@ function setActiveTab(tabName){ } } +function loadInboxEntrys(bHash){ + fetch('/getblockheader/' + bHash, { + headers: { + "token": webpass + }}) + .then((resp) => resp.json()) // Transform the data into json + .then(function(resp) { + console.log(resp) + var entry = document.createElement('div') + var bHashDisplay = document.createElement('span') + var senderInput = document.createElement('input') + var subjectLine = document.createElement('span') + var dateStr = document.createElement('span') + var humanDate = new Date(0) + var metadata = resp['metadata'] + humanDate.setUTCSeconds(resp['meta']['time']) + senderInput.value = httpGet('/getHumanReadable/' + resp['meta']['signer']) + bHashDisplay.innerText = bHash.substring(0, 10) + entry.setAttribute('hash', bHash); + senderInput.readOnly = true + dateStr.innerText = humanDate.toString() + if (metadata['subject'] === undefined || metadata['subject'] === null) { + subjectLine.innerText = '()' + } + else{ + subjectLine.innerText = '(' + metadata['subject'] + ')' + } + //entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time'] + threadPart.appendChild(entry) + entry.appendChild(bHashDisplay) + entry.appendChild(senderInput) + entry.appendChild(subjectLine) + entry.appendChild(dateStr) + entry.classList.add('threadEntry') + + entry.onclick = function(){ + openThread(entry.getAttribute('hash'), senderInput.value, dateStr.innerText) + } + + }.bind(bHash)) +} + + function getInbox(){ var showed = false + var requested = '' for(var i = 0; i < pms.length; i++) { if (pms[i].trim().length == 0){ continue @@ -52,40 +103,7 @@ function getInbox(){ threadPlaceholder.style.display = 'none' showed = true } - fetch('/getblockdata/' + pms[i], { - headers: { - "token": webpass - }}) - .then((resp) => resp.json()) // Transform the data into json - .then(function(resp) { - - var entry = document.createElement('div') - - var bHashDisplay = document.createElement('span') - var senderInput = document.createElement('input') - var subjectLine = document.createElement('span') - var dateStr = document.createElement('span') - var humanDate = new Date(0) - humanDate.setUTCSeconds(resp['meta']['time']) - senderInput.value = httpGet('/getHumanReadable/' + resp['meta']['signer']) - bHashDisplay.innerText = pms[i - 1].substring(0, 10) - bHashDisplay.setAttribute('hash', pms[i - 1]); - senderInput.readOnly = true - dateStr.innerText = humanDate.toString() - if (resp['metadata']['subject'] === undefined || resp['metadata']['subject'] === null) { - subjectLine.innerText = '()' - } - else{ - subjectLine.innerText = '(' + resp['metadata']['subject'] + ')' - } - //entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time'] - threadPart.appendChild(entry) - //entry.appendChild(bHashDisplay) - entry.appendChild(senderInput) - entry.appendChild(subjectLine) - entry.appendChild(dateStr) - - }.bind([pms, i])) + loadInboxEntrys(pms[i]) } if (! showed){ threadPlaceholder.style.display = 'block' @@ -93,7 +111,6 @@ function getInbox(){ } - fetch('/getblocksbytype/pm', { headers: { "token": webpass @@ -114,7 +131,6 @@ tabBtns.onclick = function(event){ setActiveTab(event.target.innerText.toLowerCase()) } - var idStrings = document.getElementsByClassName('myPub') var myHumanReadable = httpGet('/getHumanReadable/' + myPub) for (var i = 0; i < idStrings.length; i++){ diff --git a/onionr/static-data/www/shared/base64.min.js b/onionr/static-data/www/shared/base64.min.js new file mode 100644 index 00000000..7b118f6c --- /dev/null +++ b/onionr/static-data/www/shared/base64.min.js @@ -0,0 +1,10 @@ +/* + * base64.js + * + * Licensed under the BSD 3-Clause License. + * http://opensource.org/licenses/BSD-3-Clause + * + * References: + * http://en.wikipedia.org/wiki/Base64 + */ +(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory(global):typeof define==="function"&&define.amd?define(factory):factory(global)})(typeof self!=="undefined"?self:typeof window!=="undefined"?window:typeof global!=="undefined"?global:this,function(global){"use strict";global=global||{};var _Base64=global.Base64;var version="2.5.1";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=eval("require('buffer').Buffer")}catch(err){buffer=undefined}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(u){return(u.constructor===buffer.constructor?u:buffer.from(u)).toString("base64")}:function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var _atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/\S{1,4}/g,cb_decode)};var atob=function(a){return _atob(String(a).replace(/[^A-Za-z0-9\+\/]/g,""))};var _decode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(a){return(a.constructor===buffer.constructor?a:buffer.from(a,"base64")).toString()}:function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}:function(a){return btou(_atob(a))};var decode=function(a){return _decode(String(a).replace(/[-_]/g,function(m0){return m0=="-"?"+":"/"}).replace(/[^A-Za-z0-9\+\/]/g,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict,__buffer__:buffer};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}if(typeof module!=="undefined"&&module.exports){module.exports.Base64=global.Base64}else if(typeof define==="function"&&define.amd){define([],function(){return global.Base64})}return{Base64:global.Base64}}); diff --git a/onionr/static-data/www/shared/main/style.css b/onionr/static-data/www/shared/main/style.css index d2ff44e3..0c220f40 100755 --- a/onionr/static-data/www/shared/main/style.css +++ b/onionr/static-data/www/shared/main/style.css @@ -137,4 +137,5 @@ body{ text-align:center; z-index: 1000; background-color: black; + color: white; } diff --git a/onionr/static-data/www/shared/misc.js b/onionr/static-data/www/shared/misc.js index c9b3790e..10c1e129 100755 --- a/onionr/static-data/www/shared/misc.js +++ b/onionr/static-data/www/shared/misc.js @@ -1,5 +1,6 @@ webpass = document.location.hash.replace('#', '') nowebpass = false + if (typeof webpass == "undefined"){ webpass = localStorage['webpass'] } @@ -12,6 +13,10 @@ if (typeof webpass == "undefined" || webpass == ""){ nowebpass = true } +function arrayContains(needle, arrhaystack) { + return (arrhaystack.indexOf(needle) > -1); +} + function httpGet(theUrl) { var xmlHttp = new XMLHttpRequest() xmlHttp.open( "GET", theUrl, false ) // false for synchronous request