Do not show dependency versions even to admins by default

Dependency versions are generally not useful, unless you are developing
or otherwise outside of a normal release situation: If you are on a
normal release, we can figure out the dep versions by looking at the
docker image.

To reduce the amount of information displayed and the amount of
information which needs to be conveyed in case of problems, we only show
the web portal and prosody versions to admins, unless debug mode is
enabled.

The behaviour that versions are only shown to logged in admins (unless
debug mode is enabled) remains unchanged.

Fixes #115.

snikket_web/infra.py

@@ -8,7 +8,6 @@ import quart.flask_patch  # noqa:F401
 from quart import (
     current_app,
     request,
-    g,
 )
 
 import flask_babel
@@ -35,9 +34,6 @@ BYTE_UNIT_SCALE_MAP = [
 
 @babel.localeselector  # type:ignore
 def selected_locale() -> str:
-    # Needs mypy ignore because this is a free-for-all object and has no
-    # publicly known attributes.
-    g.language_header_accessed = True  # type: ignore
     selected = request.accept_languages.best_match(
         current_app.config['LANGUAGES']
     ) or current_app.config['LANGUAGES'][0]
@@ -72,12 +68,6 @@ def format_bytes(n: float) -> str:
     return "{} {}".format(n, unit)
 
 
-def add_vary_language_header(resp: quart.Response) -> quart.Response:
-    if getattr(g, "language_header_accessed", False):
-        resp.vary.add("Accept-Language")
-    return resp
-
-
 def init_templating(app: quart.Quart) -> None:
     app.template_filter("repr")(repr)
     app.template_filter("format_datetime")(flask_babel.format_datetime)
@@ -88,7 +78,6 @@ def init_templating(app: quart.Quart) -> None:
     app.template_filter("format_bytes")(format_bytes)
     app.template_filter("flatten")(flatten)
     app.template_filter("circle_name")(circle_name)
-    app.after_request(add_vary_language_header)
 
 
 def generate_error_id() -> str:

snikket_web/main.py

@@ -91,24 +91,27 @@ async def login() -> typing.Union[str, quart.Response]:
 @bp.route("/meta/about.html")
 async def about() -> str:
     version = None
+    core_versions = {}
     extra_versions = {}
-
     if current_app.debug or client.is_admin_session:
         version = _version.version
+        try:
+            core_versions["Prosody"] = await client.get_server_version()
+        except quart.exceptions.Unauthorized:
+            core_versions["Prosody"] = "unknown"
+
+    if current_app.debug:
         extra_versions["Quart"] = quart.__version__
         extra_versions["aiohttp"] = aiohttp.__version__
         extra_versions["babel"] = babel.__version__
         extra_versions["wtforms"] = wtforms.__version__
         extra_versions["flask-wtf"] = flask_wtf.__version__
-        try:
-            extra_versions["Prosody"] = await client.get_server_version()
-        except quart.exceptions.Unauthorized:
-            extra_versions["Prosody"] = "unknown"
 
     return await render_template(
         "about.html",
         version=version,
         extra_versions=extra_versions,
+        core_versions=core_versions,
     )
 
 

snikket_web/templates/about.html

@@ -17,9 +17,12 @@
 		<h3>{% trans %}Trademarks{% endtrans %}</h3>
 		<p>{% trans trademarks_url="https://snikket.org/about/trademarks/" %}“Snikket” and the parrot logo are trademarks of Snikket Community Interest Company. For more information about the trademarks, visit the <a href="{{ trademarks_url }}">Snikket Trademarks information page</a>.{% endtrans %}
 		<h3>{% trans %}Software Versions{% endtrans %}</h3>
-		<pre>Snikket Server
-Domain: {{ config["SNIKKET_DOMAIN"] }}
-Snikket Web Portal{% if version %} ({{ version }}){% endif %}
+		<pre>Domain: {{ config["SNIKKET_DOMAIN"] }}
+Web Portal{% if version %} ({{ version }}){% endif %}
+{%- if core_versions -%}
+{% for name, version in core_versions.items() %}
+{{ name }} ({{ version }}){% endfor %}
+{%- endif -%}
 {%- if extra_versions -%}
 {% for name, version in extra_versions.items() %}
 {{ name }} ({{ version }}){% endfor %}

snikket_web/translations/pl/LC_MESSAGES/messages.po

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: translations@snikket.org\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-01-17 17:27+0100\n"
-"PO-Revision-Date: 2022-01-21 15:00+0000\n"
+"PO-Revision-Date: 2021-09-03 15:00+0000\n"
 "Last-Translator: misiek <migelazur@mailbox.org>\n"
 "Language-Team: Polish <http://i18n.sotecware.net/projects/snikket/web-portal/"
 "pl/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.8.1\n"
+"X-Generator: Weblate 4.7.2\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: snikket_web/admin.py:68 snikket_web/templates/admin_delete_user.html:10
@@ -222,8 +222,6 @@ msgid ""
 "The account data you tried to import is too large to upload. Please contact "
 "your Snikket operator."
 msgstr ""
-"Plik z danymi konta, które próbujesz zaimportować, jest zbyt duży. "
-"Skontaktuj się z administratorem twojego serwera Snikket."
 
 #: snikket_web/invite.py:112
 msgid "Username"
@@ -264,11 +262,11 @@ msgstr "Zmień hasło"
 
 #: snikket_web/invite.py:244
 msgid "Account data file"
-msgstr "Plik z danymi konta"
+msgstr ""
 
 #: snikket_web/invite.py:248
 msgid "Import data"
-msgstr "Importuj dane"
+msgstr ""
 
 #: snikket_web/invite.py:269
 #, python-format
@@ -276,8 +274,6 @@ msgid ""
 "The account data you tried to import is in an unknown format. Please upload "
 "an XML file in XEP-0227 format (provided format: %(mimetype)s)."
 msgstr ""
-"Dane konta, które próbujesz zaimportować, mają nieznany format. Proszę "
-"wybrać plik w formacie XML zgodnym z XEP-0227 (podany format: %(mimetype)s)."
 
 #: snikket_web/invite.py:289 snikket_web/templates/unauth.html:18
 #: snikket_web/user.py:178
@@ -346,11 +342,11 @@ msgstr "Zaktualizuj profil"
 
 #: snikket_web/user.py:82
 msgid "Account data"
-msgstr "Dane konta"
+msgstr ""
 
 #: snikket_web/user.py:86
 msgid "Upload"
-msgstr "Prześlij"
+msgstr ""
 
 #: snikket_web/user.py:111
 msgid "Incorrect password."
@@ -374,11 +370,11 @@ msgstr "Zaktualizowano profil"
 
 #: snikket_web/user.py:184
 msgid "Export"
-msgstr "Eksportuj"
+msgstr ""
 
 #: snikket_web/user.py:202
 msgid "You currently have no account data to export."
-msgstr "Obecnie nie masz danych konta, które można wyeksportować."
+msgstr ""
 
 #: snikket_web/templates/_footer.html:4
 #, python-format
@@ -1021,7 +1017,7 @@ msgstr "Status serwera Snikket"
 
 #: snikket_web/templates/admin_system.html:71
 msgid "Storage used by shared files"
-msgstr "Miejsce wykorzystane przez przesłane pliki"
+msgstr ""
 
 #: snikket_web/templates/admin_system.html:79
 msgid "Connected devices"
@@ -1318,21 +1314,22 @@ msgid ""
 "You can now safely close this page, or log in to the web portal to <a href="
 "\"%(login_url)s\">manage your account</a>."
 msgstr ""
-"Możesz bezpiecznie zamknąć tę stronę lub zalogować się do Portalu "
-"Użytkownika Snikket, aby <a href=\"%(login_url)s\">zarządzać swoim "
-"kontem</a>."
 
 #: snikket_web/templates/invite_success.html:21
+#, fuzzy
+#| msgid "Operation successful"
 msgid "Import successful"
-msgstr "Import zakończony sukcesem"
+msgstr "Operacja zakończona sukcesem"
 
 #: snikket_web/templates/invite_success.html:22
 msgid "Congratulations! Your account data has been successfully imported."
-msgstr "Gratulacje! Dane twojego konta zostały prawidłowo zaimportowane."
+msgstr ""
 
 #: snikket_web/templates/invite_success.html:26
+#, fuzzy
+#| msgid "Using the Snikket app"
 msgid "Moving to Snikket?"
-msgstr "Przenosisz się na Snikket?"
+msgstr "Używając aplikacji Snikket"
 
 #: snikket_web/templates/invite_success.html:27
 msgid ""
@@ -1341,14 +1338,10 @@ msgid ""
 "information, etc.) from your previous account. When you have exported the "
 "data from your previous account, upload it using the form below."
 msgstr ""
-"Jeśli przenosisz się z innego serwera Snikket lub kompatybilnej usługi XMPP, "
-"możesz opcjonalnie zaimportować dane (kontakty, informacje o profilu, itp.) "
-"ze swojego poprzedniego konta. Gdy wyeksportujesz dane z poprzedniej usługi, "
-"możesz je przesłać za pomocą poniższego formularza."
 
 #: snikket_web/templates/invite_success.html:30
 msgid "Upload account data"
-msgstr "Prześlij dane konta"
+msgstr ""
 
 #: snikket_web/templates/invite_view.html:6
 #, python-format
@@ -1589,8 +1582,10 @@ msgstr "Edytuj profil"
 
 #: snikket_web/templates/user_home.html:33
 #: snikket_web/templates/user_manage_data.html:4
+#, fuzzy
+#| msgid "Manage users"
 msgid "Manage your data"
-msgstr "Zarządzaj danymi konta"
+msgstr "Zarządzaj użytkownikami"
 
 #: snikket_web/templates/user_home.html:39
 msgid "Your Snikket"
@@ -1618,16 +1613,16 @@ msgstr ""
 "podłączone urządzenia."
 
 #: snikket_web/templates/user_manage_data.html:8
+#, fuzzy
+#| msgid "Your account"
 msgid "Export account"
-msgstr "Wyeksportuj swoje dane"
+msgstr "Twoje konto"
 
 #: snikket_web/templates/user_manage_data.html:9
 msgid ""
 "Download your account data as a file for backup purposes or to move your "
 "account to another service."
 msgstr ""
-"Pobierz dane swojego konta jako plik w celu backupu lub przeniesienia konta "
-"na inną usługę."
 
 #: snikket_web/templates/user_passwd.html:5
 msgid "Change your password"