Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 05ba60b1dce778278f0e626aa54a16884440ef42..0f1f04e99cfe99f8676e30ef5ad6c807fe1ee891 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -21,9 +21,8 @@
 class CommandSSLInfo : public Command
 {
  public:
-       CommandSSLInfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
+       CommandSSLInfo(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "SSLINFO", 0, 1)
        {
-               this->source = "m_sslinfo.so";
                this->syntax = "<nick>";
        }
 
@@ -63,15 +62,14 @@ class CommandSSLInfo : public Command
 
 class ModuleSSLInfo : public Module
 {
-       CommandSSLInfo* newcommand;
+       CommandSSLInfo cmd;
  public:
        ModuleSSLInfo(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this)
        {
-               newcommand = new CommandSSLInfo(ServerInstance);
-               ServerInstance->AddCommand(newcommand);
+               ServerInstance->AddCommand(&cmd);
 
-               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
+               Implementation eventlist[] = { I_OnSyncUser, I_OnDecodeMetaData, I_OnWhois, I_OnPreCommand };
                ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
@@ -85,6 +83,14 @@ class ModuleSSLInfo : public Module
                return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if (target_type != TYPE_USER)
+                       return;
+               User* user = static_cast<User*>(item);
+               user->Shrink("ssl_cert");
+       }
+
        virtual void OnWhois(User* source, User* dest)
        {
                if(dest->GetExt("ssl"))
@@ -93,44 +99,30 @@ class ModuleSSLInfo : public Module
                }
        }
 
-       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+       virtual void OnSyncUser(User* user, Module* proto, void* opaque)
        {
-               // check if the linking module wants to know about OUR metadata
-               if (extname == "ssl")
-               {
-                       // check if this user has an ssl field to send
-                       if (!user->GetExt(extname))
-                               return;
-
-                       // call this function in the linking module, let it format the data how it
-                       // sees fit, and send it on its way. We dont need or want to know how.
-                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, displayable ? "Enabled" : "ON");
-               }
-               else if (extname == "ssl_cert")
-               {
-                       ssl_cert* cert;
-                       if (!user->GetExt("ssl_cert", cert))
-                               return;
-
-                       proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, cert->GetMetaLine().c_str());
-               }
+               if (user->GetExt("ssl"))
+                       proto->ProtoSendMetaData(opaque, user, "ssl", "ON");
+               
+               ssl_cert* cert;
+               if (user->GetExt("ssl_cert", cert))
+                       proto->ProtoSendMetaData(opaque, user, "ssl_cert", cert->GetMetaLine().c_str());
        }
 
-       virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+       virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
        {
+               User* dest = dynamic_cast<User*>(target);
                // check if its our metadata key, and its associated with a user
-               if ((target_type == TYPE_USER) && (extname == "ssl"))
+               if (dest && (extname == "ssl"))
                {
-                       User* dest = static_cast<User*>(target);
                        // if they dont already have an ssl flag, accept the remote server's
                        if (!dest->GetExt(extname))
                        {
                                dest->Extend(extname);
                        }
                }
-               else if ((target_type == TYPE_USER) && (extname == "ssl_cert"))
+               else if (dest && (extname == "ssl_cert"))
                {
-                       User* dest = static_cast<User*>(target);
                        if (dest->GetExt(extname))
                                return;
 
@@ -172,11 +164,11 @@ class ModuleSSLInfo : public Module
                return false;
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
-               irc::string cmd = command.c_str();
+               irc::string pcmd = command.c_str();
 
-               if ((cmd == "OPER") && (validated))
+               if ((pcmd == "OPER") && (validated))
                {
                        ConfigReader cf(ServerInstance);
                        char TheHost[MAXBUF];
@@ -220,7 +212,7 @@ class ModuleSSLInfo : public Module
                                if (SSLOnly && !user->GetExt("ssl"))
                                {
                                        user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
 
                                /*
@@ -231,13 +223,13 @@ class ModuleSSLInfo : public Module
                                        user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
                                        ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
                                        ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
 
                // Let core handle it for extra stuff
-               return 0;
+               return MOD_RES_PASSTHRU;
        }