Changeset 02569455fdf31dd93db18514b0b4cda5d5181ff7

Timestamp:

09/13/09 14:43:17 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[57a2287f4d549439df74e04e133e5a4e40582d97]

git-author:

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

Message:

work on #171, getting check info works

Files:

• src/Makefile.in (modified) (1 diff)
• src/noit_check_rest.c (added)
• src/noit_check_rest.h (added)
• src/noit_check_tools.c (modified) (1 diff)
• src/noit_check_tools.h (modified) (1 diff)
• src/noit_conf_checks.c (modified) (2 diffs)
• src/noit_http.c (modified) (4 diffs)
• src/noit_http.h (modified) (2 diffs)
• src/noit_rest.c (modified) (4 diffs)
• src/noit_rest.h (modified) (1 diff)
• src/noitd.c (modified) (2 diffs)

src/Makefile.in

@@ -41 +41 @@
-        noit_capabilities_listener.o noit_xml.o \
-        noit_jlog_listener.o noit_livestream_listener.o noit_filters.o \
-
+ noit_check_rest.o
-
-STRATCON_OBJS=stratcond.o noit_listener.o \

src/noit_check_tools.c

@@ -212 +212 @@
-  noit_hash_destroy(attrs, NULL, NULL);
-}
+
+int
+noit_check_xpath(char *xpath, int len,
+                 const char *base, const char *arg) {
+  uuid_t checkid;
+  int base_trailing_slash;
+  char argcopy[1024], *target, *module, *name;
+
+  base_trailing_slash = (base[strlen(base)-1] == '/');
+  xpath[0] = '\0';
+  argcopy[0] = '\0';
+  if(arg) strlcpy(argcopy, arg, sizeof(argcopy));
+
+  if(uuid_parse(argcopy, checkid) == 0) {
+    /* If they kill by uuid, we'll seek and destroy -- find it anywhere */
+    snprintf(xpath, len, "/noit/checks%s%s/check[@uuid=\"%s\"]",
+             base, base_trailing_slash ? "" : "/", argcopy);
+  }
+  else if((module = strchr(argcopy, '`')) != NULL) {
+    noit_check_t *check;
+    char uuid_str[37];
+    target = argcopy;
+    *module++ = '\0';
+    if((name = strchr(module+1, '`')) == NULL)
+      name = module;
+    else
+      name++;
+    check = noit_poller_lookup_by_name(target, name);
+    if(!check) {
+      return -1;
+    }
+    uuid_unparse_lower(check->checkid, uuid_str);
+    snprintf(xpath, len, "/noit/checks%s%s/check[@uuid=\"%s\"]",
+             base, base_trailing_slash ? "" : "/", uuid_str);
+  }
+  return strlen(xpath);
+}

src/noit_check_tools.h

@@ -76 +76 @@
-API_EXPORT(void)
-  noit_check_release_attrs(noit_hash_table *attrs);
+API_EXPORT(int)
+  noit_check_xpath(char *xpath, int len,
+                   const char *base, const char *arg);
-
-

src/noit_conf_checks.c

@@ -46 +46 @@
-#include "noit_conf_private.h"
-#include "noit_check.h"
+#include "noit_check_tools.h"
-#include "noit_filters.h"
-#include "noit_console.h"
@@ -112 +113 @@
-                           noit_conf_t_userdata_t *info,
-                           const char *arg) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    char *path = (!info || !strcmp(info->path, "/")) ? "" : info->path;
-    snprintf(xpath, len, "/noit%s%s%s[@uuid]",

src/noit_http.c

@@ -39 +39 @@
-#include <assert.h>
-#include <zlib.h>
+#include <libxml/tree.h>
-
-#define REQ_PAT "\r\n\r\n"
@@ -562 +563 @@
-                        struct timeval *now) {
-  noit_http_session_ctx *ctx = closure;
-
+ = 0
-  int mask = origmask;
-
@@ -833 +834 @@
-                                struct bchain *in) {
-  struct bchain *out;
-
+ = in->size
-  int opts = ctx->res.output_options;
-
@@ -945 +946 @@
-  return noit_true;
-}
+
+
+/* Helper functions */
+
+static int
+noit_http_write_xml(void *vctx, const char *buffer, int len) {
+  if(noit_http_response_append((noit_http_session_ctx *)vctx, buffer, len))
+    return len;
+  return -1;
+}
+static int
+noit_http_close_xml(void *vctx) {
+  noit_http_response_end((noit_http_session_ctx *)vctx);
+  return 0;
+}
+void
+noit_http_response_xml(noit_http_session_ctx *ctx, xmlDocPtr doc) {
+  xmlOutputBufferPtr out;
+  xmlCharEncodingHandlerPtr enc;
+  enc = xmlGetCharEncodingHandler(XML_CHAR_ENCODING_UTF8);
+  out = xmlOutputBufferCreateIO(noit_http_write_xml,
+                                noit_http_close_xml,
+                                ctx, enc);
+  xmlSaveFormatFileTo(out, doc, "utf8", 1);
+}
+

src/noit_http.h

@@ -35 +35 @@
-
-#include "noit_defines.h"
+#include <libxml/tree.h>
-#include "eventer/eventer.h"
-#include "utils/noit_hash.h"
@@ -156 +157 @@
-API_EXPORT(noit_boolean) noit_http_response_end(noit_http_session_ctx *);
-
+#define noit_http_response_server_error(ctx, type) \
+  noit_http_response_standard(ctx, 500, "ERROR", type)
+#define noit_http_response_ok(ctx, type) \
+  noit_http_response_standard(ctx, 200, "OK", type)
+#define noit_http_response_not_found(ctx, type) \
+  noit_http_response_standard(ctx, 404, "NOT FOUND", type)
+
+#define noit_http_response_standard(ctx, code, name, type) do { \
+  noit_http_response_status_set(ctx, code, name); \
+  noit_http_response_header_set(ctx, "Content-Type", type); \
+  noit_http_response_option_set(ctx, NOIT_HTTP_CHUNKED); \
+  noit_http_response_option_set(ctx, NOIT_HTTP_DEFLATE); \
+} while(0)
+
+API_EXPORT(void)
+  noit_http_response_xml(noit_http_session_ctx *, xmlDocPtr);
+
+
-#endif

src/noit_rest.c

@@ -36 +36 @@
-#include "noit_rest.h"
-
+#include <pcre.h>
+
+struct rest_url_dispatcher {
+  char *method;
+  pcre *expression;
+  pcre_extra *extra;
+  rest_request_handler handler;
+  /* Chain to the next one */
+  struct rest_url_dispatcher *next;
+};
+struct rule_container {
+  char *base;
+  struct rest_url_dispatcher *rules;
+  struct rest_url_dispatcher *rules_endptr;
+};
+noit_hash_table dispatch_points = NOIT_HASH_EMPTY;
+
+static rest_request_handler
+noit_http_get_handler(noit_http_rest_closure_t *restc) {
+  struct rule_container *cont = NULL;
+  struct rest_url_dispatcher *rule;
+  char *eoq, *eob;
+  eoq = strchr(restc->http_ctx->req.uri_str, '?');
+  if(!eoq)
+    eoq = restc->http_ctx->req.uri_str + strlen(restc->http_ctx->req.uri_str);
+  eob = eoq - 1;
+
+  /* find the right base */
+  while(1) {
+    void *vcont;
+    while(eob >= restc->http_ctx->req.uri_str && *eob != '/') eob--;
+    if(eob < restc->http_ctx->req.uri_str) break; /* off the front */
+    if(noit_hash_retrieve(&dispatch_points, restc->http_ctx->req.uri_str,
+                          eob - restc->http_ctx->req.uri_str + 1, &vcont)) {
+      cont = vcont;
+      eob++; /* move past the determined base */
+      break;
+    }
+    eob--;
+  }
+  if(!cont) return NULL;
+  for(rule = cont->rules; rule; rule = rule->next) {
+    int ovector[30];
+    int cnt;
+    if(strcmp(rule->method, restc->http_ctx->req.method_str)) continue;
+    if((cnt = pcre_exec(rule->expression, rule->extra, eob, eoq - eob, 0, 0,
+                        ovector, sizeof(ovector)/sizeof(*ovector))) > 0) {
+      /* We match, set 'er up */
+      restc->fastpath = rule->handler;
+      restc->nparams = cnt - 1;
+      if(restc->nparams) {
+        restc->params = calloc(restc->nparams, sizeof(*restc->params));
+        for(cnt = 0; cnt < restc->nparams; cnt++) {
+          int start = ovector[(cnt+1)*2];
+          int end = ovector[(cnt+1)*2+1];
+          restc->params[cnt] = malloc(end - start + 1);
+          memcpy(restc->params[cnt], eob + start, end - start);
+          restc->params[cnt][end - start] = '\0';
+        }
+      }
+      return restc->fastpath;
+    }
+  }
+  return NULL;
+}
+int
+noit_http_rest_register(const char *method, const char *base,
+                        const char *expr, rest_request_handler f) {
+  void *vcont;
+  struct rule_container *cont;
+  struct rest_url_dispatcher *rule;
+  const char *error;
+  int erroffset;
+  pcre *pcre_expr;
+  int blen = strlen(base);
+  /* base must end in a /, 'cause I said so */
+  if(blen == 0 || base[blen-1] != '/') return -1;
+  pcre_expr = pcre_compile(expr, 0, &error, &erroffset, NULL);
+  if(!pcre_expr) {
+    noitL(noit_error, "Error in rest expr(%s) '%s'@%d: %s\n",
+          base, expr, erroffset, error);
+    return -1;
+  }
+  rule = calloc(1, sizeof(*rule));
+  rule->method = strdup(method);
+  rule->expression = pcre_expr;
+  rule->extra = pcre_study(rule->expression, 0, &error);
+  rule->handler = f;
+
+  /* Make sure we have a container */
+  if(!noit_hash_retrieve(&dispatch_points, base, strlen(base), &vcont)) {
+    cont = calloc(1, sizeof(*cont));
+    cont->base = strdup(base);
+    noit_hash_store(&dispatch_points, cont->base, strlen(cont->base), cont);
+  }
+  else cont = vcont;
+
+  /* Append the rule */
+  if(cont->rules_endptr) {
+    cont->rules_endptr->next = rule;
+    cont->rules_endptr = cont->rules_endptr->next;
+  }
+  else
+    cont->rules = cont->rules_endptr = rule;
+  return 0;
+}
+
-static noit_http_rest_closure_t *
-noit_http_rest_closure_alloc() {
@@ -43 +150 @@
-}
-static void
+noit_http_rest_clean_request(noit_http_rest_closure_t *restc) {
+  int i;
+  if(restc->nparams) {
+    for(i=0;i<restc->nparams;i++) free(restc->params[i]);
+    free(restc->params);
+  }
+  restc->nparams = 0;
+  restc->params = NULL;
+  restc->fastpath = NULL;
+}
+static void
-noit_http_rest_closure_free(noit_http_rest_closure_t *restc) {
+  free(restc->remote_cn);
+   noit_http_rest_clean_request(restc);
-  free(restc);
-}
@@ -49 +169 @@
-int
-noit_rest_request_dispatcher(noit_http_session_ctx *ctx) {
-
-
+
+
+
+
+
+
+
+
+
+
-  noit_http_response_option_set(ctx, NOIT_HTTP_CHUNKED);
-
-
-
+
-  noit_http_response_end(ctx);
-  return 0;
@@ -79 +205 @@
-    const char *primer = "";
-    ac->service_ctx = restc = noit_http_rest_closure_alloc();
+    restc->remote_cn = strdup(ac->remote_cn ? ac->remote_cn : "");
-    restc->http_ctx =
-        noit_http_session_ctx_new(noit_rest_request_dispatcher,

src/noit_rest.h

@@ -42 +42 @@
-#define NOIT_CONTROL_POST 0x504f5354
-
-
+
+
+
+
+
+
-  noit_http_session_ctx *http_ctx;
+  char *remote_cn;
+  rest_request_handler fastpath;
+  int nparams;
+  char **params;
-  int wants_shutdown;
- noit_http_rest_closure_t
+
-
-API_EXPORT(void) noit_http_rest_init();
-
+API_EXPORT(int)
+  noit_http_rest_register(const char *method, const char *base,
+                          const char *expression, rest_request_handler f);
+
-#endif

src/noitd.c

@@ -53 +53 @@
-#include "noit_jlog_listener.h"
-#include "noit_rest.h"
+#include "noit_check_rest.h"
-#include "noit_livestream_listener.h"
-#include "noit_capabilities_listener.h"
@@ -183 +184 @@
-  noit_jlog_listener_init();
-  noit_http_rest_init();
+  noit_check_rest_init();
-  noit_livestream_listener_init();
-