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
11490 commits 12 branches 100 tags 40 MiB
Commit graph

11490 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kim Alvefur
483a869009 util.envload: Add basic test of envload() 2021-03-26 13:03:22 +01:00
Kim Alvefur
45acd03672 util.datamapper: Revert one special attribute to longer form 
Had a name, using attr() broke it.
 2021-03-26 13:01:16 +01:00
Kim Alvefur
f36d7d1161 util.datamapper: Use attribute convenience function throughout 2021-03-26 12:53:29 +01:00
Matthew Wild
d1ccd87d55 util.promise: Switch order of parameters to join() 
This saves awkward fiddlery with varargs and also echoes the
signature of pcall/xpcall.
 2021-03-25 15:08:22 +00:00
Matthew Wild
fec0d44e89 util.promise: all()/all_settled() pass through non-promise values 2021-03-25 14:32:32 +00:00
Matthew Wild
2141d9d94a util.promise: Add join() convenience method 
Usage: promise.join(p1, p2, function (result1, result2)
  [...]
end)
 2021-03-25 14:28:38 +00:00
Matthew Wild
3952fae8ce util.promise: Add support for arbitrary keys in all()/all_settled() 2021-03-25 13:51:16 +00:00
Kim Alvefur
85d3eb829b mod_message: Stop advertising offline message support (mod_offline does that) 
mod_offline also already advertises this feature, so it's added twice.
 2021-03-24 16:36:00 +01:00
Kim Alvefur
4720eea24f util.datamapper: Don't include empty unwrapped arrays 
Since there is no way to distinguish an empty such array from a
zero-length array. Dropping it seems like the least annoying thing to
do.
 2021-03-24 00:48:02 +01:00
Kim Alvefur
d68de27a5d util.datamapper: Add test coverage of unwrapped arrays of objects 
Should the xml name/ns go on the array or the items schema? The later
apparently.
 2021-03-24 00:34:22 +01:00
Kim Alvefur
13185a16ae util.datamapper: Fix error on attempt to coerce nil to something 
Turns falsy values into nil instead of nothing, which ensures this
function always has 1 return value, or table.insert({}) complains. Would
still happen on some unexpected input, but that's actually a good thing.
 2021-03-23 23:55:33 +01:00
Kim Alvefur
2ae58ee422 mod_admin_shell: Sort timers by time in debug:timers() 
Easier to see which timers are happening soon vs further in the future
if they are in some sensible order.
 2021-03-23 21:52:07 +01:00
Kim Alvefur
f7cfe660cd mod_c2s: Log a debug message before closing due to c2s_timeout 
It was confusing that the connection would just close without much
explanation.

Wanted this while investigating https://github.com/conversejs/converse.js/issues/2438
 2021-03-23 21:46:11 +01:00
Kim Alvefur
2040145780 util.datamapper: Deal with locally built stanzas missing xmlns 
So the problem is that xmlns is not inherited when building a stanza,
and then :get_child(n, ns) with an explicit namespace does not find that
such child tags.

E.g.
local t = st.stanza("foo", { xmlns = "urn:example:bar" })
	:text_tag("hello", "world");
assert(t:get_child("hello", "urn:example:bar"), "This fails");

Meanwhile, during parsing (util.xmppstream or util.xml) child tags do
get the parents xmlns when not overriding them.

Thus, in the above example, if the stanza is passed trough
`t = util.xml.parse(tostring(t))` then the assert succeeds.

This change makes it so that it leaves out the namespace argument to
:get_child when it is the same as the current/parent namespace, which
behaves the same for both built and parsed stanzas.
 2021-03-23 19:52:59 +01:00
Kim Alvefur
e783d99cc2 util.datamapper: Factor out conversion from any value to XML string 
Since this was the last severely duplicated code left.
 2021-03-22 22:24:39 +01:00
Kim Alvefur
f2f1714e47 mod_authz_internal: Ignore unused argument for now [luachec] 2021-03-22 22:01:49 +01:00
Jonas Schäfer
0ca317cd0b usermanager: expose set_roles through API 2021-03-22 21:24:57 +01:00
Jonas Schäfer
03d38b2a67 mod_authz_internal: add support for setting roles of a local user 2021-03-22 21:24:43 +01:00
Kim Alvefur
6f0532b89f util.datamapper: Handle nested arrays or objects in arrays 2021-03-22 10:05:41 +01:00
Kim Alvefur
f68d29bafd util.datamapper: Fix to skip parsing wrapped arrays that aren't there 
Turns out the unreachable error is reachable :D
 2021-03-22 10:03:32 +01:00
Kim Alvefur
110e82bd93 util.datamapper: Clear done TODO (arrays) 
Relevant commits:
* 6a51749af7f4
* 0e00fa518688
* d1982b7eb00d
* c098d07e6717
* 348b191cd850
 2021-03-21 02:26:28 +01:00
Kim Alvefur
4f191a3239 util.datamapper: Complete array building support 2021-03-20 21:29:51 +01:00
Kim Alvefur
366edae239 util.datamapper: Factor out handling of object properties for array reuse 2021-03-20 21:25:45 +01:00
Kim Alvefur
f5962d7193 util.datamapper: Finally implement support for parsing arrays 2021-03-20 20:45:06 +01:00
Kim Alvefur
87474145e5 util.datamapper: Factor out extraction of the XML part to use 
So extract_value() takes an XML tag and details about which part we're
interested in and returns that.

Factoring this out will help with array implementation since this will
be common behavior.
 2021-03-20 19:02:18 +01:00
Kim Alvefur
a51587da48 util.datamapper: Only get element name if there's an element 
Fixes error due to attempting to index a nil value
 2021-03-19 19:07:25 +01:00
Kim Alvefur
f6de136dc4 make: Magic trick for teal-src/*.tl -> ./*.lua 2021-03-19 15:51:38 +01:00
Kim Alvefur
7f04df223a util.datamapper: Fix arrays nesting one level too deep 2021-03-19 01:17:59 +01:00
Kim Alvefur
3c3cdcd0c7 util.datamapper: Deal with type name changes in util.jsonschema 2021-03-19 00:26:04 +01:00
Kim Alvefur
c1706af956 util.jsonschema: Rename types for improved readability 2021-03-18 23:57:03 +01:00
Kim Alvefur
d18097fb67 teal: Use new integer support in Teal 0.13.0 2021-03-18 23:16:41 +01:00
Kim Alvefur
576b43151c util.datamapper: Limited support for unparsing simple arrays of strings 2021-03-18 13:07:10 +01:00
Kim Alvefur
c62c5b307e util.datamapper: Add initial support for parsing arrays 2021-03-18 12:57:25 +01:00
Kim Alvefur
fb7df0067c util.datamapper: Factor out common schema unpacking 
This code extracts the bits from the schema that determines how the data
is to be mapped to/from XML.
 2021-03-14 16:50:49 +01:00
Kim Alvefur
3a62af2e0e util.datamapper: Separate extraction of xml from coercion to target type 
Now it gets the text, attribute or name first, then turns it into
whatever the schema wants. This should be easier to further factor out
into preparation for array support.
 2021-03-14 03:06:37 +01:00
Kim Alvefur
a7b010cbc5 util.datamapper: Use enum instead of mutually exclusive booleans 
Cleaner and rules out invalid combinations.
 2021-03-14 01:57:00 +01:00
Kim Alvefur
9d25c9c9ac util.datamapper: Enumerated elements 
E.g. error conditions or chat states.
 2021-03-12 01:33:15 +01:00
Kim Alvefur
465a8b8b1a util.datamapper: Some TODOs 2021-03-10 00:19:45 +01:00
Kim Alvefur
a09823e81c util.datamapper: Add references with notes 2021-03-10 00:19:38 +01:00
Kim Alvefur
832296535f util.datamapper: Add Copyright header 2021-03-10 00:18:39 +01:00
Kim Alvefur
ee7ffc309a util.jsonschema: Add copyright-header 2021-03-10 00:15:00 +01:00
Kim Alvefur
6db9456d88 util.jsonschema: Restructure "type" keyword handling 
More in line with the other tests
 2021-03-09 14:31:11 +01:00
Kim Alvefur
44edd47ca8 util.jsonschema: Syntax tweak to not upset syntax highlighting 
That whole condition stanza was shown as angry red, I think it's
something with 'enum' being a key word in Teal.
 2021-03-09 14:22:33 +01:00
Kim Alvefur
1317e78fbb util.jsonschema: Implement "propertyNames" 
This is a bit special in Lua as tables are not limited to string keys
 2021-03-09 02:43:50 +01:00
Kim Alvefur
d8303be145 util.jsonschema: Restructure handling of "properties" and "additionalProperties" 
This is a bit cleaner, I think
 2021-03-09 02:41:47 +01:00
Kim Alvefur
ae40825925 util.jsonschema: Fix "uniqueItems" prematurely declaring a match 2021-03-09 02:38:51 +01:00
Kim Alvefur
da85d37bcb util.jsonschema: Implement the "prefixItems" keyword 
This may have been what got me confused about "items" being an array.
 2021-03-09 02:36:08 +01:00
Kim Alvefur
ce4040e109 util.jsonschema: Implement the "contains" keyword 
And apparently I had mistaken this for an array
 2021-03-09 02:35:00 +01:00
Kim Alvefur
5a44c4a32b util.jsonschema: Allow a boolean as schema 
Apparently a schema must be either an object or a boolean. Not sure
where I got this string shortcut from, but I think I will keep it as it
is very convenient.
 2021-03-09 02:33:28 +01:00
Kim Alvefur
6a7346ac8e util.jsonschema: Correct "items" keyword 
Upon re-reading the JSON Schema spec, I found that 'items' wasn't a
union of an array of schemas or a single schema, not sure where I got
that from.
 2021-03-09 02:26:05 +01:00