mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

digest of sha256

master
Bob Mottram 2019-07-25 17:50:48 +01:00
parent 8572c235f1
commit 1c02b79f15
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon.py
View File

@ -487,9 +487,7 @@ class PubServer(BaseHTTPRequestHandler):
if currTimeGET-self.server.lastGET<10: if currTimeGET-self.server.lastGET<10:
if self.server.debug: if self.server.debug:
print('DEBUG: GET Busy') print('DEBUG: GET Busy')
self.send_response(429) self.send_response(429)
if authorized:
self.send_header('Authorization')
self.end_headers() self.end_headers()
return return
self.server.lastGET=currTimeGET self.server.lastGET=currTimeGET
@ -538,14 +536,10 @@ class PubServer(BaseHTTPRequestHandler):
if postJsonObject.get('likes'): if postJsonObject.get('likes'):
postJsonObject['likes']={} postJsonObject['likes']={}
if 'text/html' in self.headers['Accept']: if 'text/html' in self.headers['Accept']:
self._set_headers('text/html') self._set_headers('text/html')
if authorized:
self.send_header('Authorization')
self.wfile.write(htmlIndividualPost(postJsonObject).encode('utf-8')) self.wfile.write(htmlIndividualPost(postJsonObject).encode('utf-8'))
else: else:
self._set_headers('application/json') self._set_headers('application/json')
if authorized:
self.send_header('Authorization')
self.wfile.write(json.dumps(postJsonObject).encode('utf-8')) self.wfile.write(json.dumps(postJsonObject).encode('utf-8'))
self.server.GETbusy=False self.server.GETbusy=False
return return
@ -1068,7 +1062,7 @@ class PubServer(BaseHTTPRequestHandler):
# any password changes. # any password changes.
if not self.server.salts.get(loginNickname): if not self.server.salts.get(loginNickname):
self.server.salts[loginNickname]=createPassword(32) self.server.salts[loginNickname]=createPassword(32)
self.server.tokens[loginNickname]=str(sha256((loginNickname+loginPassword+self.server.salts[loginNickname]).encode('utf-8'))) self.server.tokens[loginNickname]=sha256((loginNickname+loginPassword+self.server.salts[loginNickname]).encode('utf-8')).hexdigest()
self.server.tokensLookup[self.server.tokens[loginNickname]]=loginNickname self.server.tokensLookup[self.server.tokens[loginNickname]]=loginNickname
self.send_header('Set-Cookie', 'epicyon='+self.server.tokens[loginNickname]+'; SameSite=Strict') self.send_header('Set-Cookie', 'epicyon='+self.server.tokens[loginNickname]+'; SameSite=Strict')
self.send_header('Location', '/users/'+loginNickname+'/outbox') self.send_header('Location', '/users/'+loginNickname+'/outbox')

1
person.py
View File

@ -17,6 +17,7 @@ from Crypto.PublicKey import RSA
from shutil import copyfile from shutil import copyfile
from webfinger import createWebfingerEndpoint from webfinger import createWebfingerEndpoint
from webfinger import storeWebfingerEndpoint from webfinger import storeWebfingerEndpoint
from posts import createInbox
from posts import createOutbox from posts import createOutbox
from auth import storeBasicCredentials from auth import storeBasicCredentials
from roles import setRole from roles import setRole