[enh] auto login

This commit is contained in:
Adrien Beudin 2017-10-03 00:43:29 +02:00
parent 53775d233b
commit f2396c32a5
9 changed files with 71 additions and 179 deletions

View File

@ -480,9 +480,9 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html) open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html)
if gallery_settings.get("password") or settings.get("password"): if gallery_settings.get("password") or settings.get("password"):
form = base64.b64encode(from_template.render(gallery=gallery_settings, settings=settings).encode("Utf-8"))
password = gallery_settings.get("password", settings.get("password")) password = gallery_settings.get("password", settings.get("password"))
index_plain = Path("build").joinpath(gallery_path, "index.html") index_plain = Path("build").joinpath(gallery_path, "index.html")
form = base64.b64encode(from_template.render(gallery=gallery_settings).encode("Utf-8"))
encrypted = check_output('cat %s | openssl enc -e -base64 -A -aes-256-cbc -pass pass:"%s"' % (index_plain, password), shell=True) encrypted = check_output('cat %s | openssl enc -e -base64 -A -aes-256-cbc -pass pass:"%s"' % (index_plain, password), shell=True)
html = encrypted_template.render( html = encrypted_template.render(
settings=settings, settings=settings,
@ -531,7 +531,7 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
if gallery_settings.get("password") or settings.get("password"): if gallery_settings.get("password") or settings.get("password"):
light_template_to_render = light_templates.get_template("encrypted.html") light_template_to_render = light_templates.get_template("encrypted.html")
from_template = light_templates.get_template("form.html") from_template = light_templates.get_template("form.html")
form = base64.b64encode(from_template.render(gallery=gallery_settings).encode("Utf-8")) form = base64.b64encode(from_template.render(gallery=gallery_settings, settings=settings).encode("Utf-8"))
template_to_render = encrypted_template template_to_render = encrypted_template
password = gallery_settings.get("password", settings.get("password")) password = gallery_settings.get("password", settings.get("password"))
index_plain = Path("build").joinpath(gallery_light_path, "index.html") index_plain = Path("build").joinpath(gallery_light_path, "index.html")
@ -548,6 +548,7 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
def build_index(settings, galleries_cover, templates, gallery_path='', sub_index=False, gallery_settings={}): def build_index(settings, galleries_cover, templates, gallery_path='', sub_index=False, gallery_settings={}):
index_template = templates.get_template("index.html") index_template = templates.get_template("index.html")
form_template = templates.get_template("form.html")
reverse = gallery_settings.get('reverse', settings["settings"].get('reverse', False)) reverse = gallery_settings.get('reverse', settings["settings"].get('reverse', False))
if reverse: if reverse:
@ -573,12 +574,14 @@ def build_index(settings, galleries_cover, templates, gallery_path='', sub_index
open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html) open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html)
if settings.get("password"): if settings.get("password"):
index_template_to_render = templates.get_template("index-encrypted.html") form = base64.b64encode(form_template.render(settings=settings).encode("Utf-8"))
index_template_to_render = templates.get_template("encrypted.html")
password = settings.get("password") password = settings.get("password")
index_plain = Path("build").joinpath(gallery_path, "index.html") index_plain = Path("build").joinpath(gallery_path, "index.html")
encrypted = check_output('cat %s | openssl enc -e -base64 -A -aes-256-cbc -pass pass:"%s"' % (index_plain, password), shell=True) encrypted = check_output('cat %s | openssl enc -e -base64 -A -aes-256-cbc -pass pass:"%s"' % (index_plain, password), shell=True)
html = index_template_to_render.render( html = index_template_to_render.render(
settings=settings, settings=settings,
form=str(form, 'utf-8'),
ciphertext=str(encrypted, 'utf-8') ciphertext=str(encrypted, 'utf-8')
).encode("Utf-8") ).encode("Utf-8")

View File

@ -1,8 +1,13 @@
{% if gallery %}
{% set pathstatic = ".." %}
{% else %}
{% set pathstatic = "." %}
{% endif %}
<!doctype html> <!doctype html>
<html class="staticrypt-html"> <html class="staticrypt-html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ gallery.title }} · {{ settings.title }}</title> <title>{% if gallery %}{{ gallery.title }} · {% endif %}{{ settings.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- do not cache this page --> <!-- do not cache this page -->
@ -11,10 +16,10 @@
<meta http-equiv="expires" content="0"/> <meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/> <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="pragma" content="no-cache"/>
<link type="text/css" rel="stylesheet" href="../static/css/style-page.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css" media="screen,projection"/>
</head> </head>
<script type="text/javascript" src="../static/js/crypto-js.min.js" charset="utf-8"></script> <script type="text/javascript" src="{{ pathstatic }}/static/js/crypto-js.min.js" charset="utf-8"></script>
<script> <script>
var form = '{{ form }}'; var form = '{{ form }}';
var encryptedMsg = '{{ ciphertext }}'; var encryptedMsg = '{{ ciphertext }}';
@ -43,6 +48,7 @@ document.getElementById('staticrypt-form').addEventListener('submit', function(e
return; return;
} }
sessionStorage.setItem("password", passphrase);
document.write(plainHTML); document.write(plainHTML);
document.close(); document.close();
}); });

View File

@ -3,7 +3,7 @@
<div class="staticrypt-form"> <div class="staticrypt-form">
<div class="staticrypt-instructions"> <div class="staticrypt-instructions">
<img id="logo" src="./../static/img/logo.svg"> <img id="logo" src="./../static/img/logo.svg">
<p class="staticrypt-title">{{ gallery.title }}</p> <p class="staticrypt-title">{% if gallery %}{{ gallery.title }}{% else %}{{ settings.title }}{% endif %}</p>
</div> </div>
<hr class="staticrypt-hr"> <hr class="staticrypt-hr">
<form id="staticrypt-form" action="#" method="post"> <form id="staticrypt-form" action="#" method="post">

View File

@ -1,66 +0,0 @@
<!doctype html>
<html class="staticrypt-html">
<head>
<meta charset="utf-8">
<title>{{ settings.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- do not cache this page -->
<meta http-equiv="cache-control" content="max-age=0"/>
<meta http-equiv="cache-control" content="no-cache"/>
<meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<meta http-equiv="pragma" content="no-cache"/>
<link type="text/css" rel="stylesheet" href="static/css/style-page.css" media="screen,projection"/>
</head>
<body class="staticrypt-body">
<div class="staticrypt-page">
<div class="staticrypt-form">
<div class="staticrypt-instructions">
<img id="logo" src="static/img/logo.svg">
<p class="staticrypt-title">{{ settings.title }}</p>
</div>
<hr class="staticrypt-hr">
<form id="staticrypt-form" action="#" method="post">
<div id="error" style="color: red; padding-bottom: 10px; height: 20px;"></div>
<input id="staticrypt-password"
type="password"
name="password"
placeholder="passphrase"
autofocus/>
<input type="submit" class="staticrypt-decrypt-button" value="ENTER"/>
</form>
</div>
</div>
<footer style="position: absolute;">
<p>Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a> · atom logo by <a href="https://thenounproject.com/jjjon/">Jonathan Li</a> under <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY</a></p>
</footer>
<script type="text/javascript" src="static/js/crypto-js.min.js" charset="utf-8"></script>
<script>
document.getElementById('staticrypt-form').addEventListener('submit', function(e) {
e.preventDefault();
var passphrase = document.getElementById('staticrypt-password').value,
encryptedMsg = '{{ ciphertext }}';
try{
var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8);
}
catch(err) {
document.getElementById("error").innerHTML = "Wrong keyword entry.";
return;
}
sessionStorage.setItem("password", passphrase);
document.write(plainHTML);
document.close();
});
</script>
</body>
</html>

View File

@ -7,7 +7,7 @@
<html class="staticrypt-html"> <html class="staticrypt-html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ gallery.title }} · {{ settings.title }}</title> <title>{% if gallery %}{{ gallery.title }} · {% endif %}{{ settings.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- do not cache this page --> <!-- do not cache this page -->
@ -18,49 +18,36 @@
<meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="pragma" content="no-cache"/>
<link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css" media="screen,projection"/>
</head> </head>
<body class="staticrypt-body">
<div class="staticrypt-page">
<div class="staticrypt-form">
<div class="staticrypt-instructions">
<p class="staticrypt-title">{{ gallery.title }}</p>
</div>
<hr class="staticrypt-hr">
<form id="staticrypt-form" action="#" method="post">
<div id="error" style="color: red; padding-bottom: 10px; height: 20px;"></div>
<input id="staticrypt-password"
type="password"
name="password"
placeholder="passphrase"
autofocus/>
<input type="submit" class="staticrypt-decrypt-button" value="ENTER"/>
</form>
</div>
</div>
<footer>
<p>Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a> · atom logo by <a href="https://thenounproject.com/jjjon/">Jonathan Li</a> under <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY</a></p>
</footer>
<script type="text/javascript" src="{{ pathstatic }}/static/js/crypto-js.min.js" charset="utf-8"></script> <script type="text/javascript" src="{{ pathstatic }}/static/js/crypto-js.min.js" charset="utf-8"></script>
<script> <script>
var form = '{{ form }}';
var encryptedMsg = '{{ ciphertext }}';
if (sessionStorage.getItem("password")) {
var passphrase = sessionStorage.getItem("password");
var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8);
document.write(plainHTML);
document.close();
} else {
var plainHTML = CryptoJS.enc.Base64.parse(form).toString(CryptoJS.enc.Utf8);
document.write(plainHTML);
document.close();
}
document.getElementById('staticrypt-form').addEventListener('submit', function(e) { document.getElementById('staticrypt-form').addEventListener('submit', function(e) {
e.preventDefault(); e.preventDefault();
var passphrase = document.getElementById('staticrypt-password').value, var passphrase = document.getElementById('staticrypt-password').value;
encryptedMsg = '{{ ciphertext }}';
try{ try{
var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8); var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8);
} }
catch(err) { catch(err) {
document.getElementById("error").innerHTML = "Wrong keyword entry." document.getElementById("error").innerHTML = "Wrong keyword entry.";
return; return;
} }
sessionStorage.setItem("password", passphrase);
document.write(plainHTML); document.write(plainHTML);
document.close(); document.close();
}); });

View File

@ -0,0 +1,25 @@
<body class="staticrypt-body">
<div class="staticrypt-page">
<div class="staticrypt-form">
<div class="staticrypt-instructions">
<p class="staticrypt-title">{% if gallery %}{{ gallery.title }}{% else %}{{ settings.title }}{% endif %}</p>
</div>
<hr class="staticrypt-hr">
<form id="staticrypt-form" action="#" method="post">
<div id="error" style="color: red; padding-bottom: 10px; height: 20px;"></div>
<input id="staticrypt-password"
type="password"
name="password"
placeholder="passphrase"
autofocus/>
<input type="submit" class="staticrypt-decrypt-button" value="ENTER"/>
</form>
</div>
</div>
<footer>
<p>Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a> · atom logo by <a href="https://thenounproject.com/jjjon/">Jonathan Li</a> under <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY</a></p>
</footer>

View File

@ -1,8 +1,13 @@
{% if gallery %}
{% set pathstatic = ".." %}
{% else %}
{% set pathstatic = "." %}
{% endif %}
<!doctype html> <!doctype html>
<html class="staticrypt-html"> <html class="staticrypt-html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ gallery.title }} · {{ settings.title }}</title> <title>{% if gallery %}{{ gallery.title }} · {% endif %}{{ settings.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- do not cache this page --> <!-- do not cache this page -->
@ -11,10 +16,10 @@
<meta http-equiv="expires" content="0"/> <meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/> <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="pragma" content="no-cache"/>
<link type="text/css" rel="stylesheet" href="../static/css/style-page.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css" media="screen,projection"/>
<link type="text/css" rel="stylesheet" href="../static/css/materialize.css" media="screen,projection"/> <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/materialize.css" media="screen,projection"/>
</head> </head>
<script type="text/javascript" src="../static/js/crypto-js.min.js" charset="utf-8"></script> <script type="text/javascript" src="{{ pathstatic }}/static/js/crypto-js.min.js" charset="utf-8"></script>
<script> <script>
var form = '{{ form }}'; var form = '{{ form }}';
var encryptedMsg = '{{ ciphertext }}'; var encryptedMsg = '{{ ciphertext }}';
@ -43,6 +48,7 @@ document.getElementById('staticrypt-form').addEventListener('submit', function(e
return; return;
} }
sessionStorage.setItem("password", passphrase);
document.write(plainHTML); document.write(plainHTML);
document.close(); document.close();
}); });

View File

@ -2,7 +2,7 @@
<div class="staticrypt-page"> <div class="staticrypt-page">
<div class="staticrypt-form"> <div class="staticrypt-form">
<div class="staticrypt-instructions"> <div class="staticrypt-instructions">
<p class="staticrypt-title">{{ gallery.title }}</p> <p class="staticrypt-title">{% if gallery %}{{ gallery.title }}{% else %}{{ settings.title }}{% endif %}</p>
</div> </div>
<hr class="staticrypt-hr"> <hr class="staticrypt-hr">

View File

@ -1,69 +0,0 @@
<!doctype html>
<html class="staticrypt-html">
<head>
<meta charset="utf-8">
<title>{{ settings.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- do not cache this page -->
<meta http-equiv="cache-control" content="max-age=0"/>
<meta http-equiv="cache-control" content="no-cache"/>
<meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<meta http-equiv="pragma" content="no-cache"/>
<link type="text/css" rel="stylesheet" href="static/css/style-page.css" media="screen,projection"/>
<link type="text/css" rel="stylesheet" href="static/css/materialize.css" media="screen,projection"/>
</head>
<body class="staticrypt-body">
<div class="staticrypt-page">
<div class="staticrypt-form">
<div class="staticrypt-instructions">
<p class="staticrypt-title">{{ settings.title }}</p>
</div>
<hr class="staticrypt-hr">
<form id="staticrypt-form" action="#" method="post">
<div id="error" style="color: red; padding-bottom: 10px; height: 20px;"></div>
<input id="staticrypt-password"
type="password"
name="password"
placeholder="passphrase"
autofocus/>
<button class="btn waves-effect waves-light" type="submit" name="action">ENTER
</button>
</form>
</div>
</div>
<footer class="page-footer blue-grey darken-1">
<div class="footer-copyright blue-grey darken-2">
<div class="container center">
Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>
</div>
</div>
</footer>
<script type="text/javascript" src="static/js/crypto-js.min.js" charset="utf-8"></script>
<script>
document.getElementById('staticrypt-form').addEventListener('submit', function(e) {
e.preventDefault();
var passphrase = document.getElementById('staticrypt-password').value,
encryptedMsg = '{{ ciphertext }}';
try{
var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8);
}
catch(err) {
document.getElementById("error").innerHTML = "Wrong keyword entry.";
return;
}
sessionStorage.setItem("password", passphrase);
document.write(plainHTML);
document.close();
});
</script>
</body>
</html>