#include <string>
#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <unistd.h>
-
#include <gnutls/gnutls.h>
+#include "inspircd_config.h"
+#include "configreader.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
#include "helperfuncs.h"
#include "socket.h"
#include "hashcomp.h"
+#include "inspircd.h"
/* $ModDesc: Provides SSL support for clients */
/* $CompileFlags: `libgnutls-config --cflags` */
-/* $LinkerFlags: -L/usr/local/lib -Wl,--rpath -Wl,/usr/local/lib -L/usr/lib -Wl,--rpath -Wl,/usr/lib -lgnutls */
+/* $LinkerFlags: `libgnutls-config --libs` `perl ../gnutls_rpath.pl` */
+
+
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
-class issl_session
+bool isin(int port, const std::vector<int> &portlist)
+{
+ for(unsigned int i = 0; i < portlist.size(); i++)
+ if(portlist[i] == port)
+ return true;
+
+ return false;
+}
+
+class issl_session : public classbase
{
public:
gnutls_session_t sess;
int fd;
};
-class ModuleSSL : public Module
+class ModuleSSLGnuTLS : public Module
{
- Server* Srv;
- ServerConfig* SrvConf;
+
ConfigReader* Conf;
+
+ char* dummy;
+
+ CullList* culllist;
std::vector<int> listenports;
public:
- ModuleSSL(Server* Me)
+ ModuleSSLGnuTLS(InspIRCd* Me)
: Module::Module(Me)
{
- Srv = Me;
- SrvConf = Srv->GetConfig();
- Conf = new ConfigReader;
+
+
+ culllist = new CullList(ServerInstance);
// Not rehashable...because I cba to reduce all the sizes of existing buffers.
- inbufsize = SrvConf->NetBufferSize;
+ inbufsize = ServerInstance->Config->NetBufferSize;
gnutls_global_init(); // This must be called once in the program
if(gnutls_dh_params_init(&dh_params) < 0)
log(DEFAULT, "m_ssl_gnutls.so: Failed to initialise DH parameters");
- OnRehash("");
-
+ // Needs the flag as it ignores a plain /rehash
+ OnRehash("ssl");
+
// Void return, guess we assume success
gnutls_certificate_set_dh_params(x509_cred, dh_params);
}
- virtual void OnRehash(std::string param)
+ virtual void OnRehash(const std::string ¶m)
{
- delete Conf;
- Conf = new ConfigReader;
+ if(param != "ssl")
+ return;
+
+ Conf = new ConfigReader(ServerInstance);
for(unsigned int i = 0; i < listenports.size(); i++)
{
- SrvConf->DelIOHook(listenports[i]);
+ ServerInstance->Config->DelIOHook(listenports[i]);
}
listenports.clear();
for(int i = 0; i < Conf->Enumerate("bind"); i++)
{
// For each <bind> tag
- if((Conf->ReadValue("bind", "type", i) == "clients") && (Conf->ReadValue("bind", "ssl", i) == "gnutls"))
+ if(((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "gnutls"))
{
// Get the port we're meant to be listening on with SSL
unsigned int port = Conf->ReadInteger("bind", "port", i, true);
- SrvConf->AddIOHook(port, this);
-
- // We keep a record of which ports we're listening on with SSL
- listenports.push_back(port);
+ if (ServerInstance->Config->AddIOHook(port, this))
+ {
+ // We keep a record of which ports we're listening on with SSL
+ listenports.push_back(port);
- log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+ log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+ }
+ else
+ {
+ log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port);
+ }
}
}
+ std::string confdir(CONFIG_FILE);
+ // +1 so we the path ends with a /
+ confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
+
cafile = Conf->ReadValue("gnutls", "cafile", 0);
crlfile = Conf->ReadValue("gnutls", "crlfile", 0);
certfile = Conf->ReadValue("gnutls", "certfile", 0);
keyfile = Conf->ReadValue("gnutls", "keyfile", 0);
dh_bits = Conf->ReadInteger("gnutls", "dhbits", 0, false);
+ // Set all the default values needed.
if(cafile == "")
- cafile = "conf/ca.pem";
+ cafile = "ca.pem";
if(crlfile == "")
- crlfile = "conf/crl.pem";
+ crlfile = "crl.pem";
if(certfile == "")
- certfile = "conf/cert.pem";
+ certfile = "cert.pem";
if(keyfile == "")
- keyfile = "conf/key.pem";
+ keyfile = "key.pem";
if((dh_bits != 768) && (dh_bits != 1024) && (dh_bits != 2048) && (dh_bits != 3072) && (dh_bits != 4096))
dh_bits = 1024;
+
+ // Prepend relative paths with the path to the config directory.
+ if(cafile[0] != '/')
+ cafile = confdir + cafile;
+
+ if(crlfile[0] != '/')
+ crlfile = confdir + crlfile;
+
+ if(certfile[0] != '/')
+ certfile = confdir + certfile;
+
+ if(keyfile[0] != '/')
+ keyfile = confdir + keyfile;
if(gnutls_certificate_set_x509_trust_file(x509_cred, cafile.c_str(), GNUTLS_X509_FMT_PEM) < 0)
log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 trust file: %s", cafile.c_str());
if(gnutls_certificate_set_x509_key_file (x509_cred, certfile.c_str(), keyfile.c_str(), GNUTLS_X509_FMT_PEM) < 0)
log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 certificate and key files: %s and %s", certfile.c_str(), keyfile.c_str());
+ // This may be on a large (once a day or week) timer eventually.
+ GenerateDHParams();
+
+ DELETE(Conf);
+ }
+
+ void GenerateDHParams()
+ {
// Generate Diffie Hellman parameters - for use with DHE
// kx algorithms. These should be discarded and regenerated
// once a day, once a week or once a month. Depending on the
log(DEFAULT, "m_ssl_gnutls.so: Failed to generate DH parameters (%d bits)", dh_bits);
}
- virtual ~ModuleSSL()
+ virtual ~ModuleSSLGnuTLS()
{
- delete Conf;
gnutls_dh_params_deinit(dh_params);
gnutls_certificate_free_credentials(x509_cred);
gnutls_global_deinit();
+ delete culllist;
+ }
+
+ virtual void OnCleanup(int target_type, void* item)
+ {
+ if(target_type == TYPE_USER)
+ {
+ userrec* user = (userrec*)item;
+
+ if(user->GetExt("ssl", dummy) && isin(user->GetPort(), listenports))
+ {
+ // User is using SSL, they're a local user, and they're using one of *our* SSL ports.
+ // Potentially there could be multiple SSL modules loaded at once on different ports.
+ log(DEBUG, "m_ssl_gnutls.so: Adding user %s to cull list", user->nick);
+ culllist->AddItem(user, "SSL module unloading");
+ }
+ }
+ }
+
+ virtual void OnUnloadModule(Module* mod, const std::string &name)
+ {
+ if(mod == this)
+ {
+ // We're being unloaded, kill all the users added to the cull list in OnCleanup
+ int numusers = culllist->Apply();
+ log(DEBUG, "m_ssl_gnutls.so: Killed %d users for unload of GnuTLS SSL module", numusers);
+
+ for(unsigned int i = 0; i < listenports.size(); i++)
+ ServerInstance->Config->DelIOHook(listenports[i]);
+ }
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, 0);
+ return Version(1, 0, 0, 0, VF_VENDOR);
}
void Implements(char* List)
{
- List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = 1;
- List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = List[I_OnRehash] = List[I_OnWhois] = 1;
+ List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
+ List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnGlobalConnect] = 1;
}
- virtual void OnRawSocketAccept(int fd, std::string ip, int localport)
+ virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
{
issl_session* session = &sessions[fd];
gnutls_credentials_set(session->sess, GNUTLS_CRD_CERTIFICATE, x509_cred);
gnutls_certificate_server_set_request(session->sess, GNUTLS_CERT_REQUEST); // Request client certificate if any.
gnutls_dh_set_prime_bits(session->sess, dh_bits);
+
+ /* This is an experimental change to avoid a warning on 64bit systems about casting between integer and pointer of different sizes
+ * This needs testing, but it's easy enough to rollback if need be
+ * Old: gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket.
+ * New: gnutls_transport_set_ptr(session->sess, &fd); // Give gnutls the fd for the socket.
+ *
+ * With testing this seems to...not work :/
+ */
+
gnutls_transport_set_ptr(session->sess, (gnutls_transport_ptr_t) fd); // Give gnutls the fd for the socket.
Handshake(session);
virtual void OnRawSocketClose(int fd)
{
+ log(DEBUG, "OnRawSocketClose: %d", fd);
CloseSession(&sessions[fd]);
}
// As above
readresult = length;
}
-
- log(DEBUG, "m_ssl_gnutls.so: OnRawSocketRead: Passing %d bytes up to insp:");
- Srv->Log(DEBUG, std::string(buffer, readresult));
}
}
else if(session->status == ISSL_CLOSING)
return 1;
}
- virtual int OnRawSocketWrite(int fd, char* buffer, int count)
+ virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
{
issl_session* session = &sessions[fd];
const char* sendbuffer = buffer;
count = session->outbuf.size();
if(session->status == ISSL_HANDSHAKEN)
- {
- log(DEBUG, "m_ssl_gnutls.so: OnRawSocketWrite: Trying to write %d bytes:", count);
- Srv->Log(DEBUG, session->outbuf);
-
+ {
int ret = gnutls_record_send(session->sess, sendbuffer, count);
if(ret == 0)
return 1;
}
-
- virtual void OnUserQuit(userrec* user, std::string reason)
- {
- CloseSession(&sessions[user->fd]);
- }
// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
virtual void OnWhois(userrec* source, userrec* dest)
{
- if(dest->GetExt("ssl"))
+ // Bugfix, only send this numeric for *our* SSL users
+ if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports)))
{
- WriteServ(source->fd, "320 %s %s :is a Secure Connection", source->nick, dest->nick);
+ source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick);
}
}
- virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname)
+ virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
{
// check if the linking module wants to know about OUR metadata
if(extname == "ssl")
{
// check if this user has an swhois field to send
- if(user->GetExt(extname))
+ if(user->GetExt(extname, dummy))
{
// 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.
}
}
- virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+ virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
{
// check if its our metadata key, and its associated with a user
if ((target_type == TYPE_USER) && (extname == "ssl"))
{
userrec* dest = (userrec*)target;
// if they dont already have an ssl flag, accept the remote server's
- if (!dest->GetExt(extname))
+ if (!dest->GetExt(extname, dummy))
{
dest->Extend(extname, "ON");
}
log(DEBUG, "m_ssl_gnutls.so: Handshake completed");
// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
- Srv->FindDescriptor(session->fd)->Extend("ssl", "ON");
-
+ userrec* extendme = ServerInstance->FindDescriptor(session->fd);
+ if (extendme)
+ {
+ if (!extendme->GetExt("ssl", dummy))
+ extendme->Extend("ssl", "ON");
+ }
+
+ // Change the seesion state
session->status = ISSL_HANDSHAKEN;
+ // Finish writing, if any left
MakePollWrite(session);
return true;
}
}
+
+ virtual void OnGlobalConnect(userrec* user)
+ {
+ // This occurs AFTER OnUserConnect so we can be sure the
+ // protocol module has propogated the NICK message.
+ if ((user->GetExt("ssl", dummy)) && (IS_LOCAL(user)))
+ {
+ // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
+ std::deque<std::string>* metadata = new std::deque<std::string>;
+ metadata->push_back(user->nick);
+ metadata->push_back("ssl"); // The metadata id
+ metadata->push_back("ON"); // The value to send
+ Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
+ event->Send(ServerInstance); // Trigger the event. We don't care what module picks it up.
+ DELETE(event);
+ DELETE(metadata);
+ }
+ }
void MakePollWrite(issl_session* session)
{
}
};
-class ModuleSSLFactory : public ModuleFactory
+class ModuleSSLGnuTLSFactory : public ModuleFactory
{
public:
- ModuleSSLFactory()
+ ModuleSSLGnuTLSFactory()
{
}
- ~ModuleSSLFactory()
+ ~ModuleSSLGnuTLSFactory()
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
- return new ModuleSSL(Me);
+ return new ModuleSSLGnuTLS(Me);
}
};
extern "C" void * init_module( void )
{
- return new ModuleSSLFactory;
+ return new ModuleSSLGnuTLSFactory;
}
-
projects / user / henk / code / inspircd.git / blobdiff