Fix messaging tests

DoneSubmitted by Clément Lassieur.
Details
One participant
  • Clément Lassieur
Owner
unassigned
Severity
normal
C
C
Clément Lassieur wrote on 24 Nov 2017 23:51
(address . guix-patches@gnu.org)
87mv3bffyi.fsf@lassieur.org
This patches fix the messaging test that didn't work because Prosody andGNU Freetalk didn't agree on an authentication mechanism (since Prosody0.10).
C
C
Clément Lassieur wrote on 24 Nov 2017 23:52
[PATCH 1/2] services: prosody: Add support for disable-sasl-mechanisms.
(address . 29433@debbugs.gnu.org)
20171124225258.31595-1-clement@lassieur.org
* doc/guix.texi (Messaging Services): Update accordingly.* gnu/services/messaging.scm (prosody-configuration)[disable-sasl-mechanisms]:New field.--- doc/guix.texi | 11 ++++++++--- gnu/services/messaging.scm | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-)
Toggle diff (62 lines)diff --git a/doc/guix.texi b/doc/guix.texiindex dc2da7a45..a008b1c0a 100644--- a/doc/guix.texi+++ b/doc/guix.texi@@ -14029,6 +14029,11 @@ See @url{http://prosody.im/doc/modules/mod_tls}. Defaults to @samp{#f}. @end deftypevr +@deftypevr {@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms+Set of mechanisms that will never be offered. See+@url{https://prosody.im/doc/modules/mod_saslauth}.+@end deftypevr+ @deftypevr {@code{prosody-configuration} parameter} boolean s2s-require-encryption? Whether to force all server-to-server connections to be encrypted or not. See @url{http://prosody.im/doc/modules/mod_tls}.@@ -14106,7 +14111,7 @@ See @url{http://prosody.im/doc/configure#virtual_host_settings}. Available @code{virtualhost-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus:+all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{virtualhost-configuration} parameter} string domain Domain you wish Prosody to serve. @end deftypevr@@ -14128,7 +14133,7 @@ Defaults to @samp{()}. Available @code{int-component-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus:+all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{int-component-configuration} parameter} string hostname Hostname of the component. @end deftypevr@@ -14181,7 +14186,7 @@ Defaults to @samp{()}. Available @code{ext-component-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus:+all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{ext-component-configuration} parameter} string component-secret Password which the component will use to log in. @end deftypevrdiff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scmindex b66d6ddb9..c75c71585 100644--- a/gnu/services/messaging.scm+++ b/gnu/services/messaging.scm@@ -391,6 +391,12 @@ using them. See @url{http://prosody.im/doc/advanced_ssl_config}." See @url{http://prosody.im/doc/modules/mod_tls}." common) + (disable-sasl-mechanisms+ (string-list '("DIGEST-MD5"))+ "Set of mechanisms that will never be offered. See+@url{https://prosody.im/doc/modules/mod_saslauth}."+ common)+ (s2s-require-encryption? (boolean #f) "Whether to force all server-to-server connections to be encrypted or not.-- 2.15.0
C
C
Clément Lassieur wrote on 24 Nov 2017 23:52
[PATCH 2/2] tests: messaging: enable Prosody DIGEST-MD5 auth mechanism.
(address . 29433@debbugs.gnu.org)
20171124225258.31595-2-clement@lassieur.org
GNU Freetalk doesn't support SCRAM-SHA-1.
* gnu/tests/messaging.scm (%test-prosody): override defaultdisable-sasl-mechanisms value.--- gnu/tests/messaging.scm | 1 + 1 file changed, 1 insertion(+)
Toggle diff (14 lines)diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scmindex 0ba0c839d..60e2f332a 100644--- a/gnu/tests/messaging.scm+++ b/gnu/tests/messaging.scm@@ -146,6 +146,7 @@ (define %test-prosody (let* ((config (prosody-configuration+ (disable-sasl-mechanisms '()) (virtualhosts (list (virtualhost-configuration-- 2.15.0
C
C
Clément Lassieur wrote on 26 Nov 2017 18:12
control message for bug #29433
(address . control@debbugs.gnu.org)
87bmjpezfy.fsf@lassieur.org
tags 29433 fixedclose 29433
?
Your comment

This issue is archived.

To comment on this conversation send email to 29433@debbugs.gnu.org