From f2396c32a5bd1c9b49e073e3a23d0fa556e92019 Mon Sep 17 00:00:00 2001
From: Adrien Beudin <beudbeud@beudibox.fr>
Date: Tue, 3 Oct 2017 00:43:29 +0200
Subject: [PATCH] [enh] auto login

---
 prosopopee/prosopopee.py                      |  9 ++-
 .../themes/exposure/templates/encrypted.html  | 12 +++-
 .../themes/exposure/templates/form.html       |  2 +-
 .../exposure/templates/index-encrypted.html   | 66 ------------------
 .../themes/light/templates/encrypted.html     | 51 +++++---------
 prosopopee/themes/light/templates/form.html   | 25 +++++++
 .../themes/material/templates/encrypted.html  | 14 ++--
 .../themes/material/templates/form.html       |  2 +-
 .../material/templates/index-encrypted.html   | 69 -------------------
 9 files changed, 71 insertions(+), 179 deletions(-)
 delete mode 100644 prosopopee/themes/exposure/templates/index-encrypted.html
 create mode 100644 prosopopee/themes/light/templates/form.html
 delete mode 100644 prosopopee/themes/material/templates/index-encrypted.html

diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py
index 116820c..f98417a 100644
--- a/prosopopee/prosopopee.py
+++ b/prosopopee/prosopopee.py
@@ -480,9 +480,9 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
     open(Path("build").joinpath(gallery_path, "index.html"), "wb").write(html)
 
     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"))
         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)
         html = encrypted_template.render(
             settings=settings,
@@ -531,7 +531,7 @@ def build_gallery(settings, gallery_settings, gallery_path, template):
         if gallery_settings.get("password") or settings.get("password"):
             light_template_to_render = light_templates.get_template("encrypted.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
             password = gallery_settings.get("password", settings.get("password"))
             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={}):
     index_template = templates.get_template("index.html")
+    form_template = templates.get_template("form.html")
 
     reverse = gallery_settings.get('reverse', settings["settings"].get('reverse', False))
     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)
 
     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")
         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)
         html = index_template_to_render.render(
             settings=settings,
+            form=str(form, 'utf-8'),
             ciphertext=str(encrypted, 'utf-8')
         ).encode("Utf-8")
     
diff --git a/prosopopee/themes/exposure/templates/encrypted.html b/prosopopee/themes/exposure/templates/encrypted.html
index 4293204..bbf2764 100644
--- a/prosopopee/themes/exposure/templates/encrypted.html
+++ b/prosopopee/themes/exposure/templates/encrypted.html
@@ -1,8 +1,13 @@
+{% if gallery %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 <!doctype html>
 <html class="staticrypt-html">
   <head>
     <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">
 
     <!-- do not cache this page -->
@@ -11,10 +16,10 @@
     <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="{{ pathstatic }}/static/css/style-page.css"  media="screen,projection"/>
 
   </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>
 var form = '{{ form }}';
 var encryptedMsg = '{{ ciphertext }}';
@@ -43,6 +48,7 @@ document.getElementById('staticrypt-form').addEventListener('submit', function(e
     return;
   }
 
+  sessionStorage.setItem("password", passphrase);
   document.write(plainHTML);
   document.close();
 });
diff --git a/prosopopee/themes/exposure/templates/form.html b/prosopopee/themes/exposure/templates/form.html
index 9f5dfaa..5b17a5e 100644
--- a/prosopopee/themes/exposure/templates/form.html
+++ b/prosopopee/themes/exposure/templates/form.html
@@ -3,7 +3,7 @@
     <div class="staticrypt-form">
       <div class="staticrypt-instructions">
         <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>
       <hr class="staticrypt-hr">
       <form id="staticrypt-form" action="#" method="post">
diff --git a/prosopopee/themes/exposure/templates/index-encrypted.html b/prosopopee/themes/exposure/templates/index-encrypted.html
deleted file mode 100644
index bed3372..0000000
--- a/prosopopee/themes/exposure/templates/index-encrypted.html
+++ /dev/null
@@ -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>
diff --git a/prosopopee/themes/light/templates/encrypted.html b/prosopopee/themes/light/templates/encrypted.html
index cf25e47..c230124 100644
--- a/prosopopee/themes/light/templates/encrypted.html
+++ b/prosopopee/themes/light/templates/encrypted.html
@@ -7,7 +7,7 @@
 <html class="staticrypt-html">
   <head>
     <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">
 
     <!-- do not cache this page -->
@@ -18,52 +18,39 @@
     <meta http-equiv="pragma" content="no-cache"/>
     <link type="text/css" rel="stylesheet" href="{{ pathstatic }}/static/css/style-page.css"  media="screen,projection"/>
   </head>
+  <script type="text/javascript" src="{{ pathstatic }}/static/js/crypto-js.min.js" charset="utf-8"></script>
+  <script>
+var form = '{{ form }}';
+var encryptedMsg = '{{ ciphertext }}';
 
-  <body class="staticrypt-body">
-    <div class="staticrypt-page">
-      <div class="staticrypt-form">
-        <div class="staticrypt-instructions">
-          <p class="staticrypt-title">{{ gallery.title }}</p>
-        </div>
+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();
+}
 
-        <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>
 document.getElementById('staticrypt-form').addEventListener('submit', function(e) {
   e.preventDefault();
 
-  var passphrase = document.getElementById('staticrypt-password').value,
-  encryptedMsg = '{{ ciphertext }}';
+  var passphrase = document.getElementById('staticrypt-password').value;
 
   try{
     var plainHTML = CryptoJS.AES.decrypt(encryptedMsg, passphrase).toString(CryptoJS.enc.Utf8);
   }
   catch(err) {
-    document.getElementById("error").innerHTML = "Wrong keyword entry."
+    document.getElementById("error").innerHTML = "Wrong keyword entry.";
     return;
   }
 
+  sessionStorage.setItem("password", passphrase);
   document.write(plainHTML);
   document.close();
 });
-    </script>
+  </script>
   </body>
 </html>
diff --git a/prosopopee/themes/light/templates/form.html b/prosopopee/themes/light/templates/form.html
new file mode 100644
index 0000000..f958c6c
--- /dev/null
+++ b/prosopopee/themes/light/templates/form.html
@@ -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>
diff --git a/prosopopee/themes/material/templates/encrypted.html b/prosopopee/themes/material/templates/encrypted.html
index b16be9d..47272fa 100644
--- a/prosopopee/themes/material/templates/encrypted.html
+++ b/prosopopee/themes/material/templates/encrypted.html
@@ -1,8 +1,13 @@
+{% if gallery %}
+{% set pathstatic = ".." %}
+{% else %}
+{% set pathstatic = "." %}
+{% endif %}
 <!doctype html>
 <html class="staticrypt-html">
   <head>
     <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">
 
     <!-- do not cache this page -->
@@ -11,10 +16,10 @@
     <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"/>
+    <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/materialize.css"  media="screen,projection"/>
   </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>
 var form = '{{ form }}';
 var encryptedMsg = '{{ ciphertext }}';
@@ -43,6 +48,7 @@ document.getElementById('staticrypt-form').addEventListener('submit', function(e
     return;
   }
 
+  sessionStorage.setItem("password", passphrase);
   document.write(plainHTML);
   document.close();
 });
diff --git a/prosopopee/themes/material/templates/form.html b/prosopopee/themes/material/templates/form.html
index 1bd9a48..064a015 100644
--- a/prosopopee/themes/material/templates/form.html
+++ b/prosopopee/themes/material/templates/form.html
@@ -2,7 +2,7 @@
   <div class="staticrypt-page">
     <div class="staticrypt-form">
       <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>
 
       <hr class="staticrypt-hr">
diff --git a/prosopopee/themes/material/templates/index-encrypted.html b/prosopopee/themes/material/templates/index-encrypted.html
deleted file mode 100644
index f6e33dc..0000000
--- a/prosopopee/themes/material/templates/index-encrypted.html
+++ /dev/null
@@ -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>