Changeset 7010bc5b07e615c0314ff1c0ebb27bdf8420cca3

Timestamp:

09/16/09 04:19:24 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[6298e33b2e6517913907fa76bd9af5a1ea28b922]

git-author:

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

Message:

robust input validation, refs #171

Files:

• src/noit_check.c (modified) (1 diff)
• src/noit_check.h (modified) (1 diff)
• src/noit_check_rest.c (modified) (4 diffs)
• src/noit_conf.c (modified) (4 diffs)
• src/noit_conf.h (modified) (3 diffs)

src/noit_check.c

@@ -486 +486 @@
-}
-
+noit_boolean
+noit_check_is_valid_target(const char *target) {
+  int8_t family;
+  int rv;
+  union {
+    struct in_addr addr4;
+    struct in6_addr addr6;
+  } a;
+
+  family = AF_INET;
+  rv = inet_pton(family, target, &a);
+  if(rv != 1) {
+    family = AF_INET6;
+    rv = inet_pton(family, target, &a);
+    if(rv != 1) {
+      return noit_false;
+    }
+  }
+  return noit_true;
+}
-int
-noit_check_update(noit_check_t *new_check,

src/noit_check.h

@@ -184 +184 @@
-                    int flags);
-
+API_EXPORT(noit_boolean)
+  noit_check_is_valid_target(const char *str);
+
-API_EXPORT(int)
-  noit_check_activate(noit_check_t *check);

src/noit_check_rest.c

@@ -236 +236 @@
-
-static int
-
+
+
-  xmlNodePtr root, tl, an;
-, disable=0
+
-  *a = *c = NULL;
-  root = xmlDocGetRootElement(doc);
@@ -246 +247 @@
-      *a = tl->children;
-      for(an = tl->children; an; an = an->next) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else return 0;
-      }
@@ -264 +317 @@
-  }
-  if(name && module && target && period && timeout && filterset) return 1;
+  *error = "insufficient information";
-  return 0;
-}
@@ -372 +426 @@
-  indoc = xmlParseMemory(rxc->buffer, rxc->len);
-  if(indoc == NULL) FAIL("xml parse error");
-)) FAIL("xml validate error")
+, &error)) goto error
-
-  if(uuid_parse(pats[1], checkid)) goto error;

src/noit_conf.c

@@ -152 +152 @@
-             err->domain, err->code, err->message);
-}
+
+
+DECLARE_CHECKER(name)
-void noit_conf_init(const char *toplevel) {
-  int i;
-  char keystr[256];
+  COMPILE_CHECKER(name, "^[-_\\.:/a-zA-Z0-9]+$");
-  xmlSetGenericErrorFunc(noit_error, noit_conf_xml_error_func);
-  xmlSetStructuredErrorFunc(noit_error, noit_conf_xml_error_ext_func);
@@ -423 +427 @@
-  return 1;
-}
+int noit_conf_string_to_int(const char *str) {
+  int base = 10;
+  if(!str) return 0;
+  if(str[0] == '0') {
+    if(str[1] == 'x') base = 16;
+    else base = 8;
+  }
+  return strtol(str, NULL, base);
+}
-int noit_conf_get_int(noit_conf_section_t section,
-                      const char *path, int *value) {
-  char *str;
-  long longval;
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-
-
-
-
-
-
+
-    xmlFree(str);
-    *value = (int)longval;
-    return 1;
-  }
@@ -446 +452 @@
-  return noit_conf_set_string(section,path,buffer);
-}
+float noit_conf_string_to_float(const char *str) {
+  if(!str) return 0.0;
+  return atof(str);
+}
-int noit_conf_get_float(noit_conf_section_t section,
-                        const char *path, float *value) {
-  char *str;
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-atof
+noit_conf_string_to_float
-    xmlFree(str);
-    return 1;
@@ -462 +472 @@
-  return noit_conf_set_string(section,path,buffer);
-}
+noit_boolean noit_conf_string_to_boolean(const char *str) {
+  if(!str) return noit_false;
+  if(!strcasecmp(str, "true") || !strcasecmp(str, "on")) return noit_true;
+  return noit_false;
+}
-int noit_conf_get_boolean(noit_conf_section_t section,
-                          const char *path, noit_boolean *value) {
-  char *str;
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-
-
-
+
-    xmlFree(str);
-    return 1;

src/noit_conf.h

@@ -39 +39 @@
-
-#include <uuid/uuid.h>
+#include <pcre.h>
-
-typedef void * noit_conf_section_t;
@@ -81 +82 @@
-API_EXPORT(int) noit_conf_get_int(noit_conf_section_t section,
-                                  const char *path, int *value);
+API_EXPORT(int) noit_conf_string_to_int(const char *str);
-API_EXPORT(int) noit_conf_get_float(noit_conf_section_t section,
-                                    const char *path, float *value);
+API_EXPORT(float) noit_conf_string_to_float(const char *str);
-API_EXPORT(int) noit_conf_get_boolean(noit_conf_section_t section,
-                                      const char *path, noit_boolean *value);
+API_EXPORT(noit_boolean) noit_conf_string_to_boolean(const char *str);
+
-API_EXPORT(int)
-  noit_conf_get_uuid(noit_conf_section_t section,
@@ -119 +124 @@
-API_EXPORT(void) noit_conf_log_init(const char *toplevel);
-
+#define EXPOSE_CHECKER(name) \
+  API_EXPORT(pcre *) noit_conf_get_valid_##name##_checker();
+#define DECLARE_CHECKER(name) \
+static pcre *checker_valid_##name; \
+pcre *noit_conf_get_valid_##name##_checker() { return checker_valid_##name; }
+#define COMPILE_CHECKER(name, expr) do { \
+  const char *errorstr; \
+  int erroff; \
+  checker_valid_##name = pcre_compile(expr, 0, &errorstr, &erroff, NULL); \
+  if(! checker_valid_##name) { \
+    noitL(noit_error, "noit_conf error: compile checker %s failed: %s\n", \
+          #name, errorstr); \
+    exit(-1); \
+  } \
+} while(0)
+
+EXPOSE_CHECKER(name);
+
-#endif