indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Snake case

merge-requests/30/head
Bob Mottram 2021-12-25 22:45:26 +00:00
parent f076ad82c0
commit e7af84f3fe
1 changed files with 9 additions and 9 deletions

18
daemon.py
View File

@ -1582,8 +1582,8 @@ class PubServer(BaseHTTPRequestHandler):
tokenStr = self.headers['Cookie'].split('=', 1)[1].strip() tokenStr = self.headers['Cookie'].split('=', 1)[1].strip()
if ';' in tokenStr: if ';' in tokenStr:
tokenStr = tokenStr.split(';')[0].strip() tokenStr = tokenStr.split(';')[0].strip()
if self.server.tokensLookup.get(tokenStr): if self.server.tokens_lookup.get(tokenStr):
nickname = self.server.tokensLookup[tokenStr] nickname = self.server.tokens_lookup[tokenStr]
if not isSystemAccount(nickname): if not isSystemAccount(nickname):
self.authorizedNickname = nickname self.authorizedNickname = nickname
# default to the inbox of the person # default to the inbox of the person
@ -1606,7 +1606,7 @@ class PubServer(BaseHTTPRequestHandler):
'authorization failed, header=' + 'authorization failed, header=' +
self.headers['Cookie'].replace('epicyon=', '') + self.headers['Cookie'].replace('epicyon=', '') +
' tokenStr=' + tokenStr + ' tokens=' + ' tokenStr=' + tokenStr + ' tokens=' +
str(self.server.tokensLookup)) str(self.server.tokens_lookup))
return False return False
print('AUTH: Header cookie was not authorized') print('AUTH: Header cookie was not authorized')
return False return False
@ -1625,7 +1625,7 @@ class PubServer(BaseHTTPRequestHandler):
""" """
# remove any token # remove any token
if self.server.tokens.get(nickname): if self.server.tokens.get(nickname):
del self.server.tokensLookup[self.server.tokens[nickname]] del self.server.tokens_lookup[self.server.tokens[nickname]]
del self.server.tokens[nickname] del self.server.tokens[nickname]
self._redirect_headers(self.server.http_prefix + '://' + self._redirect_headers(self.server.http_prefix + '://' +
self.server.domainFull + '/login', self.server.domainFull + '/login',
@ -1802,7 +1802,7 @@ class PubServer(BaseHTTPRequestHandler):
loginHandle + '.json') loginHandle + '.json')
index = self.server.tokens[loginNickname] index = self.server.tokens[loginNickname]
self.server.tokensLookup[index] = loginNickname self.server.tokens_lookup[index] = loginNickname
cookieStr = 'SET:epicyon=' + \ cookieStr = 'SET:epicyon=' + \
self.server.tokens[loginNickname] + '; SameSite=Strict' self.server.tokens[loginNickname] + '; SameSite=Strict'
if callingDomain.endswith('.onion') and onion_domain: if callingDomain.endswith('.onion') and onion_domain:
@ -18408,7 +18408,7 @@ def runSharesExpireWatchdog(project_version: str, httpd) -> None:
print('Restarting shares expiry...') print('Restarting shares expiry...')
def loadTokens(base_dir: str, tokensDict: {}, tokensLookup: {}) -> None: def loadTokens(base_dir: str, tokensDict: {}, tokens_lookup: {}) -> None:
for subdir, dirs, files in os.walk(base_dir + '/accounts'): for subdir, dirs, files in os.walk(base_dir + '/accounts'):
for handle in dirs: for handle in dirs:
if '@' in handle: if '@' in handle:
@ -18426,7 +18426,7 @@ def loadTokens(base_dir: str, tokensDict: {}, tokensLookup: {}) -> None:
if not token: if not token:
continue continue
tokensDict[nickname] = token tokensDict[nickname] = token
tokensLookup[token] = nickname tokens_lookup[token] = nickname
break break
@ -18761,8 +18761,8 @@ def runDaemon(content_license_url: str,
httpd.log_login_failures = log_login_failures httpd.log_login_failures = log_login_failures
httpd.max_replies = max_replies httpd.max_replies = max_replies
httpd.tokens = {} httpd.tokens = {}
httpd.tokensLookup = {} httpd.tokens_lookup = {}
loadTokens(base_dir, httpd.tokens, httpd.tokensLookup) loadTokens(base_dir, httpd.tokens, httpd.tokens_lookup)
httpd.instance_only_skills_search = instance_only_skills_search httpd.instance_only_skills_search = instance_only_skills_search
# contains threads used to send posts to followers # contains threads used to send posts to followers
httpd.followersThreads = [] httpd.followersThreads = []