You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2022/01/04 12:58:12 UTC

[incubator-ponymail-foal] branch master updated (1ea362f -> f9dc004)

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.


    from 1ea362f  Update version
     new 0fb7bfa  Require login for some version info
     new f9dc004  Update version

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 server/endpoints/preferences.py | 10 +++++++---
 server/server_version.py        |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

[incubator-ponymail-foal] 02/02: Update version

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit f9dc00478e6a72a29d9266b079733e41d6b52881
Author: Sebb <se...@apache.org>
AuthorDate: Tue Jan 4 12:58:03 2022 +0000

    Update version
---
 server/server_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server_version.py b/server/server_version.py
index 1e136fb..9a60844 100644
--- a/server/server_version.py
+++ b/server/server_version.py
@@ -1,2 +1,2 @@
 # This file is generated by server/update_version.sh
-PONYMAIL_SERVER_VERSION = '9875fce'
+PONYMAIL_SERVER_VERSION = '0fb7bfa'

[incubator-ponymail-foal] 01/02: Require login for some version info

Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 0fb7bfab1bec77ecd3e889fe0b25f01a7a4f6d22
Author: Sebb <se...@apache.org>
AuthorDate: Tue Jan 4 12:57:51 2022 +0000

    Require login for some version info
---
 server/endpoints/preferences.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/endpoints/preferences.py b/server/endpoints/preferences.py
index c082a50..79a8e25 100644
--- a/server/endpoints/preferences.py
+++ b/server/endpoints/preferences.py
@@ -31,12 +31,16 @@ async def process(
 ) -> typing.Union[dict, aiohttp.web.Response]:
 
     versions: dict = {
-        "server": server.server_version,
         "foal": server.foal_version,
-        "elasticsearch_engine": server.engine_version,
-        "elasticsearch_library": server.library_version
     }
 
+    # Require login for this info
+    if session.credentials and session.credentials.authoritative:
+        versions["server"] = server.server_version
+        if session.credentials.admin:
+            versions["elasticsearch_engine"] = server.engine_version
+            versions["elasticsearch_library"] = server.library_version
+
     prefs: dict = {"login": {}}
     prefs['versions'] = versions
     lists: dict = {}