Merge ~andersson123/autopkgtest-cloud:login-button into autopkgtest-cloud:master

[Tim Andersson]

[Tim Andersson (andersson123)]

going to test this in staging now.

[Tim Andersson (andersson123)]

tested and functioning as intended.

[Skia (hyask)]

review: Needs Fixing

[Tim Andersson (andersson123)]

amended and ready for re-review, thanks for the helpful tips!

[Tim Andersson (andersson123)]

hm, there's some unnecessary changes in this mp

[Skia (hyask)]

review: Needs Fixing

[Skia (hyask)]

review: Approve

diff --git a/charms/focal/autopkgtest-web/webcontrol/browse.cgi b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
index 5e5217b..93758e4 100755
--- a/charms/focal/autopkgtest-web/webcontrol/browse.cgi
+++ b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
@@ -13,15 +13,23 @@ from wsgiref.handlers import CGIHandler
 import flask
 from helpers.admin import select_abnormally_long_jobs
 from helpers.exceptions import RunningJSONNotFound
-from helpers.utils import get_all_releases, get_supported_releases
+from helpers.utils import get_all_releases, get_supported_releases, setup_key
 from werkzeug.middleware.proxy_fix import ProxyFix
 
+# Initialize app
+PATH = os.path.join(
+    os.path.sep, os.getenv("XDG_RUNTIME_DIR", "/run"), "autopkgtest_webcontrol"
+)
+os.makedirs(PATH, exist_ok=True)
 app = flask.Flask("browse")
-
 # we don't want a long cache, as we only serve files that are regularly updated
 app.config["SEND_FILE_MAX_AGE_DEFAULT"] = 60
 
 app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1)
+
+secret_path = os.path.join(PATH, "secret_key")
+setup_key(app, secret_path)
+
 db_con = None
 swift_container_url = None
 
@@ -245,6 +253,7 @@ def success_count_for_release_and_arch(db, release, arch, src_versions):
 
 @app.route("/")
 def index_root():
+    flask.session.permanent = True
     letters = list("abcdefghijklmnopqrstuvwxyz")
     indexes = letters + ["lib" + l for l in letters]
     indexes.sort()
diff --git a/charms/focal/autopkgtest-web/webcontrol/request/app.py b/charms/focal/autopkgtest-web/webcontrol/request/app.py
index a4a3367..422a40a 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/app.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/app.py
@@ -273,6 +273,8 @@ def index_root():
     elif nick:
         params["requester"] = nick
         s = Submit()
+        if list(params.keys()) == ["/login", "requester"]:
+            return redirect("/")
         try:
             s.validate_args(params)
             s.validate_distro_request(**params)
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-layout.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-layout.html
index c91457d..e4cfce6 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-layout.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-layout.html
@@ -34,6 +34,9 @@
               <li><a href="https://discourse.ubuntu.com/t/autopkgtest-service/34490">Service Status</a></li>
               <li><a href="https://autopkgtest-cloud.readthedocs.io/">Docs for admins</a></li>
               <li><a href="{{base_url}}admin">Admin</a></li>
+              {% if not session.get("nickname") %}
+                <li><a href="{{base_url}}request.cgi?/login">Login</a></li>
+              {% endif %}
             </ul>
           </div><!--/.nav-collapse -->
         </div>