aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mod_register_ibr: Fix reporting of registration rejection reasonKim Alvefur2020-04-231-1/+1
| | | | | When the reason is reported as an util.error object the `reason` field is empty and the reason text should be extacted from the error object.
* mod_register_limits: Fix typo error name (fix #1539 p2) (thanks Ge0rG)Kim Alvefur2020-04-231-1/+1
| | | | Probably because autocomplete.
* mod_register_limits: Fix order of arguments to util.error (fix #1539 p1) ↵Kim Alvefur2020-04-231-3/+3
| | | | (thanks Ge0rG)
* util.rsm: Don't convert values to strings that should already be stringsKim Alvefur2020-04-231-4/+4
| | | | Causes util.stanza to throw an error, which helps detect mistakes
* util.rsm: Explicitly serialize numbers in correct formatKim Alvefur2020-04-231-1/+7
|
* util.rsm: Test that Lua 5.3 floats are not encoded with decimal pointKim Alvefur2020-04-231-0/+7
| | | | | | | | The 'max' 'count' and 'index' fields are integers and should be encoded as such on the wire. Care needs to be taken because tostring(1.0) in Lua 5.3+ returns to "1.0" while in previous Lua versions it would return "1".
* util.rsm: Fix passing number as attributeKim Alvefur2020-04-231-1/+6
|
* util.rsm: Add testsKim Alvefur2020-04-231-0/+82
| | | | Based on examples from XEP-0059
* MUC tests: Add missing 'affiliation' attributeMatthew Wild2020-04-231-1/+1
|
* Merge with upstream trunkMatthew Wild2020-04-2311-22/+203
|\
| * mod_mam: Remove unused variables [luacheck]Kim Alvefur2020-04-231-4/+0
| | | | | | | | Logic using full vs bare JID addressing may return in the future.
| * mod_mam: Don't store any groupchat messagesKim Alvefur2020-04-231-1/+3
| | | | | | | | | | | | | | | | The intent was to not store MUC groupchat messages, which are sent from the MUC to local full JIDs, while allowing for potential future account based group chat. However, since this function handles messages in both directions and outgoing MUC messages are sent to the bare room JID, those were stored.
| * mod_lastactivity: Encode seconds as decimal, not floatKim Alvefur2020-04-221-1/+1
| | | | | | | | | | | | | | | | In Lua 5.3 difftime() takes integers as argument but returns a float, and then tostring() serializes it with a decimal point. This violates XEP-0012. Like #1536
| * mod_uptime: Encode uptime as decimal, fix #1536 (thanks Martin)Kim Alvefur2020-04-221-1/+1
| |
| * util.hashes: Fix output length of PBKDF2-HMAC-SHA256Kim Alvefur2020-04-222-1/+19
| | | | | | | | Somehow it got SHA1's 20 byte output instead of the proper 32 = 256/8
| * util.hashes: Use generic name of PBKDF2-HMAC-SHA1 function in testsKim Alvefur2020-04-221-5/+5
| |
| * mod_mam: Make note of Experimental (or Deferred) XEPsKim Alvefur2020-04-221-0/+3
| | | | | | | | | | Since these XEPs are subject to change we may need come back and double check these in the future.
| * mod_mam: Save delivery failures (thanks Ge0rG)Kim Alvefur2020-04-221-0/+3
| | | | | | | | | | Makes it possible to learn of delivery failure even if it came bouncing back while you were offline.
| * mod_mam: Keep chat markers (thanks Ge0rG)Kim Alvefur2020-04-221-0/+3
| |
| * mod_mam: Respect no-store hint (thanks Ge0rG)Kim Alvefur2020-04-221-1/+2
| | | | | | | | | | no-store is used in an example in XEP-0313, so obviously this is the preferred hint
| * mod_mam: Fix typo in commentKim Alvefur2020-04-211-1/+1
| | | | | | | | If it is with a body then it execution does not get this far
| * mod_mam: Prefer not archiving if no interesting payloads are foundKim Alvefur2020-04-211-1/+3
| |
| * mod_mam: Check sender of error instead of receiverKim Alvefur2020-04-211-0/+3
| | | | | | | | | | | | The intent is to capture errors to stanzas sent by the local user, so that they can see why a message failed to be delivered even if the error came after they went offline.
| * mod_mam: Store XEP-0184 receipts and requestsKim Alvefur2020-04-211-0/+5
| | | | | | | | Happy now Ge0rG?
| * mod_mam: Add more positive hints for storageKim Alvefur2020-04-211-0/+12
| | | | | | | | Mostly just lifted from mod_csi_simple
| * mod_mam: Rework hints handlingKim Alvefur2020-04-211-7/+6
| | | | | | | | Improved readability and early returns definite yes/no answer.
| * mod_mam: Invert check for typeKim Alvefur2020-04-211-5/+13
| | | | | | | | | | This is based on code in mod_csi_simple and aiming towards being more flexible and maintainable than a couple of tests for when not to store.
| * mod_mam: Log 'why' a stanza is archivedKim Alvefur2020-04-211-1/+1
| | | | | | | | | | Logging of 'why not' is already done. Why not both? Will make more sense when the rules evolve a bit.
| * mod_mam: Factor out "should we store this" into a functionKim Alvefur2020-04-211-13/+21
| | | | | | | | | | Meant to improve readability and ease further improvements to this algorithm.
| * mod_csi_simple: Consider MUC invites importantKim Alvefur2020-04-182-0/+11
| | | | | | | | | | Both mediated invites defined by XEP-0045: Multi-User Chat and direct invites defined by XEP-0249: Direct MUC Invitations
| * mod_lastactivity: Add basic scansion test coverageKim Alvefur2020-04-202-0/+46
| | | | | | | | When run on Lua 5.3 produces an issue similar to #1536
| * mod_uptime: Add scansion test coverageKim Alvefur2020-04-201-0/+21
| | | | | | | | | | Once the Prosody is up, who cares when it comes down? That's not my department, says scanison.
| * scansion: Mock time libraries during testsKim Alvefur2020-04-201-0/+11
| | | | | | | | The passage of time does not need test coverage, just look in a mirror.
| * mod_version: Add scansion testKim Alvefur2020-04-202-0/+29
| | | | | | | | Why was this module enabled in the config for tests if it wasn't tested?
* | Merge 0.11->trunkMatthew Wild2020-04-232-2/+2
|\ \ | |/ |/|
| * MUC tests: Add missing affiliation attributeMatthew Wild2020-04-231-1/+1
| |
| * Backed out changeset 18f2c7bc5795 (was testing against wrong branch)Matthew Wild2020-04-231-6/+2
| |
| * MUC tests: Add <required/> to expected form fieldMatthew Wild2020-04-231-2/+6
| |
| * MUC: Always include 'affiliation'/'role' attributes, defaulting to 'none' if nilMatthew Wild2020-04-231-1/+1
| |
* | mod_bosh, mod_websocket: Add config options to override GET responsesMatthew Wild2020-04-202-7/+13
| |
* | mod_c2s: Swap commentsKim Alvefur2020-04-191-2/+2
| |
* | migrator: Don't create unused directoryKim Alvefur2020-04-191-1/+0
| | | | | | | | I guess this contained the old per-store migrators
* | migrator: Inject data- and plugin paths during buildKim Alvefur2020-04-191-1/+3
| | | | | | | | Same way as with the prosody and prosodyctl executables
* | mod_csi_simple: Allow configuring extra tags indicating importanceKim Alvefur2020-04-181-1/+8
| |
* | util.sasl.digest-md5: Remove, obsolete since 2011Kim Alvefur2020-04-144-254/+1
| | | | | | | | | | | | | | RFC 6331 lists several problems with this outdated authentication mechanism. The code here was also completely ignored by lint checks and has probably not been used for a long time, as it is incompatible with SCRAM-hashed password storage.
* | Merge 0.11->trunkKim Alvefur2020-04-130-0/+0
|\|
| * core.certmanager: Move EECDH ciphers before EDH in default cipherstring ↵Kim Alvefur2019-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixes #1513) Backport of 94e341dee51c The original intent of having kEDH before kEECDH was that if a `dhparam` file was specified, this would be interpreted as a preference by the admin for old and well-tested Diffie-Hellman key agreement over newer elliptic curve ones. Otherwise the faster elliptic curve ciphersuites would be preferred. This didn't really work as intended since this affects the ClientHello on outgoing s2s connections, leading to some servers using poorly configured kEDH. With Debian shipping OpenSSL settings that enforce a higher security level, this caused interoperability problems with servers that use DH params smaller than 2048 bits. E.g. jabber.org at the time of this writing has 1024 bit DH params. MattJ says > Curves have won, and OpenSSL is less weird about them now
| * util.prosodyctl: Tell prosody do daemonize via command line flag (fixes #1514)Kim Alvefur2020-01-261-2/+2
| | | | | | | | Backport of 88be11e9f9b9
* | net.http.server: Use error code from util.error (fixes #1502)Kim Alvefur2020-04-121-0/+1
| | | | | | | | Oversight in 955e54e451dc when this was added.
* | mod_scansion_record: Indent stanzas in recordingsKim Alvefur2020-04-121-2/+1
| | | | | | | | Improves readability, easier to see structure.