Merge pull request #976 from SaberUK/master+fix-xline-db

[user/henk/code/inspircd.git] / src / modules / m_sqlauth.cpp

diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index ba969e54dad9853340a3a7f0e09693927c6c84eb..1a5b68dd9206ee0f0d1e6a967bca418d4ecfaa6d 100644 (file)
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -20,6 +20,7 @@
 #include "inspircd.h"
 #include "modules/sql.h"
 #include "modules/hash.h"
+#include "modules/ssl.h"
 
 enum AuthState {
        AUTH_STATE_NONE = 0,
@@ -77,17 +78,13 @@ class ModuleSQLAuth : public Module
        bool verbose;
 
  public:
-       ModuleSQLAuth() : pendingExt("sqlauth-wait", this), SQL(this, "SQL")
+       ModuleSQLAuth()
+               : pendingExt("sqlauth-wait", ExtensionItem::EXT_USER, this)
+               , SQL(this, "SQL")
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(pendingExt);
-               OnRehash(NULL);
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* conf = ServerInstance->Config->ConfValue("sqlauth");
                std::string dbid = conf->getString("dbid");
@@ -129,11 +126,14 @@ class ModuleSQLAuth : public Module
 
                HashProvider* md5 = ServerInstance->Modules->FindDataService<HashProvider>("hash/md5");
                if (md5)
-                       userinfo["md5pass"] = md5->hexsum(user->password);
+                       userinfo["md5pass"] = md5->Generate(user->password);
 
                HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
                if (sha256)
-                       userinfo["sha256pass"] = sha256->hexsum(user->password);
+                       userinfo["sha256pass"] = sha256->Generate(user->password);
+
+               const std::string certfp = SSLClientCert::GetFingerprint(&user->eh);
+               userinfo["certfp"] = certfp;
 
                SQL->submit(new AuthQuery(this, user->uuid, pendingExt, verbose), freeformquery, userinfo);