kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

proof of work adjustments, bugfixes, added connection check url

Browse Source
This commit is contained in:
Kevin Froman 2019-02-07 12:12:04 -06:00
parent 0e3fb41912
commit b038d758b9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionr/api.py
View File

@ -294,8 +294,10 @@ class API:
@app.after_request
def afterReq(resp):
#resp.headers["Content-Security-Policy"] = "default-src 'none'; script-src 'none'; object-src 'none'; style-src data: 'unsafe-inline'; img-src data:; media-src 'none'; frame-src 'none'; font-src 'none'; connect-src 'none'"
resp.headers['Content-Security-Policy'] = "default-src 'none'; script-src 'self'; object-src 'none'; style-src 'self'; img-src 'self'; media-src 'none'; frame-src 'none'; font-src 'none'; connect-src 'self'"
if request.endpoint == 'site':
resp.headers['Content-Security-Policy'] = "default-src 'none'; style-src data: 'unsafe-inline'; img-src data:"
else:
resp.headers['Content-Security-Policy'] = "default-src 'none'; script-src 'self'; object-src 'none'; style-src 'self'; img-src 'self'; media-src 'none'; frame-src 'none'; font-src 'none'; connect-src 'self'"
resp.headers['X-Frame-Options'] = 'deny'
resp.headers['X-Content-Type-Options'] = "nosniff"
resp.headers['X-API'] = onionr.API_VERSION

5
onionr/communicator.py
View File

@ -269,10 +269,7 @@ class OnionrCommunicatorDaemon:
content = content.encode()
except AttributeError:
pass
try:
content = base64.b64decode(content) # content is base64 encoded in transport
except binascii.Error:
pass
realHash = self._core._crypto.sha3Hash(content)
try:
realHash = realHash.decode() # bytes on some versions for some reason

3
onionr/onionr.py
View File

@ -1002,7 +1002,8 @@ class Onionr:
try:
with open(filename, 'rb') as singleFile:
blockhash = self.onionrCore.insertBlock(base64.b64encode(singleFile.read()), header=blockType)
logger.info('File %s saved in block %s' % (filename, blockhash))
if len(blockhash) > 0:
logger.info('File %s saved in block %s' % (filename, blockhash))
except:
logger.error('Failed to save file in block.', timestamp = False)
else:

6
onionr/onionrproofs.py
View File

@ -41,9 +41,9 @@ def getDifficultyModifier(coreOrUtilsInst=None):
if percentUse >= 0.50:
retData += 1
elif percentUse >= 0.75:
retData += 2
retData += 2
elif percentUse >= 0.95:
retData += 3
retData += 3
return retData
@ -68,7 +68,7 @@ def getDifficultyForNewBlock(data, ourBlock=True):
else:
minDifficulty = config.get('general.minimum_block_pow')
retData = max(minDifficulty, math.floor(dataSize / 1000000)) + getDifficultyModifier()
retData = max(minDifficulty, math.floor(dataSize / 100000)) + getDifficultyModifier()
return retData
def getHashDifficulty(h):

2
onionr/static-data/connect-check.txt
View File

@ -1 +1 @@
https://3g2upl4pq6kufc4m.onion/robots.txt,http://expyuzz4wqqyqhjn.onion/robots.txt,https://onionr.voidnet.tech/
https://3g2upl4pq6kufc4m.onion/robots.txt,http://expyuzz4wqqyqhjn.onion/robots.txt,http://archivecaslytosk.onion/robots.txt

4
onionr/static-data/default_config.json
View File

@ -2,8 +2,8 @@
"general" : {
"dev_mode" : true,
"display_header" : false,
"minimum_block_pow": 1,
"minimum_send_pow": 1,
"minimum_block_pow": 4,
"minimum_send_pow": 4,
"socket_servers": false,
"security_level": 0,
"max_block_age": 2678400,