movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests/prosody[-mysql]: fix tests TLS setup

Browse source 
The tests TLS setup was bogus: the xmpp-send-message script was trying
to connect to the server through a bogus domain name. Injecting the
right one.

I'm a bit confused about that one. I know for sure this NixOS test
succeeded last time I checked it, but the TLS conf is bogus for sure.
I assume the slixmpp SNI validation was a bit too loose and was
tightened at some point.
This commit is contained in:
Félix Baylac-Jacqué 2022-11-23 11:05:12 +01:00
parent 501d684de8
commit 8040c468ed
No known key found for this signature in database
GPG key ID: EFD315F31848DBA4
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/xmpp/prosody.nix
View file

@ -42,7 +42,7 @@ in import ../make-test-python.nix {
${nodes.server.config.networking.primaryIPAddress} uploads.example.com ${nodes.server.config.networking.primaryIPAddress} uploads.example.com
''; '';
environment.systemPackages = [ environment.systemPackages = [
(pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = "example.com"; })
]; ];
}; };
server = { config, pkgs, ... }: { server = { config, pkgs, ... }: {
@ -82,6 +82,7 @@ in import ../make-test-python.nix {
testScript = { nodes, ... }: '' testScript = { nodes, ... }: ''
# Check with sqlite storage # Check with sqlite storage
start_all()
server.wait_for_unit("prosody.service") server.wait_for_unit("prosody.service")
server.succeed('prosodyctl status | grep "Prosody is running"') server.succeed('prosodyctl status | grep "Prosody is running"')

2
nixos/tests/xmpp/xmpp-sendmessage.nix
View file

@ -82,7 +82,7 @@ if __name__ == '__main__':
ct.register_plugin('xep_0363') ct.register_plugin('xep_0363')
# MUC # MUC
ct.register_plugin('xep_0045') ct.register_plugin('xep_0045')
ct.connect(("server", 5222)) ct.connect(("${connectTo}", 5222))
ct.process(forever=False) ct.process(forever=False)
if not ct.test_succeeded: if not ct.test_succeeded: