+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
#include <string>
#include <vector>
#include "hashcomp.h"
#include "inspircd.h"
-#include "ssl_cert.h"
+#include "transport.h"
/* $ModDesc: Provides SSL support for clients */
-/* $CompileFlags: -I/usr/include -I/usr/local/include */
-/* $LinkerFlags: -L/usr/local/lib -Wl,--rpath -Wl,/usr/local/lib -L/usr/lib -Wl,--rpath -Wl,/usr/lib -lssl */
-
-
+/* $CompileFlags: `perl extra/openssl_config.pl compile` */
+/* $LinkerFlags: `perl extra/openssl_config.pl link` */
+/* $ModDep: transport.h */
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
enum issl_io_status { ISSL_WRITE, ISSL_READ };
+static bool SelfSigned = false;
+
bool isin(int port, const std::vector<int> &portlist)
{
for(unsigned int i = 0; i < portlist.size(); i++)
return ERR_error_string(ERR_get_error(), NULL);
}
+/** Represents an SSL user's extra data
+ */
class issl_session : public classbase
{
public:
static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
{
+ /* XXX: This will allow self signed certificates.
+ * In the future if we want an option to not allow this,
+ * we can just return preverify_ok here, and openssl
+ * will boot off self-signed and invalid peer certs.
+ */
+ int ve = X509_STORE_CTX_get_error(ctx);
+
+ SelfSigned = (ve == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
+
return 1;
}
ModuleSSLOpenSSL(InspIRCd* Me)
: Module::Module(Me)
{
-
-
culllist = new CullList(ServerInstance);
+
+ ServerInstance->PublishInterface("InspSocketHook", this);
// Not rehashable...because I cba to reduce all the sizes of existing buffers.
inbufsize = ServerInstance->Config->NetBufferSize;
virtual void OnRehash(const std::string ¶m)
{
- if(param != "ssl")
+ if (param != "ssl")
return;
Conf = new ConfigReader(ServerInstance);
- for(unsigned int i = 0; i < listenports.size(); i++)
+ for (unsigned int i = 0; i < listenports.size(); i++)
{
ServerInstance->Config->DelIOHook(listenports[i]);
}
listenports.clear();
- for(int i = 0; i < Conf->Enumerate("bind"); i++)
+ for (int i = 0; i < Conf->Enumerate("bind"); i++)
{
// For each <bind> tag
- if(((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl"))
+ if (((Conf->ReadValue("bind", "type", i) == "") || (Conf->ReadValue("bind", "type", i) == "clients")) && (Conf->ReadValue("bind", "ssl", i) == "openssl"))
{
// Get the port we're meant to be listening on with SSL
- unsigned int port = Conf->ReadInteger("bind", "port", i, true);
- if (ServerInstance->Config->AddIOHook(port, this))
- {
- // We keep a record of which ports we're listening on with SSL
- listenports.push_back(port);
-
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", port);
- }
- else
+ std::string port = Conf->ReadValue("bind", "port", i);
+ irc::portparser portrange(port, false);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port);
+ if (ServerInstance->Config->AddIOHook(portno, this))
+ {
+ listenports.push_back(portno);
+ for (unsigned int i = 0; i < ServerInstance->stats->BoundPortCount; i++)
+ if (ServerInstance->Config->ports[i] == portno)
+ ServerInstance->Config->openSockfd[i]->SetDescription("ssl");
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno);
+ }
+ else
+ {
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno);
+ }
}
}
}
// +1 so we the path ends with a /
confdir = confdir.substr(0, confdir.find_last_of('/') + 1);
- cafile = Conf->ReadValue("openssl", "cafile", 0);
- // crlfile = Conf->ReadValue("openssl", "crlfile", 0);
- certfile = Conf->ReadValue("openssl", "certfile", 0);
- keyfile = Conf->ReadValue("openssl", "keyfile", 0);
- dhfile = Conf->ReadValue("openssl", "dhfile", 0);
+ cafile = Conf->ReadValue("openssl", "cafile", 0);
+ certfile = Conf->ReadValue("openssl", "certfile", 0);
+ keyfile = Conf->ReadValue("openssl", "keyfile", 0);
+ dhfile = Conf->ReadValue("openssl", "dhfile", 0);
// Set all the default values needed.
- if(cafile == "")
+ if (cafile == "")
cafile = "ca.pem";
- //if(crlfile == "")
- // crlfile = "crl.pem";
-
- if(certfile == "")
+ if (certfile == "")
certfile = "cert.pem";
- if(keyfile == "")
+ if (keyfile == "")
keyfile = "key.pem";
- if(dhfile == "")
+ if (dhfile == "")
dhfile = "dhparams.pem";
// Prepend relative paths with the path to the config directory.
- if(cafile[0] != '/')
+ if (cafile[0] != '/')
cafile = confdir + cafile;
//if(crlfile[0] != '/')
// crlfile = confdir + crlfile;
- if(certfile[0] != '/')
+ if (certfile[0] != '/')
certfile = confdir + certfile;
- if(keyfile[0] != '/')
+ if (keyfile[0] != '/')
keyfile = confdir + keyfile;
- if(dhfile[0] != '/')
+ if (dhfile[0] != '/')
dhfile = confdir + dhfile;
/* Load our keys and certificates*/
- if(!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str()))
+ if (!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str()))
{
ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s", certfile.c_str());
}
- if(!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))
+ if (!SSL_CTX_use_PrivateKey_file(ctx, keyfile.c_str(), SSL_FILETYPE_PEM))
{
ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s", keyfile.c_str());
}
/* Load the CAs we trust*/
- if(!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))
+ if (!SSL_CTX_load_verify_locations(ctx, cafile.c_str(), 0))
{
ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from ", cafile.c_str());
}
FILE* dhpfile = fopen(dhfile.c_str(), "r");
DH* ret;
- if(dhpfile == NULL)
+ if (dhpfile == NULL)
{
ServerInstance->Log(DEFAULT, "m_ssl_openssl.so Couldn't open DH file %s: %s", dhfile.c_str(), strerror(errno));
- throw ModuleException();
+ throw ModuleException("Couldn't open DH file " + dhfile + ": " + strerror(errno));
}
else
{
virtual void OnCleanup(int target_type, void* item)
{
- if(target_type == TYPE_USER)
+ if (target_type == TYPE_USER)
{
userrec* user = (userrec*)item;
- if(user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
+ if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && 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.
virtual void OnUnloadModule(Module* mod, const std::string &name)
{
- if(mod == this)
+ if (mod == this)
{
// We're being unloaded, kill all the users added to the cull list in OnCleanup
int numusers = culllist->Apply();
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Killed %d users for unload of OpenSSL SSL module", numusers);
for(unsigned int i = 0; i < listenports.size(); i++)
+ {
ServerInstance->Config->DelIOHook(listenports[i]);
+ for (unsigned int j = 0; j < ServerInstance->stats->BoundPortCount; j++)
+ if (ServerInstance->Config->ports[j] == listenports[i])
+ ServerInstance->Config->openSockfd[j]->SetDescription("plaintext");
+ }
}
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR);
+ return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
}
void Implements(char* List)
{
- 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_OnPostConnect] = 1;
+ List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
+ List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
+ }
+
+ virtual char* OnRequest(Request* request)
+ {
+ ISHRequest* ISR = (ISHRequest*)request;
+ ServerInstance->Log(DEBUG, "hook OnRequest");
+ if (strcmp("IS_NAME", request->GetId()) == 0)
+ {
+ return "openssl";
+ }
+ else if (strcmp("IS_HOOK", request->GetId()) == 0)
+ {
+ char* ret = "OK";
+ try
+ {
+ ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+ }
+ catch (ModuleException &e)
+ {
+ return NULL;
+ }
+
+ return ret;
+ }
+ else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
+ {
+ ServerInstance->Log(DEBUG, "Unhooking socket %08x", ISR->Sock);
+ return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+ }
+ else if (strcmp("IS_HSDONE", request->GetId()) == 0)
+ {
+ issl_session* session = &sessions[ISR->Sock->GetFd()];
+ return (session->status == ISSL_HANDSHAKING) ? NULL : (char*)"OK";
+ }
+ else if (strcmp("IS_ATTACH", request->GetId()) == 0)
+ {
+ issl_session* session = &sessions[ISR->Sock->GetFd()];
+ if (session)
+ {
+ VerifyCertificate(session, (InspSocket*)ISR->Sock);
+ return "OK";
+ }
+ }
+ return NULL;
}
+
virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
{
+ ServerInstance->Log(DEBUG, "Hook accept %d", fd);
issl_session* session = &sessions[fd];
session->fd = fd;
session->sess = SSL_new(ctx);
session->status = ISSL_NONE;
- if(session->sess == NULL)
+ if (session->sess == NULL)
{
ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error());
return;
}
- if(SSL_set_fd(session->sess, fd) == 0)
+ if (SSL_set_fd(session->sess, fd) == 0)
{
ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error());
return;
Handshake(session);
}
+ virtual void OnRawSocketConnect(int fd)
+ {
+ issl_session* session = &sessions[fd];
+
+ session->fd = fd;
+ session->inbuf = new char[inbufsize];
+ session->inbufoffset = 0;
+ session->sess = SSL_new(ctx);
+ session->status = ISSL_NONE;
+
+ if (session->sess == NULL)
+ {
+ ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't create SSL object: %s", get_error());
+ return;
+ }
+
+ if (SSL_set_fd(session->sess, fd) == 0)
+ {
+ ServerInstance->Log(DEBUG, "m_ssl.so: Couldn't set fd for SSL object: %s", get_error());
+ return;
+ }
+
+ Handshake(session);
+ }
+
virtual void OnRawSocketClose(int fd)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketClose: %d", fd);
CloseSession(&sessions[fd]);
+
+ EventHandler* user = ServerInstance->SE->GetRef(fd);
+
+ if ((user) && (user->GetExt("ssl_cert", dummy)))
+ {
+ ssl_cert* tofree;
+ user->GetExt("ssl_cert", tofree);
+ delete tofree;
+ user->Shrink("ssl_cert");
+ }
}
-
+
virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
{
issl_session* session = &sessions[fd];
- if(!session->sess)
+ if (!session->sess)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: No session to read from");
readresult = 0;
return 1;
}
- ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead(%d, buffer, %u, %d)", fd, count, readresult);
-
- if(session->status == ISSL_HANDSHAKING)
+ if (session->status == ISSL_HANDSHAKING)
{
- if(session->rstat == ISSL_READ || session->wstat == ISSL_READ)
+ if (session->rstat == ISSL_READ || session->wstat == ISSL_READ)
{
// The handshake isn't finished and it wants to read, try to finish it.
- if(Handshake(session))
+ if (Handshake(session))
{
// Handshake successfully resumed.
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: successfully resumed handshake");
return -1;
}
}
-
+
// If we resumed the handshake then session->status will be ISSL_OPEN
- if(session->status == ISSL_OPEN)
+ if (session->status == ISSL_OPEN)
{
- if(session->wstat == ISSL_READ)
+ if (session->wstat == ISSL_READ)
{
if(DoWrite(session) == 0)
return 0;
}
- if(session->rstat == ISSL_READ)
+ if (session->rstat == ISSL_READ)
{
int ret = DoRead(session);
- if(ret > 0)
+ if (ret > 0)
{
- if(count <= session->inbufoffset)
+ if (count <= session->inbufoffset)
{
memcpy(buffer, session->inbuf, count);
// Move the stuff left in inbuf to the beginning of it
{
issl_session* session = &sessions[fd];
- if(!session->sess)
+ if (!session->sess)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: No session to write to");
CloseSession(session);
return 1;
}
-
- ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: Adding %d bytes to the outgoing buffer", count);
+
session->outbuf.append(buffer, count);
- if(session->status == ISSL_HANDSHAKING)
+ if (session->status == ISSL_HANDSHAKING)
{
// The handshake isn't finished, try to finish it.
- if(session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
+ if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
{
- if(Handshake(session))
+ if (Handshake(session))
{
// Handshake successfully resumed.
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: OnRawSocketWrite: successfully resumed handshake");
}
}
- if(session->status == ISSL_OPEN)
+ if (session->status == ISSL_OPEN)
{
- if(session->rstat == ISSL_WRITE)
+ if (session->rstat == ISSL_WRITE)
{
DoRead(session);
}
- if(session->wstat == ISSL_WRITE)
+ if (session->wstat == ISSL_WRITE)
{
return DoWrite(session);
}
int DoWrite(issl_session* session)
{
+ if (!session->outbuf.size())
+ return -1;
+
+ ServerInstance->Log(DEBUG, "m_ssl_openssl.so: To write: %d", session->outbuf.size());
int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
- if(ret == 0)
+ if (ret == 0)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Client closed the connection");
CloseSession(session);
return 0;
}
- else if(ret < 0)
+ else if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
- if(err == SSL_ERROR_WANT_WRITE)
+ if (err == SSL_ERROR_WANT_WRITE)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written, need to retry: %s", get_error());
session->wstat = ISSL_WRITE;
return -1;
}
- else if(err == SSL_ERROR_WANT_READ)
+ else if (err == SSL_ERROR_WANT_READ)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Not all SSL data written but the damn thing wants to read instead: %s", get_error());
session->wstat = ISSL_READ;
}
else
{
- ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoWrite: Successfully wrote %d bytes", ret);
session->outbuf = session->outbuf.substr(ret);
return ret;
}
{
// Is this right? Not sure if the unencrypted data is garaunteed to be the same length.
// Read into the inbuffer, offset from the beginning by the amount of data we have that insp hasn't taken yet.
- ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: SSL_read(sess, inbuf+%d, %d-%d)", session->inbufoffset, inbufsize, session->inbufoffset);
int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset);
- if(ret == 0)
+ if (ret == 0)
{
// Client closed connection.
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Client closed the connection");
CloseSession(session);
return 0;
}
- else if(ret < 0)
+ else if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
- if(err == SSL_ERROR_WANT_READ)
+ if (err == SSL_ERROR_WANT_READ)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read, need to retry: %s", get_error());
session->rstat = ISSL_READ;
return -1;
}
- else if(err == SSL_ERROR_WANT_WRITE)
+ else if (err == SSL_ERROR_WANT_WRITE)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Not all SSL data read but the damn thing wants to write instead: %s", get_error());
session->rstat = ISSL_WRITE;
// Read successfully 'ret' bytes into inbuf + inbufoffset
// There are 'ret' + 'inbufoffset' bytes of data in 'inbuf'
// 'buffer' is 'count' long
-
- ServerInstance->Log(DEBUG, "m_ssl_openssl.so: DoRead: Read %d bytes, now have %d waiting to be passed up", ret, ret + session->inbufoffset);
session->inbufoffset += ret;
virtual void OnWhois(userrec* source, userrec* dest)
{
// Bugfix, only send this numeric for *our* SSL users
- if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports)))
+ if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports)))
{
- source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick);
+ ServerInstance->SendWhoisLine(source, dest, 320, "%s %s :is using a secure connection", source->nick, dest->nick);
}
}
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")
+ if (extname == "ssl")
{
// check if this user has an swhois field to send
if(user->GetExt(extname, dummy))
{
int ret = SSL_accept(session->sess);
- if(ret < 0)
+ if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
- if(err == SSL_ERROR_WANT_READ)
+ if (err == SSL_ERROR_WANT_READ)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to read again: %s", get_error());
session->rstat = ISSL_READ;
session->status = ISSL_HANDSHAKING;
}
- else if(err == SSL_ERROR_WANT_WRITE)
+ else if (err == SSL_ERROR_WANT_WRITE)
{
ServerInstance->Log(DEBUG, "m_ssl_openssl.so: Handshake: Not completed, need to write more data: %s", get_error());
session->wstat = ISSL_WRITE;
void CloseSession(issl_session* session)
{
- if(session->sess)
+ if (session->sess)
{
SSL_shutdown(session->sess);
SSL_free(session->sess);
}
- if(session->inbuf)
+ if (session->inbuf)
{
delete[] session->inbuf;
}
session->status = ISSL_NONE;
}
- void VerifyCertificate(issl_session* session, userrec* user)
+ void VerifyCertificate(issl_session* session, Extensible* user)
{
X509* cert;
ssl_cert* certinfo = new ssl_cert;
unsigned int n;
unsigned char md[EVP_MAX_MD_SIZE];
const EVP_MD *digest = EVP_md5();
- //char* buf;
user->Extend("ssl_cert",certinfo);
return;
}
- /*if (!X509_verify_cert(cert))
+ certinfo->data.insert(std::make_pair("invalid", SSL_get_verify_result(session->sess) != X509_V_OK ? ConvToStr(1) : ConvToStr(0)));
+
+ if (SelfSigned)
{
- certinfo->data.insert(std::make_pair("invalid",ConvToStr(1)));
+ certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(0)));
+ certinfo->data.insert(std::make_pair("trusted",ConvToStr(1)));
}
else
{
- certinfo->data.insert(std::make_pair("invalid",ConvToStr(0)));
- }*/
+ certinfo->data.insert(std::make_pair("unknownsigner",ConvToStr(1)));
+ certinfo->data.insert(std::make_pair("trusted",ConvToStr(0)));
+ }
- //X509_NAME_oneline(nm, 0, 0);
certinfo->data.insert(std::make_pair("dn",std::string(X509_NAME_oneline(X509_get_subject_name(cert),0,0))));
certinfo->data.insert(std::make_pair("issuer",std::string(X509_NAME_oneline(X509_get_issuer_name(cert),0,0))));
certinfo->data.insert(std::make_pair("fingerprint",irc::hex(md, n)));
}
- if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == -1))
+ if ((ASN1_UTCTIME_cmp_time_t(X509_get_notAfter(cert), time(NULL)) == -1) || (ASN1_UTCTIME_cmp_time_t(X509_get_notBefore(cert), time(NULL)) == 0))
{
certinfo->data.insert(std::make_pair("error","Not activated, or expired certificate"));
}
- /*if (cert->name)
- {
- certinfo->data.insert(std::make_pair("dn",cert->name));
- }*/
-
+ X509_free(cert);
}
};
projects / user / henk / code / inspircd.git / blobdiff