From 06e2d5e2e95977311a488c8154c99bb06efd2bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 15 Apr 2020 12:04:05 +0200 Subject: [PATCH] Revert "Use hashed xmpp auth." This reverts commit 79e9bce07b308894aefae58f5a63150306733a9e. THis would break existing setups. Will revisit later on. --- prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 6 +++--- prosody/rootfs/defaults/prosody.cfg.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index ec4a34b..ecd43e7 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -33,7 +33,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}" cyrus_application_name = "xmpp" allow_unencrypted_plain_auth = true {{ else if eq $AUTH_TYPE "internal" }} - authentication = "internal_hashed" + authentication = "internal_plain" {{ end }} {{ else }} authentication = "anonymous" @@ -67,14 +67,14 @@ VirtualHost "{{ .Env.XMPP_AUTH_DOMAIN }}" key = "/config/certs/{{ .Env.XMPP_AUTH_DOMAIN }}.key"; certificate = "/config/certs/{{ .Env.XMPP_AUTH_DOMAIN }}.crt"; } - authentication = "internal_hashed" + authentication = "internal_plain" {{ if .Env.XMPP_RECORDER_DOMAIN }} VirtualHost "{{ .Env.XMPP_RECORDER_DOMAIN }}" modules_enabled = { "ping"; } - authentication = "internal_hashed" + authentication = "internal_plain" {{ end }} Component "{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }}" "muc" diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua index 1b03d22..9e215b9 100644 --- a/prosody/rootfs/defaults/prosody.cfg.lua +++ b/prosody/rootfs/defaults/prosody.cfg.lua @@ -126,7 +126,7 @@ s2s_secure_auth = false -- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed -- for information about using the hashed backend. -authentication = "internal_hashed" +authentication = "internal_plain" -- Select the storage backend to use. By default Prosody uses flat files -- in its configured data directory, but it also supports more backends