bug fixes

This commit is contained in:
Kevin Froman 2019-08-08 01:25:48 -05:00
parent ef01d3b577
commit 8c7319048d
7 changed files with 16 additions and 11 deletions

View File

@ -4,7 +4,7 @@ Onionr is created by a team of hard working volunteers.
In no order of importance, these people make Onionr happen: In no order of importance, these people make Onionr happen:
* [Beardog](https://www.chaoswebs.net/) - Project owner and core developer * [Beardog (Kevin Froman)](https://www.chaoswebs.net/) - Project owner and core developer
* [InvisaMage](https://invisamage.com/) - Web UI Bulma design * [InvisaMage](https://invisamage.com/) - Web UI Bulma design
* [Arinerron](https://arinerron.com/) - Logger and config modules, testing and other contributions * [Arinerron](https://arinerron.com/) - Logger and config modules, testing and other contributions
* [Anhar Ismail](https://github.com/anharismail) - Created Onionr's logo * [Anhar Ismail](https://github.com/anharismail) - Created Onionr's logo

View File

@ -130,6 +130,8 @@ Onionr Mail: TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ
No matter how good Onionr and other software gets, there will always be ways for clever or well-funded adversaries to break your security. No matter how good Onionr and other software gets, there will always be ways for clever or well-funded adversaries to break your security.
Onionr does not protect your identity if you associate your user ID with your name either on Onionr or elsewhere.
*Do not rely on Onionr or any other software to hold up if your life or liberty are at stake.* *Do not rely on Onionr or any other software to hold up if your life or liberty are at stake.*
### Licenses and Branding ### Licenses and Branding

View File

@ -22,6 +22,7 @@ import logger
from onionrutils import epoch, basicrequests from onionrutils import epoch, basicrequests
from coredb import keydb from coredb import keydb
from . import onlinepeers from . import onlinepeers
def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242880): def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242880):
'''Perform a get request to a peer''' '''Perform a get request to a peer'''
penalty_score = -10 penalty_score = -10
@ -29,9 +30,6 @@ def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242
return False return False
url = 'http://%s/%s' % (peer, action) url = 'http://%s/%s' % (peer, action)
# mark the time we're trying to request this peer
keydb.transportinfo.set_address_info(peer, 'lastConnectAttempt', epoch.get_epoch())
try: try:
ret_data = basicrequests.do_get_request(url, port=comm_inst.proxyPort, ret_data = basicrequests.do_get_request(url, port=comm_inst.proxyPort,
max_size=max_resp_size) max_size=max_resp_size)
@ -44,6 +42,7 @@ def peer_action(comm_inst, peer, action, returnHeaders=False, max_resp_size=5242
try: try:
comm_inst.getPeerProfileInstance(peer).addScore(penalty_score) comm_inst.getPeerProfileInstance(peer).addScore(penalty_score)
onlinepeers.remove_online_peer(comm_inst, peer) onlinepeers.remove_online_peer(comm_inst, peer)
keydb.transportinfo.set_address_info(peer, 'lastConnectAttempt', epoch.get_epoch())
if action != 'ping' and not comm_inst.shutdown: if action != 'ping' and not comm_inst.shutdown:
logger.warn('Lost connection to ' + peer, terminal=True) logger.warn('Lost connection to ' + peer, terminal=True)
onlinepeers.get_online_peers(comm_inst) # Will only add a new peer to pool if needed onlinepeers.get_online_peers(comm_inst) # Will only add a new peer to pool if needed

View File

@ -104,7 +104,10 @@ def daemon():
localcommand.local_command('shutdown') localcommand.local_command('shutdown')
net.killTor() net.killTor()
try:
time.sleep(5) # Time to allow threads to finish, if not any "daemon" threads will be slaughtered http://docs.python.org/library/threading.html#threading.Thread.daemon time.sleep(5) # Time to allow threads to finish, if not any "daemon" threads will be slaughtered http://docs.python.org/library/threading.html#threading.Thread.daemon
except KeyboardInterrupt:
pass
cleanup.delete_run_files() cleanup.delete_run_files()
def _ignore_sigint(sig, frame): def _ignore_sigint(sig, frame):

View File

@ -57,16 +57,15 @@ def on_processblocks(api, data=None):
if data['type'] != 'pm': if data['type'] != 'pm':
return return
data['block'].decrypt() data['block'].decrypt()
metadata = data['block'].bmetadata # Get the block metadata metadata = data['block'].bmetadata
signer = bytesconverter.bytes_to_str(data['block'].signer) signer = bytesconverter.bytes_to_str(data['block'].signer)
user = contactmanager.ContactManager(signer, saveUser=False) user = contactmanager.ContactManager(signer, saveUser=False)
name = user.get_info("name") name = user.get_info("name")
if name != 'anonymous': if name != 'anonymous' and name != None:
signer = name.title() signer = name.title()
else: else:
signer = signer[:5] signer = signer[:5]
if data['block'].decrypted: if data['block'].decrypted:
notifier.notify(title="Onionr Mail - New Message", notifier.notify(title="Onionr Mail - New Message", message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))
message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))

View File

@ -56,7 +56,6 @@
</div> </div>
<div class="column is-7"> <div class="column is-7">
<div class="field"> <div class="field">
<label class="label">Open Site</label>
<div class="field has-addons"> <div class="field has-addons">
<p class="control"> <p class="control">
<a class="button is-static">Identity</a> <a class="button is-static">Identity</a>

View File

@ -322,6 +322,9 @@ function showSentboxWindow(to, content){
} }
function refreshPms(callNext){ function refreshPms(callNext){
if (threadPart.innerText.includes("¯\\_(ツ)_/¯")){
threadPart.innerText = ""
}
if (! window.inboxActive){ if (! window.inboxActive){
return return
} }