aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.7->trunkMatthew Wild2010-05-238-60/+77
|\
| * Merge 0.7/waqas->0.7/MattJMatthew Wild2010-05-235-12/+15
| |\
| | * mod_private: Detect datamanager read errors, and respond with ↵Waqas Hussain2010-05-241-1/+5
| | | | | | | | | | | | 'internal-server-error'.
| | * usermanager: Take datamanager errors into account when determining account ↵Waqas Hussain2010-05-241-1/+2
| | | | | | | | | | | | existance.
| | * mod_presence: Don't send 'unsubscribed' in response to probes when roster ↵Waqas Hussain2010-05-241-2/+3
| | | | | | | | | | | | loading fails.
| | * rostermanager: Return an error string when subscription test fails due to an ↵Waqas Hussain2010-05-241-2/+2
| | | | | | | | | | | | error.
| | * rostermanager: Mark rosters which fail to load as broken, and never save them.Waqas Hussain2010-05-241-1/+2
| | |
| | * mod_presence: Removed a useless check when handling incoming presence probes ↵Waqas Hussain2010-05-241-4/+0
| | | | | | | | | | | | and subscriptions.
| | * util.datamanager: Return an error string when failing to save.Waqas Hussain2010-05-231-1/+1
| | |
| * | util.sasl.scram: Adjusting authentication backend name to conform with the ↵Tobias Markmann2010-02-281-1/+1
| | | | | | | | | | | | style already used by the plain module.
| * | util.sasl.scram: Fixing issue #177.Tobias Markmann2010-05-221-1/+1
| | |
| * | util.sasl.plain: Typo.Tobias Markmann2010-05-221-1/+1
| | |
| * | util.sasl.scram: Providing an API function to generate a salted password for ↵Tobias Markmann2010-05-221-1/+20
| | | | | | | | | | | | the SCRAM-SHA-1 mechanism.
| * | util.sasl.scram: Split up long line.Tobias Markmann2010-05-221-1/+2
| | |
| * | util.sasl.scram: Parsing client-final-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+1
| | | | | | | | | | | | Marc Santamaria)
| * | util.sasl.scram: Fix in nonce check of client-final-message.Tobias Markmann2010-05-221-2/+2
| | |
| * | util.sasl.scram: Parsing client-first-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+2
| | | | | | | | | | | | Marc Santamaria)
| * | util.sasl.scram: Check nonce in client final message. Check channel binding ↵Tobias Markmann2010-05-221-12/+26
| | | | | | | | | | | | flag in client first message. Adding some TODOs on more strict parsing. (thanks Marc Santamaria)
| * | util.sasl.scram: Fixed global access.Waqas Hussain2010-05-061-4/+4
| | |
| * | util.sasl.scram: Adding documentation on SCRAM authentication backend.Tobias Markmann2010-02-281-0/+10
| | |
| * | util.sasl: Abstracting out the hash function used since SCRAM is independent ↵Tobias Markmann2010-02-281-57/+75
| | | | | | | | | | | | of it. Adding scram-{mech} authentication backend support.
| * | util.sasl.plain: Removing plain_hashed authentication provider. Just do ↵Tobias Markmann2010-05-211-10/+1
| | | | | | | | | | | | hashing and comparison yourself in a plain_test authentication provider.
| * | util.sasl: 2009 -> 2010 in copyright header.Tobias Markmann2010-03-124-4/+4
| | |
| * | util.sasl.plain: Adding plain_hashed authentication backend support.Tobias Markmann2010-02-281-1/+10
| | |
| * | util.sasl: Moving SASL authentication backends documentation to the ↵Tobias Markmann2010-02-283-21/+30
| |/ | | | | | | mechanism files.
| * rostermanager: Correctly clear the bare_sessions table on roster load errors ↵Waqas Hussain2010-05-231-1/+1
| | | | | | | | during bind.
| * rostermanager: Don't fire roster-load event if there was an error loading ↵Matthew Wild2010-05-221-1/+3
| | | | | | | | the roster
| * sessionmanager: Change error for reaching resource limit from 'conflict' to ↵Waqas Hussain2010-05-221-1/+1
| | | | | | | | 'resource-constraint' during session bind.
| * sessionmanager: If roster loading fails during resource bind, kick the user ↵Waqas Hussain2010-05-221-1/+13
| | | | | | | | with an internal-server-error.
| * rostermanager: When loading the roster, also return a datamanager error if ↵Waqas Hussain2010-05-221-2/+3
| | | | | | | | available.
| * util.datamanager: When failing to load a file, and the file exists, return ↵Waqas Hussain2010-05-221-4/+12
| | | | | | | | nil, error.
| * mod_privacy: Improved logging.Waqas Hussain2010-05-221-8/+8
| |
| * mod_presence: Added option 'ignore_presence_priority'.Waqas Hussain2010-05-221-0/+10
| |
| * Merge with backoutMatthew Wild2010-05-211-30/+11
| |\
| | * Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to ↵Matthew Wild2010-05-211-30/+11
| | | | | | | | | | | | do this)
* | | util.sasl.scram: Fixing issue #177.Tobias Markmann2010-05-221-1/+1
| | |
* | | util.sasl.plain: Typo.Tobias Markmann2010-05-221-1/+1
| | |
* | | util.sasl.scram: Providing an API function to generate a salted password for ↵Tobias Markmann2010-05-221-1/+20
| | | | | | | | | | | | the SCRAM-SHA-1 mechanism.
* | | util.sasl.scram: Split up long line.Tobias Markmann2010-05-221-1/+2
| | |
* | | util.sasl.scram: Parsing client-final-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+1
| | | | | | | | | | | | Marc Santamaria)
* | | util.sasl.scram: Fix in nonce check of client-final-message.Tobias Markmann2010-05-221-2/+2
| | |
* | | util.sasl.scram: Parsing client-first-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+2
| | | | | | | | | | | | Marc Santamaria)
* | | util.sasl.scram: Check nonce in client final message. Check channel binding ↵Tobias Markmann2010-05-221-12/+26
| | | | | | | | | | | | flag in client first message. Adding some TODOs on more strict parsing. (thanks Marc Santamaria)
* | | util.sasl.plain: Removing plain_hashed authentication provider. Just do ↵Tobias Markmann2010-05-211-10/+1
| | | | | | | | | | | | hashing and comparison yourself in a plain_test authentication provider.
* | | Merge 0.7->trunkMatthew Wild2010-05-212-33/+25
|\| |
| * | mod_bosh: Re-layout session object creation to make lines shorterMatthew Wild2010-05-211-4/+8
| | |
| * | mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as ↵Matthew Wild2010-05-211-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 Wild2010-05-211-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 Wild2010-05-211-20/+1
| | | | | | | | | | | | exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway.
* | | Merge 0.7->trunkMatthew Wild2010-05-201-1/+10
|\| |