diff --git a/onionr/api.py b/onionr/api.py index 1aaed6b5..306d8194 100755 --- a/onionr/api.py +++ b/onionr/api.py @@ -455,19 +455,31 @@ class API: @app.route('/getHumanReadable/') def getHumanReadable(name): return Response(self._core._utils.getHumanReadableID(name)) + + @app.route('/insertblock', methods=['POST']) + def insertBlock(): + bData = request.get_json(force=True) + message = bData['message'] + to = bData['to'] + subject = 'temp' + return Response(self._core.insertBlock(message, header='pm', encryptType='asym', sign=True, asymPeer=to, meta={'subject': subject})) - @app.route('/apipoints/') + @app.route('/apipoints/', methods=['POST', 'GET']) def pluginEndpoints(subpath=''): # TODO have a variable for the plugin to set data to that we can use for the response pluginResponseCode = str(uuid.uuid4()) resp = 'success' - responseTimeout = 5 + responseTimeout = 20 startTime = self._core._utils.getEpoch() + postData = {} + if request.method == 'POST': + postData = request.form['postData'] if len(subpath) > 1: data = subpath.split('/') if len(data) > 1: plName = data[0] - events.event('pluginRequest', {'name': plName, 'path': subpath, 'pluginResponse': pluginResponseCode}, onionr=onionrInst) + + events.event('pluginRequest', {'name': plName, 'path': subpath, 'pluginResponse': pluginResponseCode, 'postData': postData}, onionr=onionrInst) while True: try: resp = self.pluginResponses[pluginResponseCode] diff --git a/onionr/etc/pgpwords.py b/onionr/etc/pgpwords.py index 6183eba9..16aeda1c 100755 --- a/onionr/etc/pgpwords.py +++ b/onionr/etc/pgpwords.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- (because 0xFF, even : "Yucatán") -import os, re, sys +import os, re, sys, binascii, base64 _words = [ ["aardvark", "adroitness"], @@ -278,6 +278,22 @@ def wordify(seq): ret.append(_words[int(seq[i:i+2], 16)][(i//2)%2]) return ret +def hexify(seq, delim=' '): + ret = b'' + sentence = seq + try: + sentence = seq.split(delim) + except AttributeError: + pass + count = 0 + for word in sentence: + count = 0 + for wordPair in _words: + if word in wordPair: + ret += bytes([(count)]) + count += 1 + return binascii.hexlify(ret) + def usage(): print("Usage:") print(" {0} [fingerprint...]".format(os.path.basename(sys.argv[0]))) diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py index 85cfc441..655605fd 100755 --- a/onionr/onionrutils.py +++ b/onionr/onionrutils.py @@ -222,6 +222,10 @@ class OnionrUtils: pub = self._core._crypto.pubKey pub = base64.b16encode(base64.b32decode(pub)).decode() return ' '.join(pgpwords.wordify(pub)) + + def convertHumanReadableID(self, pub): + '''Convert a human readable pubkey id to base32''' + return base64.b32encode(binascii.unhexlify(pgpwords.hexify(pub))) def getBlockMetadataFromData(self, blockData): ''' diff --git a/onionr/static-data/default-plugins/pms/main.py b/onionr/static-data/default-plugins/pms/main.py index 099e442c..b393f6eb 100755 --- a/onionr/static-data/default-plugins/pms/main.py +++ b/onionr/static-data/default-plugins/pms/main.py @@ -290,11 +290,28 @@ class OnionrMail: return def on_pluginrequest(api, data=None): + resp = '' + subject = '' + recip = '' + message = '' + postData = {} + blockID = '' + sentboxTools = sentboxdb.SentBox(api.get_core()) if data['name'] == 'mail': path = data['path'] - if path.split('/')[1] == 'sentbox': - api.get_onionr().clientAPIInst.pluginResponses[data['pluginResponse']] = OnionrMail(api).get_sent_list(display=False) - return + cmd = path.split('/')[1] + if cmd == 'sentbox': + resp = OnionrMail(api).get_sent_list(display=False) + elif cmd == 'send': + print(data['postData']) + postData = json.loads(data['postData']) + message = postData['message'] + recip = postData['to'] + subject = 'temp' + blockID = api.get_core().insertBlock(message, header='pm', encryptType='asym', sign=True, asymPeer=recip, meta={'subject': subject}) + sentboxTools.addToSent(blockID, recip, message) + if resp != '': + api.get_onionr().clientAPIInst.pluginResponses[data['pluginResponse']] = resp def on_init(api, data = None): ''' diff --git a/onionr/static-data/www/mail/index.html b/onionr/static-data/www/mail/index.html index c2a2e74f..99f0dba0 100755 --- a/onionr/static-data/www/mail/index.html +++ b/onionr/static-data/www/mail/index.html @@ -45,15 +45,17 @@
- - To: - - +
+ + To: + + +
- + \ No newline at end of file diff --git a/onionr/static-data/www/mail/mail.js b/onionr/static-data/www/mail/mail.js index aba8f493..76fc9024 100755 --- a/onionr/static-data/www/mail/mail.js +++ b/onionr/static-data/www/mail/mail.js @@ -77,7 +77,9 @@ function loadInboxEntrys(bHash){ var humanDate = new Date(0) var metadata = resp['metadata'] humanDate.setUTCSeconds(resp['meta']['time']) - senderInput.value = httpGet('/getHumanReadable/' + resp['meta']['signer']) + if (resp['meta']['signer'] != ''){ + senderInput.value = httpGet('/getHumanReadable/' + resp['meta']['signer']) + } if (resp['meta']['validSig']){ validSig.innerText = 'Signature Validity: Good' } diff --git a/onionr/static-data/www/shared/base64.min.js b/onionr/static-data/www/shared/base64.min.js deleted file mode 100644 index 7b118f6c..00000000 --- a/onionr/static-data/www/shared/base64.min.js +++ /dev/null @@ -1,10 +0,0 @@ -/* - * 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}});