GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem when custom registered mechanism is used.

Browse Source 
User-defined mechanisms should be tested first. Added function to
determine whether a mechanism is built-in.
This commit is contained in:
Vincent Richard 2014-02-13 21:08:37 +01:00
parent dc5f9fd6e6
commit c655495025
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/vmime/security/sasl/SASLMechanismFactory.cpp
View File

@ -73,19 +73,15 @@ shared_ptr <SASLMechanism> SASLMechanismFactory::create
{ {
const string name(utility::stringUtils::toUpper(name_)); const string name(utility::stringUtils::toUpper(name_));
// Check for built-in mechanisms
if (isMechanismSupported(name))
{
return make_shared <builtinSASLMechanism>(ctx, name);
}
// Check for registered mechanisms // Check for registered mechanisms
else
{
MapType::iterator it = m_mechs.find(name); MapType::iterator it = m_mechs.find(name);
if (it != m_mechs.end()) if (it != m_mechs.end())
return (*it).second->create(ctx, name); return (*it).second->create(ctx, name);
}
// Check for built-in mechanisms
if (isBuiltinMechanism(name))
return make_shared <builtinSASLMechanism>(ctx, name);
throw exceptions::no_such_mechanism(name); throw exceptions::no_such_mechanism(name);
return null; return null;
@ -130,8 +126,13 @@ const std::vector <string> SASLMechanismFactory::getSupportedMechanisms() const
bool SASLMechanismFactory::isMechanismSupported(const string& name) const bool SASLMechanismFactory::isMechanismSupported(const string& name) const
{ {
return (gsasl_client_support_p(m_gsaslContext, name.c_str()) != 0 || return isBuiltinMechanism(name) || m_mechs.find(name) != m_mechs.end();
m_mechs.find(name) != m_mechs.end()); }
bool SASLMechanismFactory::isBuiltinMechanism(const string& name) const
{
return gsasl_client_support_p(m_gsaslContext, name.c_str()) != 0;
} }

9
src/vmime/security/sasl/SASLMechanismFactory.hpp
View File

@ -121,6 +121,15 @@ public:
*/ */
bool isMechanismSupported(const string& name) const; bool isMechanismSupported(const string& name) const;
/** Test whether an authentication mechanism is directly supported
* by the underlying SASL library.
*
* @param name mechanism name
* @return true if the specified mechanism is built-in,
* or false otherwise
*/
bool isBuiltinMechanism(const string& name) const;
private: private:
#ifdef GSASL_VERSION #ifdef GSASL_VERSION