/* $ModDesc: Provides SSL support for clients */
/* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
-/* $LinkerFlags: pkgconflibs("openssl","/libssl.so","-lssl -lcrypto") */
+/* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
/* $ModDep: transport.h */
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
for(unsigned int i = 0; i < portlist.size(); i++)
if(portlist[i] == port)
return true;
-
+
return false;
}
return ERR_error_string(ERR_get_error(), NULL);
}
+static int error_callback(const char *str, size_t len, void *u);
+
/** Represents an SSL user's extra data
*/
class issl_session : public classbase
char* inbuf; // Buffer OpenSSL reads into.
std::string outbuf; // Buffer for outgoing data that OpenSSL will not take.
int fd;
-
+ bool outbound;
+
issl_session()
{
+ outbound = false;
rstat = ISSL_READ;
wstat = ISSL_WRITE;
}
return 1;
}
-
+
class ModuleSSLOpenSSL : public Module
{
-
+
ConfigReader* Conf;
-
- CullList* culllist;
-
+
std::vector<int> listenports;
-
+
int inbufsize;
issl_session sessions[MAX_DESCRIPTORS];
-
+
SSL_CTX* ctx;
-
+ SSL_CTX* clictx;
+
char* dummy;
-
+
std::string keyfile;
std::string certfile;
std::string cafile;
// std::string crlfile;
std::string dhfile;
-
+
+ int clientactive;
+
public:
-
+
+ InspIRCd* PublicInstance;
+
ModuleSSLOpenSSL(InspIRCd* Me)
- : Module::Module(Me)
+ : Module::Module(Me), PublicInstance(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;
-
+
/* Global SSL library initialization*/
SSL_library_init();
SSL_load_error_strings();
-
- /* Build our SSL context*/
+
+ /* Build our SSL contexts:
+ * NOTE: OpenSSL makes us have two contexts, one for servers and one for clients. ICK.
+ */
ctx = SSL_CTX_new( SSLv23_server_method() );
+ clictx = SSL_CTX_new( SSLv23_client_method() );
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
+ SSL_CTX_set_verify(clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify);
// Needs the flag as it ignores a plain /rehash
OnRehash(NULL,"ssl");
}
-
+
virtual void OnRehash(userrec* user, const std::string ¶m)
{
if (param != "ssl")
return;
-
+
Conf = new ConfigReader(ServerInstance);
-
+
for (unsigned int i = 0; i < listenports.size(); i++)
{
ServerInstance->Config->DelIOHook(listenports[i]);
}
-
+
listenports.clear();
-
+ clientactive = 0;
+
for (int i = 0; i < Conf->Enumerate("bind"); i++)
{
// For each <bind> tag
long portno = -1;
while ((portno = portrange.GetToken()))
{
- if (ServerInstance->Config->AddIOHook(portno, this))
+ clientactive++;
+ try
{
- 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);
+ 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);
+ }
}
- else
+ catch (ModuleException &e)
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno);
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d: %s. Maybe it's already hooked by the same port on a different IP, or you have another SSL or similar module loaded?", portno, e.GetReason());
}
}
}
}
-
+
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("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 == "")
cafile = "ca.pem";
-
+
if (certfile == "")
certfile = "cert.pem";
-
+
if (keyfile == "")
keyfile = "key.pem";
-
+
if (dhfile == "")
dhfile = "dhparams.pem";
-
- // Prepend relative paths with the path to the config directory.
+
+ // 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 (dhfile[0] != '/')
dhfile = confdir + dhfile;
- /* Load our keys and certificates*/
- if (!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str()))
+ /* Load our keys and certificates
+ * NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
+ */
+ if ((!SSL_CTX_use_certificate_chain_file(ctx, certfile.c_str())) || (!SSL_CTX_use_certificate_chain_file(clictx, certfile.c_str())))
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s", certfile.c_str());
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read certificate file %s. %s", certfile.c_str(), strerror(errno));
+ ERR_print_errors_cb(error_callback, this);
}
- 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))) || (!SSL_CTX_use_PrivateKey_file(clictx, keyfile.c_str(), SSL_FILETYPE_PEM)))
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s", keyfile.c_str());
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read key file %s. %s", keyfile.c_str(), strerror(errno));
+ ERR_print_errors_cb(error_callback, this);
}
/* 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))) || (!SSL_CTX_load_verify_locations(clictx, cafile.c_str(), 0)))
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from ", cafile.c_str());
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Can't read CA list from %s. %s", cafile.c_str(), strerror(errno));
+ ERR_print_errors_cb(error_callback, this);
}
FILE* dhpfile = fopen(dhfile.c_str(), "r");
else
{
ret = PEM_read_DHparams(dhpfile, NULL, NULL, NULL);
-
- if(SSL_CTX_set_tmp_dh(ctx, ret) < 0)
+ if ((SSL_CTX_set_tmp_dh(ctx, ret) < 0) || (SSL_CTX_set_tmp_dh(clictx, ret) < 0))
{
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters");
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Couldn't set DH parameters %s. SSL errors follow:", dhfile.c_str());
+ ERR_print_errors_cb(error_callback, this);
}
}
-
+
fclose(dhpfile);
DELETE(Conf);
virtual ~ModuleSSLOpenSSL()
{
SSL_CTX_free(ctx);
- delete culllist;
+ SSL_CTX_free(clictx);
}
-
+
virtual void OnCleanup(int target_type, void* item)
{
if (target_type == TYPE_USER)
{
userrec* user = (userrec*)item;
-
+
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.
- culllist->AddItem(user, "SSL module unloading");
+ ServerInstance->GlobalCulls.AddItem(user, "SSL module unloading");
}
if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
{
}
}
}
-
+
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
- culllist->Apply();
-
for(unsigned int i = 0; i < listenports.size(); i++)
{
ServerInstance->Config->DelIOHook(listenports[i]);
}
}
}
-
+
virtual Version GetVersion()
{
return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
virtual void OnRawSocketAccept(int fd, const std::string &ip, int localport)
{
issl_session* session = &sessions[fd];
-
+
session->fd = fd;
session->inbuf = new char[inbufsize];
- session->inbufoffset = 0;
+ session->inbufoffset = 0;
session->sess = SSL_new(ctx);
session->status = ISSL_NONE;
-
+ session->outbound = false;
+
if (session->sess == NULL)
return;
-
+
if (SSL_set_fd(session->sess, fd) == 0)
+ {
+ ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
return;
+ }
Handshake(session);
}
session->fd = fd;
session->inbuf = new char[inbufsize];
session->inbufoffset = 0;
- session->sess = SSL_new(ctx);
+ session->sess = SSL_new(clictx);
session->status = ISSL_NONE;
+ session->outbound = true;
if (session->sess == NULL)
return;
if (SSL_set_fd(session->sess, fd) == 0)
+ {
+ ServerInstance->Log(DEBUG,"BUG: Can't set fd with SSL_set_fd: %d", fd);
return;
+ }
Handshake(session);
}
virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
{
issl_session* session = &sessions[fd];
-
+
if (!session->sess)
{
readresult = 0;
CloseSession(session);
return 1;
}
-
+
if (session->status == ISSL_HANDSHAKING)
{
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))
{
- // Couldn't resume handshake.
+ // Couldn't resume handshake.
return -1;
}
}
else
{
- return -1;
+ return -1;
}
}
// If we resumed the handshake then session->status will be ISSL_OPEN
-
+
if (session->status == ISSL_OPEN)
{
if (session->wstat == ISSL_READ)
if(DoWrite(session) == 0)
return 0;
}
-
+
if (session->rstat == ISSL_READ)
{
int ret = DoRead(session);
-
+
if (ret > 0)
{
if (count <= session->inbufoffset)
{
// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
memcpy(buffer, session->inbuf, session->inbufoffset);
-
+
readresult = session->inbufoffset;
// Zero the offset, as there's nothing there..
session->inbufoffset = 0;
}
-
+
return 1;
}
else
}
}
}
-
+
return -1;
}
-
+
virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
- {
+ {
issl_session* session = &sessions[fd];
if (!session->sess)
{
CloseSession(session);
- return 1;
+ return -1;
}
session->outbuf.append(buffer, count);
-
+
if (session->status == ISSL_HANDSHAKING)
{
// The handshake isn't finished, try to finish it.
if (session->rstat == ISSL_WRITE || session->wstat == ISSL_WRITE)
Handshake(session);
}
-
+
if (session->status == ISSL_OPEN)
{
if (session->rstat == ISSL_WRITE)
DoRead(session);
-
+
if (session->wstat == ISSL_WRITE)
return DoWrite(session);
}
-
+
return 1;
}
-
+
int DoWrite(issl_session* session)
{
if (!session->outbuf.size())
return -1;
int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
-
+
if (ret == 0)
{
CloseSession(session);
else if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
-
+
if (err == SSL_ERROR_WANT_WRITE)
{
session->wstat = ISSL_WRITE;
return ret;
}
}
-
+
int DoRead(issl_session* session)
{
// 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.
-
+
int ret = SSL_read(session->sess, session->inbuf + session->inbufoffset, inbufsize - session->inbufoffset);
if (ret == 0)
else if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
-
+
if (err == SSL_ERROR_WANT_READ)
{
session->rstat = ISSL_READ;
return ret;
}
}
-
+
// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
virtual void OnWhois(userrec* source, userrec* dest)
{
+ if (!clientactive)
+ return;
+
// Bugfix, only send this numeric for *our* SSL users
if (dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) && isin(dest->GetPort(), listenports)))
{
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
}
}
}
-
+
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
}
}
}
-
+
bool Handshake(issl_session* session)
- {
- int ret = SSL_accept(session->sess);
-
+ {
+ int ret;
+
+ if (session->outbound)
+ ret = SSL_connect(session->sess);
+ else
+ ret = SSL_accept(session->sess);
+
if (ret < 0)
{
int err = SSL_get_error(session->sess, ret);
-
+
if (err == SSL_ERROR_WANT_READ)
{
session->rstat = ISSL_READ;
MakePollWrite(session);
}
else
+ {
CloseSession(session);
+ }
return false;
}
- else
+ else if (ret > 0)
{
// Handshake complete.
// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
if (!u->GetExt("ssl", dummy))
u->Extend("ssl", "ON");
}
-
+
session->status = ISSL_OPEN;
-
+
MakePollWrite(session);
-
+
+ return true;
+ }
+ else if (ret == 0)
+ {
+ CloseSession(session);
return true;
}
+
+ return true;
}
-
+
virtual void OnPostConnect(userrec* user)
{
// This occurs AFTER OnUserConnect so we can be sure the
VerifyCertificate(&sessions[user->GetFd()], user);
}
}
-
+
void MakePollWrite(issl_session* session)
{
OnRawSocketWrite(session->fd, NULL, 0);
}
-
+
void CloseSession(issl_session* session)
{
if (session->sess)
SSL_shutdown(session->sess);
SSL_free(session->sess);
}
-
+
if (session->inbuf)
{
delete[] session->inbuf;
}
-
+
session->outbuf.clear();
session->inbuf = NULL;
session->sess = NULL;
}
};
+static int error_callback(const char *str, size_t len, void *u)
+{
+ ModuleSSLOpenSSL* mssl = (ModuleSSLOpenSSL*)u;
+ mssl->PublicInstance->Log(DEFAULT, "SSL error: " + std::string(str, len - 1));
+ return 0;
+}
+
class ModuleSSLOpenSSLFactory : public ModuleFactory
{
public:
ModuleSSLOpenSSLFactory()
{
}
-
+
~ModuleSSLOpenSSLFactory()
{
}
-
+
virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSSLOpenSSL(Me);
projects / user / henk / code / inspircd.git / blobdiff