mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
12040 commits 12 branches 101 tags 40 MiB
Commit graph

12040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kim Alvefur
58c9115351 util.format: Ensure metatable __tostring results are also sanitized 2021-12-13 16:34:55 +01:00
Kim Alvefur
283042d7c3 mod_smacks: Include reason for destroying session on hibernation timeout 
To aid in debugging
 2021-12-12 18:38:40 +01:00
Kim Alvefur
725bb0cb15 tools/generate_format_spec: Apply lua-format to silence luacheck 2021-12-11 20:58:09 +01:00
Kim Alvefur
d482ece962 util.format: Fix some formats expecting positive numbers in Lua 5.2 
Amazing how string.format behaves differently under each Lua version
 2021-12-11 20:54:37 +01:00
Kim Alvefur
db41cd8e4d util.format: Fix Lua 5.1 quirks thanks to ALL THE TESTS 2021-12-11 20:40:23 +01:00
Kim Alvefur
3d0844a4f5 util.format: ALL THE TESTS!!! 
The more tests I made, the more Lua 5.1 quirks I discovered.

Tests generated using a tool plus some touch-up.
 2021-12-11 20:38:54 +01:00
Kim Alvefur
0ddd204a27 util.format: Also handle the %p format added in Lua 5.4 2021-12-11 13:39:58 +01:00
Kim Alvefur
1eca4e8870 util.format: Ensure sanitation of strings passed to wrong format 
Ie. log("debug", "%d", "\1\2\3") should not result in garbage.

Also optimizing for the common case of ASCII string passed to %s and
early returns everywhere.

Returning nil from a gsub callback keeps the original substring.
 2021-12-11 13:30:34 +01:00
Kim Alvefur
d4c1451794 util.format: Escape invalid UTF-8 by passing trough serialization 
Should prevent invalid UTF-8 from making it into the logs, which can
cause trouble with terminals or log viewers or other tools, such as when
grep determines that log files are binary.
 2021-12-10 22:48:45 +01:00
Kim Alvefur
ab4991e829 mod_mam: Avoid storing bounces for messages from the bare account (thanks Ge0rG) 
This should rule out error replies to PEP notifications, which come from
the account bare JID, and would be reflected back to it if they can't be
delivered for some reason, e.g. s2s problems.
 2021-12-10 22:25:34 +01:00
Kim Alvefur
449311b2d1 MUC: Remove <{muc}x> tags in some errors 
Including the payload of the stanza that caused the error is optional
and we're generally not doing it anywhere else.
 2021-12-08 21:55:25 +01:00
Kim Alvefur
1c0c380203 MUC: Fix error origin JID in wrong argument position 
Mistake introduced in cbe524ed1a6a.  Removing because this is a query to
the bare JID where the error origin matches the resulting stanza 'from'.
 2021-12-08 21:06:16 +01:00
Kim Alvefur
d621e0626c MUC: Remove remaining deprecated numeric error codes 
The numeric error codes seems to have been removed from the examples in
XEP-0045 version 1.24, and were deprecated even by RFC 3920 in 2004,
only allowed for backwards compatibility.
 2021-12-08 21:02:14 +01:00
Kim Alvefur
3ae5d13641 MUC: Return a friendly textual error when trying to speak without voice 
I spend several minutes confused over where the bug was until I
remembered I had set myself as visitor in the previous debug session.
This would have helped.
 2021-12-08 16:40:51 +01:00
Kim Alvefur
96b6f68b23 net.resolvers: Report when hostname fails IDNA 
Not a particularly user-friendly error message, but better than "unable
to resolve service" and having no clue where it came from.
 2021-12-07 21:43:36 +01:00
Matthew Wild
aa0b6f765a util.sasl.scram: Store username property rather than cached local (#399) 
This should allow modules to override the username in a profile handler by
assigning to self.username.
 2021-12-07 16:23:23 +00:00
Kim Alvefur
1ffb6f0b3d mod_admin_shell: Add port as a c2s/s2s:show column definition 
Allows inferring whether Direct TLS was used, or perhaps which SRV
record was chosen. Not shown by default.
 2021-12-07 13:21:20 +01:00
Kim Alvefur
f7527cc4f1 mod_pep: Set correct jid attr on node disco items 
It was previously set to the hostname, not the users bare JID which
would be correct.
 2021-12-07 13:04:52 +01:00
Kim Alvefur
f2f78d4bf9 mod_pubsub: Allow specifying the JID of the pubsub service 
This allows overriding it in cases where it is not equal to module.host,
like say, in mod_pep
 2021-12-07 13:03:55 +01:00
Kim Alvefur
a3c82c5d02 core.usermanager: Implement noop role writes on global authz provider 
So that the methods are there and don't cause an error.
 2021-12-06 22:38:27 +01:00
Kim Alvefur
9f2249b3db mod_admin_shell: Handle global roles (pass host=*) 
Is it not odd that um.set_roles() takes `nil` to mean global?
 2021-12-06 22:33:46 +01:00
Kim Alvefur
a45484c131 mod_admin_shell: Only check that local users exist locally 2021-12-06 22:23:38 +01:00
Kim Alvefur
022a48a578 mod_disco: Optionally return info on admin accounts to non-contacts 
If you already know the account, from say the server contact info, then
this confirms their admin status.
 2021-04-15 15:39:35 +02:00
Kim Alvefur
657290679d mod_disco: Advertise anonymous users 
Can these even be seen?
 2020-07-04 20:10:18 +02:00
Kim Alvefur
182816c1ae mod_disco: Advertise admin accounts as such via disco identity 2020-07-04 20:09:18 +02:00
Kim Alvefur
cf137f9902 mod_admin_shell: Support setting roles on hosts other than the users' 
Needed to e.g. grant admin rights on a component, or grant non-local
users local privileges.

Leave the same host syntax for convenience, since this might be the
common case.
 2021-12-06 21:56:19 +01:00
Kim Alvefur
efa1f442ae mod_admin_shell: Add command for updating roles user:roles(jid, roles) 
This would allow e.g. granting admin status without changing the config
and without a restart.
 2021-12-06 21:55:57 +01:00
Kim Alvefur
95fae62ac5 mod_admin_shell: Allow setting roles when creating user 2021-12-04 02:25:01 +01:00
Kim Alvefur
05a9010c85 net.server_epoll: Ensure calls to :write() return something 
With opportunistic writes enabled, writes can return what :onwritable()
returns, thus :onwritable() should return something sensible at each
spot.

Should prevent whatever caused
> Error writing to connection: (nil)
Tho this was probably harmless
 2021-12-06 10:59:14 +01:00
Kim Alvefur
2807299fba MUC: Allow modules a chance to act prior to room destruction 2021-12-05 14:49:06 +01:00
Kim Alvefur
d48fa1de17 mod_cron: Expose the One Timer via module environment 
This makes it easier to reschedule or otherwise manipulate the timer
from e.g. the shell, which is handy for debugging.
 2021-12-04 17:46:37 +01:00
Kim Alvefur
8bef874d8f mod_http_file_share: Fix to take retention time into account 
It was lost in 6f4790b8deec when switching to mod_cron.
 2021-12-04 16:48:39 +01:00
Kim Alvefur
ce345d2908 mod_http_file_share: Improve consistency of terminology in logging 
Prefer 'prune' over 'delete' since it more strongly implies removal of
excess.
 2021-12-04 15:03:26 +01:00
Kim Alvefur
7a1198b727 mod_http_file_share: Rename variable for clarity 2021-12-04 15:03:52 +01:00
Kim Alvefur
3e7177a533 mod_http_file_share: Fix deletion counter 
Before aa60f4353001 each loop had its own counter, seems incrementing of
one of them was lost. But only one is needed anyhow.
 2021-12-04 14:28:04 +01:00
Kim Alvefur
d4f8f23818 mod_http_file_share: Back out 876e1b6d6ae4 2021-12-03 10:43:02 +01:00
Kim Alvefur
9950712ba3 mod_http_file_share: Recalculate total storage usage weekly instead of daily 
Before mod_cron this job ran less frequently than the upload removal
job. Running them at the same frequency seems wasteful somehow, plus the
total should not drift away from the true value that fast.
 2021-12-03 09:08:23 +01:00
Kim Alvefur
8aa16eaec0 mod_cron: Add a 'weekly' job frequency 2021-12-03 09:05:41 +01:00
Kim Alvefur
d6070eea1f mod_cron: Initialize timestamp of new tasks to start of period 
Makes it more generic so new periods (e.g. weekly etc) can be added
easily.
 2021-12-03 09:01:09 +01:00
Kim Alvefur
914d3acbd5 mod_cron: Follow convention of imports at the top 2021-12-03 08:57:40 +01:00
Kim Alvefur
62ff00cd1f mod_http_file_share: Keep track of total storage use across restarts 
The value needs to be known in order to determine if additional uploads
can be accepted.
 2021-12-03 08:21:29 +01:00
Kim Alvefur
a3d8a25bdd mod_http_file_share: Fix measuring total storage use before it was known 
Passing nil to the metrics system causes errors later.
 2021-12-03 08:16:18 +01:00
Kim Alvefur
ca41268d26 mod_smacks: Refactor, simplify, optimize 
Since reply.attr.to will be the .attr.from of the input we can check
this earlier and avoid constructing the reply at all.
 2021-12-03 01:02:02 +01:00
Kim Alvefur
9f22150bc8 mod_smacks: Use function to construct error reply 
Did error_reply() not exist when mod_smacks was first created?
 2021-12-03 00:59:23 +01:00
Kim Alvefur
6f3409f3f2 mod_cron: Initialize daily tasks so they run around midnight UTC 
Eventually the goal is to have daily tasks run while there is little
activity, but that will vary with the server and the usage patterns of
its users. This is a start anyway.
 2021-12-03 00:11:31 +01:00
Kim Alvefur
82f6358657 mod_http_file_share: Keep global storage use accurate longer. 
Merging those loops removes the miscounting that would occur in case a
file could not be deleted, so no need to limit it to that case.
 2021-11-30 00:55:54 +01:00
Kim Alvefur
d2f4a57bfc mod_http_file_share: Merge file expiry loops 
Not sure what the benefit of two separate loops was, perhaps reduced
memory usage by allowing archive query state to be garbage collected
before moving on to deleting files. Never measured so probably not so.

This simplifies a bit.
 2021-11-30 00:53:22 +01:00
Kim Alvefur
4836354fd0 mod_http_file_share: Limit query to time since last expiry 
This is probably a bad idea, as files that could not be deleted for some
reason will not be tried again. I was just thinking of what the 'task'
argument could be used for.
 2021-11-30 00:52:07 +01:00
Kim Alvefur
2f274d8026 mod_admin_shell: List periodic tasks in module:info 2021-11-22 19:07:56 +01:00
Kim Alvefur
a70a8c4ffc mod_http_file_share: Switch to mod_cron for periodic tasks 2021-11-22 14:54:32 +01:00