Merge branch 'authd-framework' of github.com:charybdis-ircd/charybdis into authd...

[solanum.git] / ircd / sslproc.c

diff --git a/ircd/sslproc.c b/ircd/sslproc.c
index 4fad6dc47c1efd58b015edafcb5792783133aa58..55c7ba6dcd92b4938685105d1fe6d8fee25a4934 100644 (file)
--- a/ircd/sslproc.c
+++ b/ircd/sslproc.c
@@ -17,11 +17,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  *  USA
- *
- *  $Id$
  */
 
-#include <ratbox_lib.h>
+#include <rb_lib.h>
 #include "stdinc.h"
 
 
@@ -68,6 +66,7 @@ struct _ssl_ctl
        rb_dlink_list writeq;
        uint8_t shutdown;
        uint8_t dead;
+       char version[256];
 };
 
 static void send_new_ssl_certs_one(ssl_ctl_t * ctl, const char *ssl_cert,
@@ -279,17 +278,17 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
 
        if(ssld_path == NULL)
        {
-               snprintf(fullpath, sizeof(fullpath), "%s/ssld%s", PKGLIBEXECDIR, suffix);
+               snprintf(fullpath, sizeof(fullpath), "%s%cssld%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);
 
                if(access(fullpath, X_OK) == -1)
                {
-                       snprintf(fullpath, sizeof(fullpath), "%s/bin/ssld%s",
-                                   ConfigFileEntry.dpath, suffix);
+                       snprintf(fullpath, sizeof(fullpath), "%s%cbin%cssld%s",
+                                   ConfigFileEntry.dpath, RB_PATH_SEPARATOR, RB_PATH_SEPARATOR, suffix);
                        if(access(fullpath, X_OK) == -1)
                        {
                                ilog(L_MAIN,
                                     "Unable to execute ssld%s in %s or %s/bin",
-                                    suffix, PKGLIBEXECDIR, ConfigFileEntry.dpath);
+                                    suffix, ircd_paths[IRCD_PATH_LIBEXEC], ConfigFileEntry.dpath);
                                return 0;
                        }
                }
@@ -340,7 +339,7 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
                rb_close(F2);
                rb_close(P1);
                ctl = allocate_ssl_daemon(F1, P2, pid);
-               if(ssl_ok)
+               if(ircd_ssl_ok)
                {
                        send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
                        send_certfp_method(ctl, ConfigFileEntry.certfp_method);
@@ -453,7 +452,6 @@ ssl_process_certfp(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
        uint32_t len;
        uint8_t *certfp;
        char *certfp_string;
-       int i;
 
        if(ctl_buf->buflen > 5 + RB_SSL_CERTFP_LEN)
                return;         /* bogus message..drop it.. XXX should warn here */
@@ -466,7 +464,7 @@ ssl_process_certfp(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
                return;
        rb_free(client_p->certfp);
        certfp_string = rb_malloc(len * 2 + 1);
-       for(i = 0; i < len; i++)
+       for(uint32_t i = 0; i < len; i++)
                snprintf(certfp_string + 2 * i, 3, "%02x",
                                certfp[i]);
        client_p->certfp = certfp_string;
@@ -479,15 +477,18 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
        static const char *no_ssl_or_zlib = "ssld has neither SSL/TLS or zlib support killing all sslds";
        rb_dlink_node *ptr, *next;
        ssl_ctl_buf_t *ctl_buf;
+       unsigned long len;
+
        if(ctl->dead)
                return;
+
        RB_DLINK_FOREACH_SAFE(ptr, next, ctl->readq.head)
        {
                ctl_buf = ptr->data;
                switch (*ctl_buf->buf)
                {
                case 'N':
-                       ssl_ok = 0;     /* ssld says it can't do ssl/tls */
+                       ircd_ssl_ok = false;    /* ssld says it can't do ssl/tls */
                        break;
                case 'D':
                        ssl_process_dead_fd(ctl, ctl_buf);
@@ -502,19 +503,24 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                        ssl_process_zipstats(ctl, ctl_buf);
                        break;
                case 'I':
-                       ssl_ok = 0;
+                       ircd_ssl_ok = false;
                        ilog(L_MAIN, "%s", cannot_setup_ssl);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
                        break;
                case 'U':
-                       zlib_ok = 0;
-                       ssl_ok = 0;
+                       ircd_zlib_ok = 0;
+                       ircd_ssl_ok = false;
                        ilog(L_MAIN, "%s", no_ssl_or_zlib);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
                        ssl_killall();
-                       break;
+                       return;
+               case 'V':
+                       len = ctl_buf->buflen - 1;
+                       if (len > sizeof(ctl->version) - 1)
+                               len = sizeof(ctl->version) - 1;
+                       strncpy(ctl->version, &ctl_buf->buf[1], len);
                case 'z':
-                       zlib_ok = 0;
+                       ircd_zlib_ok = 0;
                        break;
                default:
                        ilog(L_MAIN, "Received invalid command from ssld: %s", ctl_buf->buf);
@@ -715,7 +721,7 @@ send_new_ssl_certs(const char *ssl_cert, const char *ssl_private_key, const char
        rb_dlink_node *ptr;
        if(ssl_cert == NULL || ssl_private_key == NULL || ssl_dh_params == NULL)
        {
-               ssl_ok = 0;
+               ircd_ssl_ok = false;
                return;
        }
        RB_DLINK_FOREACH(ptr, ssl_daemons.head)
@@ -803,7 +809,6 @@ start_zlib_session(void *data)
        rb_fde_t *F[2];
        rb_fde_t *xF1, *xF2;
        char *buf;
-       char buf2[9];
        void *recvq_start;
 
        size_t hdr = (sizeof(uint8_t) * 2) + sizeof(uint32_t);
@@ -857,23 +862,11 @@ start_zlib_session(void *data)
                return;
        }
 
-       if(IsSSL(server))
-       {
-               /* tell ssld the new connid for the ssl part*/
-               buf2[0] = 'Y';
-               uint32_to_buf(&buf2[1], rb_get_fd(server->localClient->F));
-               uint32_to_buf(&buf2[5], rb_get_fd(xF2));
-               ssl_cmd_write_queue(server->localClient->ssl_ctl, NULL, 0, buf2, sizeof(buf2));
-       }
-
-
        F[0] = server->localClient->F;
        F[1] = xF1;
-       del_from_cli_connid_hash(server);
        server->localClient->F = xF2;
        /* need to redo as what we did before isn't valid now */
-       uint32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
-       add_to_cli_connid_hash(server);
+       uint32_to_buf(&buf[1], connid_get(server));
 
        server->localClient->z_ctl = which_ssld();
        if(!server->localClient->z_ctl)
@@ -937,6 +930,21 @@ get_ssld_count(void)
        return ssld_count;
 }
 
+void
+ssld_foreach_info(void (*func)(void *data, pid_t pid, int cli_count, enum ssld_status status, const char *version), void *data)
+{
+       rb_dlink_node *ptr, *next;
+       ssl_ctl_t *ctl;
+       RB_DLINK_FOREACH_SAFE(ptr, next, ssl_daemons.head)
+       {
+               ctl = ptr->data;
+               func(data, ctl->pid, ctl->cli_count,
+                       ctl->dead ? SSLD_DEAD :
+                               (ctl->shutdown ? SSLD_SHUTDOWN : SSLD_ACTIVE),
+                       ctl->version);
+       }
+}
+
 void
 init_ssld(void)
 {