Changeset 7f8de6fd1900ed5b0e0bb25a1bc167d8793fa2d7

Timestamp:

09/16/09 14:59:30 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[25fec2caf0dfcfa3c997f8f87f6c42d4e176cea0]

git-author:

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

Message:

support check deletes, refs #171

Files:

• src/noit_check_rest.c (modified) (5 diffs)
• src/noit_rest.c (modified) (2 diffs)
• src/noit_rest.h (modified) (1 diff)

src/noit_check_rest.c

@@ -45 +45 @@
-#include "noit_conf_private.h"
-
+#define FAIL(a) do { error = (a); goto error; } while(0)
-#define UUID_REGEX "[0-9a-fA-F]{4}(?:[0-9a-fA-F]{4}-){4}[0-9a-fA-F]{12}"
-
@@ -381 +382 @@
-}
-static int
+rest_delete_check(noit_http_rest_closure_t *restc,
+                  int npats, char **pats) {
+  noit_http_session_ctx *ctx = restc->http_ctx;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlXPathContextPtr xpath_ctxt = NULL;
+  xmlNodePtr node;
+  uuid_t checkid;
+  noit_check_t *check;
+  const char *error;
+  char xpath[1024], *uuid_conf;
+  int rv, cnt;
+  noit_boolean exists = noit_false;
+
+  if(npats != 2) goto error;
+
+  if(uuid_parse(pats[1], checkid)) goto error;
+  check = noit_poller_lookup(checkid);
+  if(check)
+    exists = noit_true;
+
+  rv = noit_check_xpath(xpath, sizeof(xpath), pats[0], pats[1]);
+  if(rv == 0) FAIL("uuid not valid");
+  if(rv < 0) FAIL("Tricky McTrickster... No");
+
+  noit_conf_xml_xpath(NULL, &xpath_ctxt);
+  pobj = xmlXPathEval((xmlChar *)xpath, xpath_ctxt);
+  if(!pobj || pobj->type != XPATH_NODESET ||
+     xmlXPathNodeSetIsEmpty(pobj->nodesetval)) {
+    if(exists) FAIL("uuid not yours");
+    goto not_found;
+  }
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  if(cnt != 1) FAIL("internal error, |checkid| > 1");
+  node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, 0);
+  uuid_conf = (char *)xmlGetProp(node, (xmlChar *)"uuid");
+  if(!uuid_conf || strcasecmp(uuid_conf, pats[1]))
+    FAIL("internal error uuid");
+
+  /* delete this here */
+  noit_poller_deschedule(check->checkid);
+  xmlUnlinkNode(node);
+  xmlFreeNode(node);
+  if(noit_conf_write_file(NULL) != 0)
+    noitL(noit_error, "local config write failed\n");
+  noit_conf_mark_changed();
+  noit_http_response_ok(ctx, "text/html");
+  noit_http_response_end(ctx);
+  goto cleanup;
+
+ not_found:
+  noit_http_response_not_found(ctx, "text/html");
+  noit_http_response_end(ctx);
+  goto cleanup;
+
+ error:
+  noit_http_response_server_error(ctx, "text/html");
+  noit_http_response_end(ctx);
+  goto cleanup;
+
+ cleanup:
+  if(pobj) xmlXPathFreeObject(pobj);
+  return 0;
+}
+
+static int
-rest_set_check(noit_http_rest_closure_t *restc,
-               int npats, char **pats) {
@@ -397 +463 @@
-
-  if(npats != 2) goto error;
-
-#define FAIL(a) do { error = (a); goto error; } while(0)
-
-  if(restc->call_closure == NULL) {
@@ -476 +540 @@
-    xmlNodePtr a;
-    noit_check_t *ocheck;
+
-    cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
-    if(cnt != 1) FAIL("internal error, |checkid| > 1");
@@ -550 +615 @@
-    rest_set_check
-  ) == 0);
-
-
+
+
+
+
+
+
+
+

src/noit_rest.c

@@ -223 +223 @@
-        primer = "HEAD";
-        break;
+      case NOIT_CONTROL_DELETE:
+        primer = "DELE";
+        break;
-      default:
-        goto socket_error;
@@ -242 +245 @@
-                                 NOIT_CONTROL_POST,
-                                 noit_http_rest_handler);
-
-
+
+
+
+
+

src/noit_rest.h

@@ -38 +38 @@
-#define NOIT_REST_H
-
-
-
-
+
+
+
+
-
-typedef struct noit_http_rest_closure noit_http_rest_closure_t;