dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added sound notification support and forward secery setting finished

Browse source
This commit is contained in:
Kevin Froman 2020-02-17 06:13:57 -06:00
parent 23782dcb8f
commit aea4815fbd
11 changed files with 76 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/httpapi/insertblock.py
View file

@ -1,9 +1,17 @@
'''
Onionr - Private P2P Communication
"""Onionr - Private P2P Communication.
Create blocks with the client api server
'''
'''
Create blocks with the client api server
"""
import json
import threading
from flask import Blueprint, Response, request, g
import onionrblocks
from onionrcrypto import hashers
from onionrutils import bytesconverter
from onionrutils import mnemonickeys
from onionrtypes import JSONSerializable
"""
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@ -16,20 +24,15 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
'''
import json, threading
from flask import Blueprint, Response, request, g
import onionrblocks
from onionrcrypto import hashers
from onionrutils import bytesconverter
from onionrutils import mnemonickeys
"""
ib = Blueprint('insertblock', __name__)
@ib.route('/insertblock', methods=['POST'])
def client_api_insert_block():
encrypt = False
bData = request.get_json(force=True)
message = bData['message']
encrypt: bool = False
insert_data: JSONSerializable = request.get_json(force=True)
message = insert_data['message']
message_hash = bytesconverter.bytes_to_str(hashers.sha3_hash(message))
# Detect if message (block body) is not specified
@ -37,40 +40,48 @@ def client_api_insert_block():
return 'failure due to unspecified message', 400
# Detect if block with same message is already being inserted
if message_hash in g.too_many.get_by_string("OnionrCommunicatorDaemon").generating_blocks:
if message_hash in g.too_many.get_by_string(
"OnionrCommunicatorDaemon").generating_blocks:
return 'failure due to duplicate insert', 400
else:
g.too_many.get_by_string("OnionrCommunicatorDaemon").generating_blocks.append(message_hash)
g.too_many.get_by_string(
"OnionrCommunicatorDaemon").generating_blocks.append(message_hash)
subject = 'temp'
encryptType = ''
encrypt_type = ''
sign = True
meta = {}
to = ''
try:
if bData['encrypt']:
to = bData['to'].strip()
if insert_data['encrypt']:
to = insert_data['to'].strip()
if "-" in to:
to = mnemonickeys.get_base32(to)
encrypt = True
encryptType = 'asym'
encrypt_type = 'asym'
except KeyError:
pass
try:
if not bData['sign']:
if not insert_data['sign']:
sign = False
except KeyError:
pass
try:
bType = bData['type']
bType = insert_data['type']
except KeyError:
bType = 'bin'
try:
meta = json.loads(bData['meta'])
meta = json.loads(insert_data['meta'])
except KeyError:
pass
try:
# The setting in the UI is for if forward secrecy is enabled, not disabled
disable_forward_secrecy = not insert_data['forward']
except KeyError:
disable_forward_secrecy = False
threading.Thread(
target=onionrblocks.insert, args=(message,),
kwargs={'header': bType, 'encryptType': encryptType,
'sign':sign, 'asymPeer': to, 'meta': meta, 'disableForward': bData['forward']}).start()
return Response('success')
kwargs={'header': bType, 'encryptType': encrypt_type,
'sign': sign, 'asymPeer': to, 'meta': meta,
'disableForward': disable_forward_secrecy}).start()
return Response('success')