list logged on shares

README.md

@@ -1,6 +1,9 @@
 # FLEES
 
-a very small file sharing website
+A very small file sharing website.
+
+The name comes from mispronouncing "files" very badly.
+
 
 - configure shares with data/shares.json
 - generate shares with utils/create-share.py

code/app.py

@@ -32,12 +32,18 @@ def index():
     for share in g.shares:
         public = get_or_none(share,'public')
         expired = is_expired(share)
-        if public and not expired:
+        authenticated_share = get_share(share['name'])
-            public_shares.append({
+        password_set = False
-                'name': share['name'],
+        if authenticated_share[0]:
-                'expire': get_or_none(share,'expire'),
+            password_set = authenticated_share[1]['authenticated'] in ('hash', 'plain')
-                'upload': get_or_none(share,'upload')
+        if not expired:
-            })
+            if public or password_set:
+                public_shares.append({
+                    'name': share['name'],
+                    'expire': get_or_none(share,'expire'),
+                    'upload': get_or_none(share,'upload'),
+                    'password_set': password_set
+                })
 
     return render_template("index.html", entries=public_shares)
 
@@ -194,18 +200,18 @@ def get_share(name, require_auth = True):
     share = share[0]
     if is_expired(share):
         return (False, 'Share has expired')
-    authenticated = True
+    authenticated = "no-pass"
     if require_auth:
         if 'pass_plain' in share:
             authenticated = False
             if name in session:
                 if session[name] == hashlib.sha1(share['pass_plain'].encode('utf-8')).hexdigest():
-                    authenticated = True
+                    authenticated = "plain"
         if 'pass_hash' in share:
             authenticated = False
             if name in session:
                 if session[name] == share['pass_hash']:
-                    authenticated = True
+                    authenticated = "hash"
 
     if not authenticated:
         return (False,redirect(url_for('authenticate',name=name)))
@@ -215,7 +221,8 @@ def get_share(name, require_auth = True):
         "path": os.path.join(
             app.config['UPLOAD_FOLDER'],
             share['path']
-        )
+        ),
+        "authenticated": authenticated
     })
     if not os.path.exists(share['path']):
         os.makedirs(share['path'])

code/templates/index.html

@@ -3,7 +3,7 @@
   <div id=index_title><h1>Flees</h1></div>
   <div id=index_menu>
    <div id=index_enter>
-		<input id="index_form_name" type=text name=name title="Hidden share name" 
+		<input id="index_form_name" type=text name=name title="Hidden share name"
 		  onkeydown="index_form_enter(event)">
 		<input type=submit value=Go onclick="index_form_submit()">
    </div>
@@ -18,6 +18,7 @@
   {% for entry in entries %}
     <tr>
       <td><a href="{{ url_for('list_view',name=entry.name) }}">{{ entry.name }}</a>
+          {% if entry.password_set %}(Logged in){% endif %}
       <td class=td_right>{% if entry.expire %}{{ entry.expire|safe }}{% else %}-{% endif %}
       <td class=td_right>{% if entry.upload %}yes{% else %}no{% endif %}
   {% endfor %}

code/templates/logout.html

@@ -1,4 +1,5 @@
 {% extends "layout.html" %}
 {% block body %}
-  You are logged out from <a href="{{ url_for('list_view',name=name) }}">{{ name|safe  }}</a>
+  <p>You are logged out from <a href="{{ url_for('list_view',name=name) }}">{{ name|safe  }}</a></p>
+  <p>Continue to <a href="{{ url_for('index') }}">index</a></p>
 {% endblock %}

docker-compose.yaml

@@ -9,7 +9,7 @@ services:
       - "${FLEES_EXPOSE}:80"
     volumes:
       - ./data/:/code/data/
-    restart: always
+    restart: unless-stopped