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

106 commits

Author SHA1 Message Date
Kim Alvefur
dc958f1e40 mod_admin_shell: Match substring in muc:affiliations() like muc:occupants() 
Maybe one day we'll get consistent filtering semantics everywhere.
 2023-01-30 00:14:50 +01:00
Kim Alvefur
1b71a53fb7 mod_admin_shell: Sort MUC users by relation and JID 
Suggested by MattJ, our resident UI expert :)
 2023-01-29 21:37:13 +01:00
Kim Alvefur
5c676bab58 mod_admin_shell: Make Role and Affiliation columns the same width for aesthetics 
The length of the title "Affiliation" made them both close enough that
it looked off.
 2023-01-29 18:57:28 +01:00
Kim Alvefur
6e120ad485 mod_admin_shell: Use tables to present MUC users 
Tables are awesome!
 2023-01-29 18:31:25 +01:00
Kim Alvefur
d5b5b5ba86 mod_admin_shell: Factor out room retrieval into common function 
Justification: See diffstat
 2023-01-29 17:55:56 +01:00
Kim Alvefur
08a730746c mod_admin_shell: Add muc:affiliations(room) command to list memberships 
Easier than going trough muc:room():each_affiliation() since you have to
do fiddly things to reach the print() function.
 2023-01-29 17:53:21 +01:00
Kim Alvefur
2b0584d2ee mod_admin_shell: Add muc:occupants(room) command to list occupants 
Easier than going trough muc:room():each_occupant() since you have to do
fiddly things to reach the print() function.
 2023-01-29 17:41:08 +01:00
Kim Alvefur
bd0e903b07 Merge 0.12->trunk 2022-10-24 15:25:12 +02:00
Kim Alvefur
20532df525 mod_admin_shell: Ensure available connection for column 'secure' 
Similar to #1777
 2022-10-23 16:22:12 +02:00
Kim Alvefur
c51152432a mod_admin_shell: Ensure connection exists to get port from (fixes #1777) 2022-10-23 16:19:39 +02:00
Kim Alvefur
8b82dc338c mod_admin_shell: Fix display of session without role (thanks Link Mauve) 
This can happen to sessions before they are assigned a role
 2022-09-23 11:58:15 +02:00
Kim Alvefur
ee21d9480a mod_admin_shell: Switch names for user role management commands 
user:roles() does not convey that this is the mutating command, it
should have been called setroles from the start but wasn't due to lack
of foresight. This has to accidentally removing roles when wanting to
show them.
 2022-08-15 18:56:22 +02:00
Kim Alvefur
95bba786f1 mod_admin_shell: Rename variable to avoid confusion with global function 
For luacheck, but it doesn't actually complain about this right now
 2022-08-25 22:42:41 +02:00
Kim Alvefur
b292127500 mod_admin_shell: Fix output from user:roles() 
It used _G.print instead of the shell session print, which would
silently write to stdout
 2022-08-25 22:40:41 +02:00
Kim Alvefur
96e172167d mod_admin_shell: Ensure account has role before it is usable 
By creating the account first without a password it can't be used until
the role has set. This is most important for restricted accounts, as a
failure to set the role would lead to the account having more privileges
than indented.
 2022-08-18 19:00:01 +02:00
Kim Alvefur
6f11c198b3 mod_admin_shell: Update help for user:create to reflect singular role argument 2022-08-18 18:10:18 +02:00
Matthew Wild
4db3f8cf46 mod_admin_shell: Update with new role management commands and help text 2022-08-18 16:46:07 +01:00
Kim Alvefur
1fac00b2af mod_admin_shell: Show session role in c2s:show 2022-08-15 16:36:00 +02:00
Matthew Wild
1f4c6548dc Merge 0.12->trunk 2022-08-18 15:43:16 +01:00
Kim Alvefur
dc79c92cbc mod_admin_shell: Tighten up type checks to fix #1754 (thanks clouded) 
Due to the dummy statistics provider (see core.statsmanager line 250)
having a metatable that allows infinite indexing where everything is
always the same table, which end up in suf() in the concatenation line.
 2022-05-15 23:16:14 +02:00
Kim Alvefur
0e6391e736 mod_admin_shell: Use a table to show help sections 
Because tables make everything better and more readable!
 2022-02-20 00:24:18 +01:00
Kim Alvefur
0e7e43f62f mod_admin_shell: Remove obsolete module:load() argument from 0.8 time 
This 'config' argument was removed without explanation in d8dbf569766c
 2022-08-05 14:41:13 +02:00
Kim Alvefur
5251c9b686 compat: Remove handling of Lua 5.1 location of 'unpack' function 2022-07-11 19:07:38 +02:00
Kim Alvefur
d0ab468f40 mod_admin_shell: Show session id ping reply came 
To point out which one when more than one connection was established, or
if it's an existing connection, allows correlation with s2s:show() or
with logs.
 2022-06-13 21:25:42 +02:00
Kim Alvefur
b0c116f47b mod_admin_shell: Include last (mod_cron) task run time in module:info() 
Don't think this is otherwise shown anywhere outside of debug logs
 2022-06-01 17:27:17 +02:00
Kim Alvefur
3717f5872a mod_admin_shell: Drop unused argument [luacheck] 2022-05-31 13:26:44 +02:00
Kim Alvefur
b7bd70874a mod_admin_shell: Show bound ports in module:info 
I.e. the subset of port:list() relevant to the specified module.
 2022-05-31 00:31:56 +02:00
Kim Alvefur
8ba6d3a2b1 mod_admin_shell: Document the 'watch' section in the built-in help 2022-05-30 14:54:10 +02:00
Kim Alvefur
0267554c8e prosodyctl shell: Communicate width of terminal to mod_admin_shell 
This lets it adjust the width of tables to the actual terminal width.
 2022-05-30 15:28:44 +02:00
Kim Alvefur
7bc35fb961 Merge 0.12->trunk 2022-05-15 23:22:33 +02:00
Jonas Schäfer
38346dd6f1 net: isolate LuaSec-specifics 
For this, various accessor functions are now provided directly on the
sockets, which reach down into the LuaSec implementation to obtain the
information.

While this may seem of little gain at first, it hides the implementation
detail of the LuaSec+LuaSocket combination that the actual socket and
the TLS layer are separate objects.

The net gain here is that an alternative implementation does not have to
emulate that specific implementation detail and "only" has to expose
LuaSec-compatible data structures on the new functions.
 2022-04-27 17:44:14 +02:00
Matthew Wild
1ef09e4285 mod_admin_shell: Add watch:stanzas() command 2022-03-23 13:43:08 +00:00
Kim Alvefur
f9478ab242 mod_admin_shell: Squeeze some characters out of the Certificate column 
The more compact these are, the better
 2022-02-17 01:41:57 +01:00
Kim Alvefur
89c2a5ac30 mod_admin_shell: Fix description of muc:room() (thanks Link Mauve) 
But then this is the internal API which is weird and unfriendly to
expose externally. Lots of methods to wrap tho ... one day.
 2022-02-15 22:14:40 +01:00
Kim Alvefur
fd5a0f6a06 mod_admin_shell: Track connected events instead of created 
The connection events are more appropriate here, where the s2s-created
events happens a bit later or earlier in a sessions lifetime depending
on its direction and for outgoing connections isn't actually the
creation time (which happens immediately after pressing enter, so not
very interesting), but rather closer to the connection time.
 2022-02-06 14:34:02 +01:00
Kim Alvefur
0bff4f57cc mod_admin_shell: Fix typo in comment [codespell] 2022-02-04 16:39:21 +01:00
Kim Alvefur
8fbf286e64 mod_admin_shell: Add descriptions of each column to 'help columns' 
Since some of the titles are quite dense
 2022-01-30 12:49:43 +01:00
Kim Alvefur
b5a87898ee mod_admin_shell: Use exact match instead of Lua patterns in c2s,s2s:show 
It is unexpected that 'example.com' matches 'exampleicom.org' and this
use of Lua patterns is undocumented and unlikely to be widely known or
used.
 2022-01-30 11:10:51 +01:00
Kim Alvefur
46ad556ca0 mod_admin_shell: Fix traceback on rendering graph of stats without extra labels 
Stops an error when extra_labels is nil since it attempts to index it

Unsure about correctness
 2022-01-29 15:01:38 +01:00
Kim Alvefur
d9f7b26328 mod_admin_shell: Add help section about stats 2022-01-29 14:58:37 +01:00
Kim Alvefur
09d7e131d0 mod_admin_shell: Add help section about customizing table columns 2022-01-28 20:39:13 +01:00
Kim Alvefur
7a706aecec mod_admin_shell: Add command to show current user roles 2022-01-23 20:06:50 +01:00
Kim Alvefur
1809c0460f mod_admin_shell: Add help section about roles 
As in the argument to user:create() and user:roles()

Tricky to come up with something sensible to write when Prosody core
only knows of the 'prosody:admin' role so far.
 2022-01-23 19:55:32 +01:00
Kim Alvefur
28bd099515 mod_admin_shell: Log creation of incoming s2s connections during ping 
The 's2s-created' fires just after accepting the TCP connection, before
the addresses are known, so this can have some false positives.
 2021-12-27 17:04:33 +01:00
Kim Alvefur
257f52d826 mod_admin_shell: Print s2s related events while waiting for ping 
Gives a better idea of what's taking time.
 2021-12-26 16:26:36 +01:00
Kim Alvefur
6e0bbc2af5 mod_smacks: Limit queue memory consumption using new util 
This brings back the queue size limit that was once added, then removed
because destroying the session when reaching the limit was not great.
Instead, the queue wraps and overwrites the oldest unacked stanza on the
assumption that it will probably be acked anyway and thus does not need
to be delivered. If those discarded stanzas turn out to be needed on
resumption then the resumption fails.
 2021-12-14 20:00:45 +01: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
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
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