Changeset b7ec8071a69b07dca745fa521b287c9f4ffec06e

Timestamp:

02/21/08 20:39:44 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1203626384 +0000

git-parent:

[b7d1fe90ade5801d7ff5a7292a5b81478def06b2]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1203626384 +0000

Message:

SSL support that doesn't quite work -- so so so close.

Files:

• configure.in (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/eventer/Makefile.in (modified) (1 diff)
• src/eventer/eventer.h (modified) (3 diffs)
• src/eventer/eventer_SSL_fd_opset.c (added)
• src/eventer/eventer_SSL_fd_opset.h (added)
• src/eventer/eventer_impl.c (modified) (1 diff)
• src/noit_console.c (modified) (4 diffs)
• src/noit_console.h (modified) (1 diff)
• src/noit_listener.c (modified) (11 diffs)
• src/noit_listener.h (modified) (3 diffs)
• src/sample.conf (modified) (1 diff)
• src/utils/noit_hash.c (modified) (1 diff)
• src/utils/noit_hash.h (modified) (1 diff)

configure.in

@@ -61 +61 @@
-AC_CHECK_LIB(termcap, tputs, , )
-AC_CHECK_LIB(curses, clear, , )
+AC_CHECK_LIB(ssl, SSL_library_init, ,
+        [
+                AC_MSG_ERROR([libssl not found, but required])
+        ]
+)
+AC_CHECK_LIB(crypto, ERR_load_CRYPTO_strings, ,
+        [
+                AC_MSG_ERROR([libssl not found, but required])
+        ]
+)
-
-AC_MSG_CHECKING([libxml2 cflags])

src/Makefile.in

@@ -55 +55 @@
-        re2c -o $@ noit_tokenizer.re
-
+test.key:
+        openssl genrsa -out test.key
+
+test.csr:       test.key
+        openssl req -key test.key -days 365 -new -out test.csr
+
+test.crt:       test.key test.crt
+        openssl x509 -req -in test.csr -signkey test.key -out test.crt
+
+testcerts:      test.key test.crt
+
-clean-subdirs:
-        for dir in $(SUBS) ; do \
@@ -61 +72 @@
-
-clean:  clean-subdirs
-
+ test.key test.csr test.crt
-

src/eventer/Makefile.in

@@ -13 +13 @@
-        eventer_kqueue_impl.o \
-        eventer_POSIX_fd_opset.o \
+        eventer_SSL_fd_opset.o \
-        eventer_jobq.o
-

src/eventer/eventer.h

@@ -21 +21 @@
-
-/* All of these functions act like their POSIX couterparts with two
-
+t
- * to make progress in the event of an EAGAIN.  The second is a closure
- * which is the event itself.
@@ -42 +42 @@
-
-typedef struct _event *eventer_t;
+
+#include "eventer/eventer_POSIX_fd_opset.h"
+#include "eventer/eventer_SSL_fd_opset.h"
+
-typedef int (*eventer_func_t)
-            (eventer_t e, int mask, void *closure, struct timeval *tv);
@@ -51 +55 @@
-  int                 mask;
-  eventer_fd_opset_t  opset;
+  void               *opset_ctx;
-  void *closure;
-};

src/eventer/eventer_impl.c

@@ -50 +50 @@
-  int i;
-  eventer_t e;
+  eventer_ssl_init();
-  eventer_jobq_init(&__global_backq);
-  e = eventer_alloc();

src/noit_console.c

@@ -252 +252 @@
-  int newmask = EVENTER_READ | EVENTER_EXCEPTION;
-  int keep_going;
-
+
+
-
-  if(mask & EVENTER_EXCEPTION || (ncct && ncct->wants_shutdown)) {
@@ -260 +261 @@
-    e->opset->close(e->fd, &newmask, e);
-    if(ncct) noit_console_closure_free(ncct);
+    free(ac);
-    return 0;
-  }
-
-
+
+
+
+
-    int on = 1;
-    ncct = closure = e->closure = noit_console_closure_alloc();
-    ncct->e = e;
-    if(openpty(&ncct->pty_master, &ncct->pty_slave, NULL, NULL, NULL) ||
@@ -273 +277 @@
-    }
-    else {
+      const char *line_protocol;
-      HistEvent ev;
-      ncct->hist = history_init();
@@ -280 +285 @@
-      el_set(ncct->el, EL_EDITOR, "emacs");
-      el_set(ncct->el, EL_HIST, history, ncct->hist);
-
-
+
+
+
+
+
+
+
+
+
-      noit_console_state_init(ncct);
-    }
+    ncct->initialized = 1;
-  }
-

src/noit_console.h

@@ -61 +61 @@
-
-typedef struct __noit_console_closure {
+  int initialized;
-  eventer_t e;           /* The event it is attached to.  This
-                          * is needed so it can write itself out */

src/noit_listener.c

@@ -19 +19 @@
-#include "noit_listener.h"
-#include "noit_conf.h"
+
+static int
+noit_listener_accept_ssl(eventer_t e, int mask,
+                         void *closure, struct timeval *tv) {
+  int rv;
+  listener_closure_t listener_closure = (listener_closure_t)closure;
+  eventer_ssl_ctx_t *ctx;
+  if(!closure) goto socketfail;
+
+  rv = eventer_SSL_accept(e, &mask);
+  if(rv > 0) {
+    e->callback = listener_closure->dispatch_callback;
+    /* We must make a copy of the acceptor_closure_t for each new
+     * connection.
+     */
+    e->closure = malloc(sizeof(*listener_closure->dispatch_closure));
+    memcpy(e->closure, listener_closure->dispatch_closure,
+           sizeof(*listener_closure->dispatch_closure));
+    return e->callback(e, mask, e->closure, tv);
+  }
+  if(errno == EAGAIN) return mask|EVENTER_EXCEPTION;
+  ctx = eventer_get_eventer_ssl_ctx(e);
+  eventer_ssl_ctx_free(ctx);
+
+ socketfail:
+  eventer_remove_fd(e->fd);
+  close(e->fd);
+  return 0;
+}
-
-static int
@@ -33 +62 @@
-
-  if(mask & EVENTER_EXCEPTION) {
+ socketfail:
-    eventer_remove_fd(e->fd);
-    close(e->fd);
@@ -49 +79 @@
-    newe->fd = conn;
-    newe->mask = EVENTER_READ | EVENTER_WRITE | EVENTER_EXCEPTION;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    eventer_add(newe);
-  }
@@ -59 +119 @@
-int
-noit_listener(char *host, unsigned short port, int type,
-
+
+
+
-  int rv, fd;
-  int8_t family;
@@ -81 +143 @@
-        host, port, type, backlog,
-        (event_name = eventer_name_for_callback(handler))?event_name:"??",
-closure
+service_ctx
-  if(host[0] == '/') {
-    family = AF_UNIX;
@@ -115 +177 @@
-  if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
-                 (void*)&reuse, sizeof(reuse)) != 0) {
-
-    close(fd);
-    return -1;
@@ -165 +226 @@
-  listener_closure->family = family;
-  listener_closure->port = htons(port);
+  listener_closure->sslconfig = calloc(1, sizeof(noit_hash_table));
+  noit_hash_merge_as_dict(listener_closure->sslconfig, sslconfig);
-  listener_closure->dispatch_callback = handler;
-
+
+
+
+
+
-
-  event = eventer_alloc();
@@ -179 +246 @@
-
-void
-init
+reconfig
-  int i, cnt = 0;
-  noit_conf_section_t *listener_configs;
-
-
+/
-                                            &cnt);
-  noitL(noit_stderr, "Found %d /noit/listeners/listener stanzas\n", cnt);
@@ -193 +260 @@
-    int backlog;
-    eventer_func_t f;
+    noit_hash_table *sslconfig, *config;
-
-    if(!noit_conf_get_stringbuf(listener_configs[i],
-
+
+
-      noitL(noit_stderr, "No type specified in listener stanza %d\n", i+1);
-      continue;
@@ -206 +275 @@
-    }
-    if(!noit_conf_get_stringbuf(listener_configs[i],
-
+
+
-      address[0] = '*';
-      address[1] = '\0';
-    }
-
+
+
-      portint = 0;
-    port = (unsigned short) portint;
@@ -219 +290 @@
-      continue;
-    }
-
+
+
-      backlog = 5;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/noit_listener.h

@@ -9 +9 @@
-#include "noit_defines.h"
-#include "eventer/eventer.h"
+#include "utils/noit_hash.h"
+
+typedef struct {
+  noit_hash_table *config;
+  void *service_ctx;
+} acceptor_closure_t;
-
-typedef struct {
@@ -14 +20 @@
-  unsigned short port;
-  eventer_func_t dispatch_callback;
-
+
+
-} * listener_closure_t;
-
@@ -21 +28 @@
-API_EXPORT(int)
-noit_listener(char *host, unsigned short port, int type,
-
+
+
+
-
-#endif

src/sample.conf

@@ -50 +50 @@
-  </modules>
-  <listeners>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  </listeners>
-  <checks>

src/utils/noit_hash.c

@@ -273 +273 @@
-}
-
+void noit_hash_merge_as_dict(noit_hash_table *dst, noit_hash_table *src) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  const char *k;
+  int klen;
+  void *data;
+  if(src == NULL || dst == NULL) return;
+  while(noit_hash_next(src, &iter, &k, &klen, &data))
+    noit_hash_store(dst, strdup(k), klen, strdup((char *)data));
+}
+
-int noit_hash_next(noit_hash_table *h, noit_hash_iter *iter,
-                const char **k, int *klen, void **data) {

src/utils/noit_hash.h

@@ -83 +83 @@
-                       NoitHashFreeFunc datafree);
-
+/* This is a convenience function only.  It assumes that all keys and values
+ * in the destination hash are strings and allocated with malloc() and
+ * assumes that the source contains only keys and values that can be
+ * suitably duplicated by strdup().
+ */
+void noit_hash_merge_as_dict(noit_hash_table *dst, noit_hash_table *src);
+
-/* This is an iterator and requires the hash to not be written to during the
-   iteration process.