Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.7/waqas->0.7/MattJ | Matthew Wild | 2010-05-23 | 5 | -12/+15 |
|\ | |||||
| * | mod_private: Detect datamanager read errors, and respond with ↵ | Waqas Hussain | 2010-05-24 | 1 | -1/+5 |
| | | | | | | | | 'internal-server-error'. | ||||
| * | usermanager: Take datamanager errors into account when determining account ↵ | Waqas Hussain | 2010-05-24 | 1 | -1/+2 |
| | | | | | | | | existance. | ||||
| * | mod_presence: Don't send 'unsubscribed' in response to probes when roster ↵ | Waqas Hussain | 2010-05-24 | 1 | -2/+3 |
| | | | | | | | | loading fails. | ||||
| * | rostermanager: Return an error string when subscription test fails due to an ↵ | Waqas Hussain | 2010-05-24 | 1 | -2/+2 |
| | | | | | | | | error. | ||||
| * | rostermanager: Mark rosters which fail to load as broken, and never save them. | Waqas Hussain | 2010-05-24 | 1 | -1/+2 |
| | | |||||
| * | mod_presence: Removed a useless check when handling incoming presence probes ↵ | Waqas Hussain | 2010-05-24 | 1 | -4/+0 |
| | | | | | | | | and subscriptions. | ||||
| * | util.datamanager: Return an error string when failing to save. | Waqas Hussain | 2010-05-23 | 1 | -1/+1 |
| | | |||||
* | | util.sasl.scram: Adjusting authentication backend name to conform with the ↵ | Tobias Markmann | 2010-02-28 | 1 | -1/+1 |
| | | | | | | | | style already used by the plain module. | ||||
* | | util.sasl.scram: Fixing issue #177. | Tobias Markmann | 2010-05-22 | 1 | -1/+1 |
| | | |||||
* | | util.sasl.plain: Typo. | Tobias Markmann | 2010-05-22 | 1 | -1/+1 |
| | | |||||
* | | util.sasl.scram: Providing an API function to generate a salted password for ↵ | Tobias Markmann | 2010-05-22 | 1 | -1/+20 |
| | | | | | | | | the SCRAM-SHA-1 mechanism. | ||||
* | | util.sasl.scram: Split up long line. | Tobias Markmann | 2010-05-22 | 1 | -1/+2 |
| | | |||||
* | | util.sasl.scram: Parsing client-final-message in a more strict way. (thanks ↵ | Tobias Markmann | 2010-05-22 | 1 | -4/+1 |
| | | | | | | | | Marc Santamaria) | ||||
* | | util.sasl.scram: Fix in nonce check of client-final-message. | Tobias Markmann | 2010-05-22 | 1 | -2/+2 |
| | | |||||
* | | util.sasl.scram: Parsing client-first-message in a more strict way. (thanks ↵ | Tobias Markmann | 2010-05-22 | 1 | -4/+2 |
| | | | | | | | | Marc Santamaria) | ||||
* | | util.sasl.scram: Check nonce in client final message. Check channel binding ↵ | Tobias Markmann | 2010-05-22 | 1 | -12/+26 |
| | | | | | | | | flag in client first message. Adding some TODOs on more strict parsing. (thanks Marc Santamaria) | ||||
* | | util.sasl.scram: Fixed global access. | Waqas Hussain | 2010-05-06 | 1 | -4/+4 |
| | | |||||
* | | util.sasl.scram: Adding documentation on SCRAM authentication backend. | Tobias Markmann | 2010-02-28 | 1 | -0/+10 |
| | | |||||
* | | util.sasl: Abstracting out the hash function used since SCRAM is independent ↵ | Tobias Markmann | 2010-02-28 | 1 | -57/+75 |
| | | | | | | | | of it. Adding scram-{mech} authentication backend support. | ||||
* | | util.sasl.plain: Removing plain_hashed authentication provider. Just do ↵ | Tobias Markmann | 2010-05-21 | 1 | -10/+1 |
| | | | | | | | | hashing and comparison yourself in a plain_test authentication provider. | ||||
* | | util.sasl: 2009 -> 2010 in copyright header. | Tobias Markmann | 2010-03-12 | 4 | -4/+4 |
| | | |||||
* | | util.sasl.plain: Adding plain_hashed authentication backend support. | Tobias Markmann | 2010-02-28 | 1 | -1/+10 |
| | | |||||
* | | util.sasl: Moving SASL authentication backends documentation to the ↵ | Tobias Markmann | 2010-02-28 | 3 | -21/+30 |
|/ | | | | mechanism files. | ||||
* | rostermanager: Correctly clear the bare_sessions table on roster load errors ↵ | Waqas Hussain | 2010-05-23 | 1 | -1/+1 |
| | | | | during bind. | ||||
* | rostermanager: Don't fire roster-load event if there was an error loading ↵ | Matthew Wild | 2010-05-22 | 1 | -1/+3 |
| | | | | the roster | ||||
* | sessionmanager: Change error for reaching resource limit from 'conflict' to ↵ | Waqas Hussain | 2010-05-22 | 1 | -1/+1 |
| | | | | 'resource-constraint' during session bind. | ||||
* | sessionmanager: If roster loading fails during resource bind, kick the user ↵ | Waqas Hussain | 2010-05-22 | 1 | -1/+13 |
| | | | | with an internal-server-error. | ||||
* | rostermanager: When loading the roster, also return a datamanager error if ↵ | Waqas Hussain | 2010-05-22 | 1 | -2/+3 |
| | | | | available. | ||||
* | util.datamanager: When failing to load a file, and the file exists, return ↵ | Waqas Hussain | 2010-05-22 | 1 | -4/+12 |
| | | | | nil, error. | ||||
* | mod_privacy: Improved logging. | Waqas Hussain | 2010-05-22 | 1 | -8/+8 |
| | |||||
* | mod_presence: Added option 'ignore_presence_priority'. | Waqas Hussain | 2010-05-22 | 1 | -0/+10 |
| | |||||
* | Merge with backout | Matthew Wild | 2010-05-21 | 1 | -30/+11 |
|\ | |||||
| * | Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to ↵ | Matthew Wild | 2010-05-21 | 1 | -30/+11 |
| | | | | | | | | do this) | ||||
* | | mod_bosh: Re-layout session object creation to make lines shorter | Matthew Wild | 2010-05-21 | 1 | -4/+8 |
| | | |||||
* | | mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as ↵ | Matthew Wild | 2010-05-21 | 1 | -1/+3 |
| | | | | | | | | encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP) | ||||
* | | mod_privacy: Fix several possible tracebacks when either the contact is a ↵ | Matthew Wild | 2010-05-21 | 1 | -9/+14 |
| | | | | | | | | host JID, or the contact isn't in your roster and you have roster group/subscription rules in place | ||||
* | | mod_privacy: Remove validation that checks a roster group you block actually ↵ | Matthew Wild | 2010-05-21 | 1 | -20/+1 |
| | | | | | | | | exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway. | ||||
* | | mod_saslauth: Split out cyrus SASL config options into locals, and add ↵ | Matthew Wild | 2010-05-20 | 1 | -1/+10 |
| | | | | | | | | support for cyrus_application_name (default: 'prosody') | ||||
* | | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵ | Matthew Wild | 2010-05-20 | 2 | -5/+15 |
| | | | | | | | | (default: not required) | ||||
* | | util.sasl_cyrus: Support for specifying the application name (to pass to ↵ | Matthew Wild | 2010-05-20 | 1 | -2/+2 |
| | | | | | | | | Cyrus SASL's init()) | ||||
* | | mod_saslauth: Add return value and error message to the Cyrus SASL ↵ | Matthew Wild | 2010-05-20 | 1 | -3/+4 |
| | | | | | | | | handle_status callback | ||||
* | | mod_saslauth: Allow the Cyrus SASL realm to be configurable | Matthew Wild | 2010-05-20 | 1 | -1/+1 |
| | | |||||
* | | net.dns: Remove redundant locals declaration | Matthew Wild | 2010-05-20 | 1 | -1/+0 |
| | | |||||
* | | net.dns: Fix dns.lookup from commit e54774bd73a7 | Matthew Wild | 2010-05-20 | 1 | -1/+1 |
| | | |||||
* | | mod_groups: Remove potentially verbose per-contact logging (thanks Flo) | Matthew Wild | 2010-05-20 | 1 | -3/+3 |
| | | |||||
* | | Merge 0.6->0.7 | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | configure: Fix to allow option values containing '=' (thanks Jakub) | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
| | | | |||||
* | | | net/dns: Fix socket.select timeout. | Brian Cully | 2009-12-28 | 1 | -1/+8 |
| | | | |||||
* | | | Merge 0.6->0.7 | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
|\| | |