From a97d3eaebe2e436c75528ced8f132117748e90dc Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sat, 28 Oct 2023 09:36:30 +0200 Subject: [PATCH 1/3] Long term solution for helm-charts --- core/admin/start.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/admin/start.py b/core/admin/start.py index d107270f..e9ba176e 100755 --- a/core/admin/start.py +++ b/core/admin/start.py @@ -27,7 +27,7 @@ if account is not None and domain is not None and password is not None: def test_unsupported(): import codecs - if os.path.isfile(codecs.decode('/.qbpxrerai', 'rot13')) or os.environ.get(codecs.decode('V_XABJ_ZL_FRGHC_QBRFAG_SVG_ERDHVERZRAGF_NAQ_JBAG_SVYR_VFFHRF_JVGUBHG_CNGPURF', 'rot13'), None): + if os.path.isfile(codecs.decode('/.qbpxrerai', 'rot13')) or os.environ.get(codecs.decode('V_XABJ_ZL_FRGHC_QBRFAG_SVG_ERDHVERZRAGF_NAQ_JBAG_SVYR_VFFHRF_JVGUBHG_CNGPURF', 'rot13'), None) or os.environ.get(codecs.decode('ZNVYH_URYZ_PUNEG'), None): return log.critical('Your system is not supported. Please start by reading the documentation and then http://www.catb.org/~esr/faqs/smart-questions.html') while True: From 82e0951e598283f587545b27ca4e8abfe3229965 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sat, 28 Oct 2023 11:23:46 +0200 Subject: [PATCH 2/3] Update core/admin/start.py Co-authored-by: Dimitri Huisman <52963853+Diman0@users.noreply.github.com> --- core/admin/start.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/admin/start.py b/core/admin/start.py index e9ba176e..9574bbb7 100755 --- a/core/admin/start.py +++ b/core/admin/start.py @@ -27,7 +27,7 @@ if account is not None and domain is not None and password is not None: def test_unsupported(): import codecs - if os.path.isfile(codecs.decode('/.qbpxrerai', 'rot13')) or os.environ.get(codecs.decode('V_XABJ_ZL_FRGHC_QBRFAG_SVG_ERDHVERZRAGF_NAQ_JBAG_SVYR_VFFHRF_JVGUBHG_CNGPURF', 'rot13'), None) or os.environ.get(codecs.decode('ZNVYH_URYZ_PUNEG'), None): + if os.path.isfile(codecs.decode('/.qbpxrerai', 'rot13')) or os.environ.get(codecs.decode('V_XABJ_ZL_FRGHC_QBRFAG_SVG_ERDHVERZRAGF_NAQ_JBAG_SVYR_VFFHRF_JVGUBHG_CNGPURF', 'rot13'), None) or os.environ.get(codecs.decode('ZNVYH_URYZ_PUNEG', 'rot13'), None): return log.critical('Your system is not supported. Please start by reading the documentation and then http://www.catb.org/~esr/faqs/smart-questions.html') while True: From eb110c8431b214b5b61a6e8423fbe445b6359f45 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sat, 28 Oct 2023 14:00:07 +0200 Subject: [PATCH 3/3] master uses SSO --- core/admin/mailu/internal/nginx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/admin/mailu/internal/nginx.py b/core/admin/mailu/internal/nginx.py index 12befa84..ebd677d0 100644 --- a/core/admin/mailu/internal/nginx.py +++ b/core/admin/mailu/internal/nginx.py @@ -50,7 +50,7 @@ def check_credentials(user, password, ip, protocol=None, auth_port=None, source_ app.logger.info(f'Login attempt for: {user}/{protocol}/{auth_port} from: {ip}/{source_port}: failed: badip: token-{token.id}: {token.comment or ""!r}') return False # we can return directly here since the token is valid if user.check_password(password): - if app.config['AUTH_REQUIRE_TOKENS'] and protocol != 'web': + if app.config['AUTH_REQUIRE_TOKENS'] and not protocol in ['web', 'sso']: app.logger.info(f'Login attempt for: {user}/{protocol}/{auth_port} from: {ip}/{source_port}: failed: password ok, but a token is required') return False else: