* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* Taken from the UnrealIRCd 4.0 SVN version, based on
* InspIRCd 1.1.x.
*
- * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk
+ * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk
* This program is free but copyrighted software; see
* the file COPYING for details.
*
std::string password;
int searchscope;
LDAP *conn;
-
+
public:
- ModuleLDAPAuth(InspIRCd* Me)
- : Module::Module(Me)
- {
+ ModuleLDAPAuth()
+ {
conn = NULL;
Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
ServerInstance->Modules->Attach(eventlist, this, 2);
- OnRehash(NULL,"");
+ OnRehash(NULL);
}
virtual ~ModuleLDAPAuth()
ldap_unbind_ext(conn, NULL, NULL);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
-
+ ConfigReader Conf;
+
base = Conf.ReadValue("ldapoper", "baserdn", 0);
ldapserver = Conf.ReadValue("ldapoper", "server", 0);
std::string scope = Conf.ReadValue("ldapoper", "searchscope", 0);
username = Conf.ReadValue("ldapoper", "binddn", 0);
password = Conf.ReadValue("ldapoper", "bindauth", 0);
-
+
if (scope == "base")
searchscope = LDAP_SCOPE_BASE;
else if (scope == "onelevel")
searchscope = LDAP_SCOPE_ONELEVEL;
else searchscope = LDAP_SCOPE_SUBTREE;
-
+
Connect();
}
if (res != LDAP_SUCCESS)
{
conn = NULL;
- return false;
+ return false;
}
-
+
res = ldap_set_option(conn, LDAP_OPT_PROTOCOL_VERSION, (void *)&v);
if (res != LDAP_SUCCESS)
{
return true;
}
- virtual int OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
- {
+ virtual ModResult OnPassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+ {
User* user = dynamic_cast<User*>(ex);
- if (hashtype == "ldap")
+ if (hashtype == "ldap")
{
- if (LookupOper(user, data, input))
- {
+ if (LookupOper(user, data, input))
+ {
/* This is an ldap oper and has been found, claim the OPER command */
- return 1;
- }
- }
+ return MOD_RES_DENY;
+ }
+ }
/* We don't know this oper! */
- return 0;
- }
+ return MOD_RES_PASSTHRU;
+ }
bool LookupOper(User* user, const std::string &what, const std::string &opassword)
{
if ((res = ldap_sasl_bind_s(conn, username.c_str(), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL)) != LDAP_SUCCESS)
{
- free(authpass);
- ldap_unbind_ext(conn, NULL, NULL);
- conn = NULL;
- return false;
+ if (res == LDAP_SERVER_DOWN)
+ {
+ // Attempt to reconnect if the connection dropped
+ ServerInstance->SNO->WriteToSnoMask('a', "LDAP server has gone away - reconnecting...");
+ Connect();
+ res = ldap_sasl_bind_s(conn, username.c_str(), LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
+ }
+
+ if (res != LDAP_SUCCESS)
+ {
+ free(authpass);
+ ldap_unbind_ext(conn, NULL, NULL);
+ conn = NULL;
+ return false;
+ }
}
free(authpass);
free(authpass);
ldap_msgfree(msg);
return false;
- }
+ }
}
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+ return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
}
-
+
};
MODULE_INIT(ModuleLDAPAuth)