mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
13815 commits 12 branches 100 tags 40 MiB
Commit graph

43 commits

Author SHA1 Message Date
Kim Alvefur
2f37c443b8 core.configmanager: Add ways to read config values from files 
Inspired by something MattJ said

Allows retrieving config values from files which are expected to be
relative to the config directory, extending on the ENV_ method of
retrieving config values from outside the config file.

- FileLine retrieves the first line, stripping any trailing newline
- FileContents reads the whole file
- FileLines reads lines into an array
 2025-01-16 15:05:00 +01:00
Kim Alvefur
5915d6fbcd Merge 0.12->trunk 2024-06-12 23:20:48 +02:00
Kim Alvefur
11bc995c0b scansion: Enable blocklist compat during tests to fix CI 2024-06-12 23:00:24 +02:00
Kim Alvefur
6438e929b2 scansion: Use new style for accessing Lua globals 2023-12-17 16:41:47 +01:00
Kim Alvefur
0b5df6bdac scansion: Use new prosody namespace in import 2023-12-17 16:41:27 +01:00
Kim Alvefur
30f791386b scansion: Use captures or wildcards instead of mocking time 
> Mockery is one of the things I hold dear! And he's making a mockery of it!!
-- Belkar Bitterleaf
 2023-12-17 16:29:03 +01:00
Matthew Wild
00dfd64a86 integration tests: Preserve unmocked time.monotonic() 
With monotonic() frozen, timers may fail to trigger. This caused problems
after the new util.startup changes that moved the server-started event to a
timer. The timer wouldn't trigger, the event didn't fire, and prosody would
fail to daemonize.

All the tests that depend on specific time behaviour are depending on wall
clock time, so only mocking util.time.now() and os.time() fixes those.
 2023-04-06 14:00:54 +01:00
Matthew Wild
a68bddfee8 scansion: Enable mod_debug_reset during tests 2023-03-23 14:41:08 +00:00
Kim Alvefur
e2807b035e mod_mam: Store archives with sub-second precision timestamps 
Changes sub-second part of example timestamp to .5 in order to avoid
floating point issues.

Some clients use timestamps when ordering messages which can lead to
messages having the same timestamp ending up in the wrong order.

It would be better to preserve the order messages are sent in, which is
the order they were stored in.
 2022-08-14 17:28:31 +02:00
Kim Alvefur
7056bc0674 mod_tombstones: Add a very basic test case 2021-12-23 15:17:18 +01:00
Kim Alvefur
e1a84801f6 scansion tests: Enable 'expose_publisher' since we test for it 2021-07-25 13:52:52 +02:00
Kim Alvefur
d258cd5054 scansion tests: Allow specifying network settings via environment variable 
Allows testing e.g. opportunistic writes or other settings easily in CI
or otherwise without editing the config file.

make integration-test PROSODY_NETWORK_SETTINGS='{"opportunistic_writes":true}'
 2021-07-11 10:09:10 +02:00
Kim Alvefur
09d8f12548 scansion tests: Allow specifying network backend via environment variable 
To make it easier to test select and event without having to edit the
config file, e.g. in CI.

make integration-test PROSODY_NETWORK_BACKEND=event
 2021-07-11 10:09:07 +02:00
Kim Alvefur
0516d96335 scansion: Really silence the certificates dir error 
certificate_s_, plural, is the directory setting
 2021-05-28 00:17:44 +02:00
Kim Alvefur
36ea4c5717 scansion: Silence an error from cert indexer due to missing certs dir 2021-05-27 15:49:57 +02:00
Kim Alvefur
4395895fef core.modulemanager: Inherit mod_server_contact_info onto components #1270 2021-05-27 11:18:42 +02:00
Kim Alvefur
a87492d53c mod_server_contact_info: Apply JID normalization 2020-09-11 18:34:06 +02:00
Kim Alvefur
456ca909e2 mod_http_file_share: Add file type filter 
Unlike mod_http_upload, this can't be bypassed by uploading with a
different file extension.
 2021-01-26 14:53:43 +01:00
Kim Alvefur
a98f3a3e64 mod_http_file_share: Add file size limit (default 10M) 2021-01-26 14:53:24 +01:00
Kim Alvefur
4be9b33741 mod_http_file_share: Let's write another XEP-0363 implementation 
This variant is meant to improve upon mod_http_upload in some ways:

* Handle files much of arbitrary size efficiently
* Allow GET and PUT URLs to be different
* Remember Content-Type sent by client
* Avoid dependency on mod_http_files
* Built-in way to delegate storage to another httpd
 2021-01-26 03:19:17 +01:00
Kim Alvefur
5760514f5e scansion: Allow specifying a logfile for prosody via environment 
This should allow Buildbot to pick up those logs along with scansions
 2021-01-05 21:04:06 +01:00
Kim Alvefur
b289d05cfb mod_external_services: XEP-0215: External Service Discovery 2020-07-18 15:36:25 +02:00
Kim Alvefur
1c0950bc36 mod_server_contact_info: Add status-addresses field 
XEP-0157 version 1.1.0
 2020-05-27 19:47:52 +02:00
Kim Alvefur
b15a51597b scansion/prosody.cfg: Fix typo 2020-07-09 02:17:49 +02:00
Kim Alvefur
93400f60fb scansion tests: Enable mod_muc_mam during tests (expect breakage) 2020-06-21 19:09:47 +02:00
Kim Alvefur
4a0cb5a306 util.human.io: Fix right-alignment 2020-06-06 16:43:28 +02:00
Kim Alvefur
836be9b60d scansion: Add test for mod_server_contact_info / XEP-0157 2020-05-27 19:44:12 +02:00
Kim Alvefur
8be4a3edd7 mod_lastactivity: Add basic scansion test coverage 
When run on Lua 5.3 produces an issue similar to #1536
 2020-04-20 18:33:05 +02:00
Kim Alvefur
5955cc3924 scansion: Mock time libraries during tests 
The passage of time does not need test coverage, just look in a mirror.
 2020-04-20 18:20:24 +02:00
Kim Alvefur
9036462dcb mod_version: Add scansion test 
Why was this module enabled in the config for tests if it wasn't tested?
 2020-04-20 18:17:57 +02:00
Kim Alvefur
98ab88a9ff scansion tests: Remove daemonize option, not needed 2020-01-26 16:53:03 +01:00
Kim Alvefur
b1aadaced9 tests: Disable s2s in scansion tests 
These are all c2s tests, no need to have s2s enabled.
 2019-11-30 14:00:13 +01:00
Kim Alvefur
f724d890d2 tests: Disable TLS in scansion tests 
They were not using TLS before. With a36af4570b39 TLS context creation
will succeed even without a certificate, so TLS will be offered, but
since there is no certificate it does not work.
 2019-09-07 00:46:06 +02:00
Kim Alvefur
72f5bf7f3a Merge 0.11->trunk 2018-12-23 15:34:19 +01:00
Kim Alvefur
67a3bf56f3 mod_mam: Add test for JID normalization in prefs (see #1275) 2018-12-23 15:22:49 +01:00
Kim Alvefur
a270e6d5c8 spec/scansion/prosody.cfg.lua: Add remaining modules listened in prosody.cfg.lua.dist for easier comparisons 2018-12-11 23:26:16 +01:00
Kim Alvefur
35c3393bca spec/scansion/prosody.cfg.lua: Replace mod_vcard with mod_vcard4 and mod_vcard_legacy as in default config 2018-12-11 23:25:16 +01:00
Kim Alvefur
b1c3c4bc38 spec/scansion/prosody.cfg.lua: Update a comment from prosody.cfg.lua.dist for easier comparisons 2018-12-11 23:24:14 +01:00
Kim Alvefur
4c07742fbb spec/scansion/prosody.cfg.lua: Add comment about mod_scansion_record 
This was accidentally included in a previous commit, but having it here
makes it easier to enable when making new test cases.
 2018-11-12 22:49:54 +01:00
Kim Alvefur
cdf083b8d4 MUC: Add scanison test case for #1230 2018-11-12 18:25:40 +01:00
Matthew Wild
9e8c327fab spec/scansion/prosody.cfg.lua: daemonize by default 2018-09-12 14:59:52 +01:00
Matthew Wild
e0bae69e32 spec/scansion/prosody.cfg.lua: Add pidfile option so Prosody can be daemonized 2018-09-12 14:44:40 +01:00
Matthew Wild
6914b02449 spec/scansion/prosody.cfg.lua: Config file to be used for integration tests 2018-09-12 13:49:53 +01:00