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

Login text

master
Bob Mottram 2019-07-25 20:22:19 +01:00
parent 7a4a686d87
commit 37a56aed87
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -1044,10 +1044,11 @@ class PubServer(BaseHTTPRequestHandler):
del self.server.tokensLookup[self.server.tokens[loginNickname]] del self.server.tokensLookup[self.server.tokens[loginNickname]]
del self.server.tokens[loginNickname] del self.server.tokens[loginNickname]
del self.server.salts[loginNickname] del self.server.salts[loginNickname]
self.send_response(401) self.send_response(303)
self.send_header('Content-type', 'text/html; charset=utf-8') self.send_header('Content-type', 'text/html; charset=utf-8')
self.send_header('Set-Cookie', 'epicyon=; SameSite=Strict') self.send_header('Set-Cookie', 'epicyon=; SameSite=Strict')
self.end_headers() self.send_header('Location', '/login')
self.end_headers()
self.server.POSTbusy=False self.server.POSTbusy=False
return return
else: else:

10
webinterface.py
View File

@ -41,7 +41,12 @@ def htmlGetLoginCredentials(loginParams: str,lastLoginTime: int) -> (str,str):
def htmlLogin(baseDir: str) -> str: def htmlLogin(baseDir: str) -> str:
if not os.path.isfile(baseDir+'/accounts/login.png'): if not os.path.isfile(baseDir+'/accounts/login.png'):
copyfile(baseDir+'/img/login.png',baseDir+'/accounts/login.png') copyfile(baseDir+'/img/login.png',baseDir+'/accounts/login.png')
# /login?nickname=[username]&password=[password]&remember=on
loginText='<p>Welcome. Please enter your login details below.</p>'
if os.path.isfile(baseDir+'/accounts/login.txt'):
with open(baseDir+'/accounts/login.txt', 'r') as file:
loginText = '<p>'+file.read()+'</p>'
loginCSS= \ loginCSS= \
'body, html {' \ 'body, html {' \
' height: 100%;' \ ' height: 100%;' \
@ -112,7 +117,8 @@ def htmlLogin(baseDir: str) -> str:
loginForm+= \ loginForm+= \
' <form method="POST" action="/login">' \ ' <form method="POST" action="/login">' \
' <div class="imgcontainer">' \ ' <div class="imgcontainer">' \
' <img src="login.png" alt="login image" class="loginimage">' \ ' <img src="login.png" alt="login image" class="loginimage">'+ \
loginText+ \
' </div>' \ ' </div>' \
'' \ '' \
' <div class="container">' \ ' <div class="container">' \