File syslog-ng-filter_checks.dif of Package syslog-ng

Overview Repositories Revisions Requests Users Attributes Meta

File syslog-ng-filter_checks.dif of Package syslog-ng (Revision d42a7a9075bb6d14e962e26385bfb0f8)

Currently displaying revision d42a7a9075bb6d14e962e26385bfb0f8 , Show latest

--- src/cfgfile.c
+++ src/cfgfile.c	2007/03/02 12:31:26
@@ -335,9 +335,11 @@
 		res = yyparse();
 		fclose(cfg);
 		if (!res) {
-			/* successfully parsed */
-			self->resources = empty_resource_list();
-			return self;
+			if( verify_filter_rules(self->filters) == 0) {
+				/* successfully parsed */
+				self->resources = empty_resource_list();
+				return self;
+			}
 		}
 	}
 	else {
--- src/filters.c
+++ src/filters.c	2007/03/02 13:32:35
@@ -42,8 +42,222 @@
 
 static void free_regexp(regex_t *re);
 
+#define string_equal_oo(l,r) \
+	(l->length == r->length && !memcmp(l->data, r->data, l->length))
+
+#define string_equal_oc(l,r) \
+	(l->length == strlen(r) && !memcmp(l->data, r, l->length))
+
+#define string_equal_cc(l,r) \
+	(!strcmp(l, r))
+
 #include "filters.c.x"
 
+/* CLASS:
+   (class
+     (name trace_node)
+     (vars
+       (name string)
+       (next object traced_node)
+       (prev object traced_node)
+     )
+   )
+*/
+/*
+   CLASS:
+   (class
+     (name trace_list)
+     (vars
+       (head object traced_node)
+       (tail object traced_node)
+     )
+   )
+*/
+
+static struct trace_node *
+make_trace_node(struct ol_string *name)
+{
+	if(name)
+	{
+		NEW(trace_node, self);
+		self->name = ol_string_use(name);
+		return self;
+	}
+	return NULL;
+}
+
+static struct trace_list *
+make_trace_list(struct ol_string *name)
+{
+	NEW(trace_list, self);
+	if(name)
+	{
+		struct trace_node *temp = make_trace_node(name);
+		if(temp)
+		{
+			self->head = temp;
+			self->tail = temp;
+		}
+		else
+		{
+			KILL(self);
+			return NULL;
+		}
+	}
+	return self;
+}
+
+struct ol_string *
+get_trace_info(struct trace_list *list)
+{
+	struct ol_string *info = NULL;
+	struct ol_string *temp;
+	if(list && list->head)
+	{
+		struct trace_node *ptr = list->head;
+		info = c_format("%S", ptr->name);
+		while( (ptr = ptr->next))
+		{
+			temp = c_format("%S => %S", info, ptr->name);
+			ol_string_free(info);
+			info = temp;
+		}
+	}
+	return info;
+}
+
+static int
+add_trace_name(struct trace_list *list, struct ol_string *name)
+{
+	if(list)
+	{
+		struct trace_node *temp = make_trace_node(name);
+		if( temp)
+		{
+			if( list->tail)
+			{
+				list->tail->next = temp;
+				temp->prev = list->tail;
+				list->tail = temp;
+			}
+			else
+			{
+				list->head = temp;
+				list->tail = temp;
+			}
+			return 0;
+		}
+	}
+	return 1;
+}
+
+static void
+pop_trace_name(struct trace_list *list)
+{
+	if(list)
+	{
+		struct trace_node *temp = list->tail;
+		if(temp)
+		{
+			if(temp->prev)
+				temp->prev->next = NULL;
+			list->tail = temp->prev;
+			KILL(temp);
+		}
+	}
+}
+
+static int check_filter_expr(struct log_filter        *rules,
+                              struct trace_list        *trace,
+                              struct filter_expr_node  *expr)
+{
+	struct ol_object *obj = (struct ol_object*)expr;
+
+	if(string_equal_cc(obj->isa->name, "filter_expr_op"))
+	{
+		int ret;
+		CAST(filter_expr_op, o, expr);
+
+		debug(  "filter expr check: {%z} (%S)\n",
+			obj->isa->name, get_trace_info(trace));
+
+		ret = check_filter_expr(rules, trace, o->left);
+		if(ret) return ret;
+
+		ret = check_filter_expr(rules, trace, o->right);
+		if(ret)	return ret;
+	}
+	else
+	if(string_equal_cc(obj->isa->name, "filter_expr_call"))
+	{
+		int found = 0;
+		struct log_filter *filter;
+		CAST(filter_expr_call, c, expr);
+
+		debug(  "filter expr check: {%z} (%S)\n",
+			obj->isa->name, get_trace_info(trace));
+
+		/* check if we already have the filter name in trace list */
+		struct trace_node *ptr = trace->head;
+		for( ; ptr; ptr=ptr->next)
+		{
+			if(string_equal_oo(c->name, ptr->name))
+			{
+				werror( "Recursion in filter rule detected: %S => %S!\n",
+					get_trace_info(trace), c->name);
+				return 1;
+			}
+		}
+
+		/* find filter (by name) the filter list */
+		for(filter=rules; filter; filter=filter->next_filter)
+		{
+			if(string_equal_oo(c->name, filter->name))
+			{
+				found++;
+
+				/* OK, filter exists, jump into it */
+				if(add_trace_name(trace, filter->name) == 0)
+				{
+					int ret;
+					ret = check_filter_expr(rules, trace, filter->root);
+					pop_trace_name(trace);
+					if(ret)
+						return ret;
+				}
+				/*
+				** don't break -- filter names are not unique?!
+				*/
+				/* break; */
+			}
+		}
+		if( !found)
+		{
+			werror( "The filter rule '%S' references a not existing filter '%S'!\n",
+				trace->tail->name, c->name);
+			return 2;
+		}
+	}
+	return 0;
+}
+
+int        verify_filter_rules(struct log_filter *filter_rules)
+{
+	struct log_filter *filter;
+	for(filter=filter_rules; filter; filter=filter->next_filter)
+	{
+		struct trace_list *list = make_trace_list(filter->name);
+		if(list)
+		{
+			int ret;
+			ret = check_filter_expr(filter_rules, list, filter->root);
+			KILL( list);
+			if(ret) return ret;
+		}
+	}
+	return 0;
+}
+
 struct log_filter *make_filter_rule(const char *name, struct filter_expr_node *root)
 {
 	NEW(log_filter, self);
--- src/filters.c.x
+++ src/filters.c.x	2007/03/02 12:31:26
@@ -1,4 +1,79 @@
 #ifndef CLASS_DEFINE
+struct trace_node
+{
+  struct ol_object super;
+  struct ol_string *name;
+  struct trace_node *next;
+  struct trace_node *prev;
+};
+extern struct ol_class trace_node_class;
+#endif /* !CLASS_DEFINE */
+
+#ifndef CLASS_DECLARE
+static void do_trace_node_mark(struct ol_object *o,
+void (*mark)(struct ol_object *o))
+{
+  struct trace_node *i = (struct trace_node *) o;
+  mark((struct ol_object *) i->next);
+  mark((struct ol_object *) i->prev);
+}
+
+static void do_trace_node_free(struct ol_object *o)
+{
+  struct trace_node *i = (struct trace_node *) o;
+  i->prev = NULL;
+  i->next = NULL;
+  ol_string_free(i->name);
+}
+
+struct ol_class trace_node_class =
+{ STATIC_HEADER,
+  0, "trace_node", sizeof(struct trace_node),
+  do_trace_node_mark,
+  do_trace_node_free
+};
+#endif /* !CLASS_DECLARE */
+
+#ifndef CLASS_DEFINE
+struct trace_list
+{
+  struct ol_object super;
+  struct trace_node *head;
+  struct trace_node *tail;
+};
+extern struct ol_class trace_list_class;
+#endif /* !CLASS_DEFINE */
+
+#ifndef CLASS_DECLARE
+static void do_trace_list_mark(struct ol_object *o,
+void (*mark)(struct ol_object *o))
+{
+  struct trace_list *i = (struct trace_list *) o;
+  mark((struct ol_object *) i->head);
+  mark((struct ol_object *) i->tail);
+}
+
+static void do_trace_list_free(struct ol_object *o)
+{
+  struct trace_list *i = (struct trace_list *) o;
+  struct trace_node *t;
+  while( (t=i->head))
+  {
+	  i->head = i->head->next;
+	  KILL(t);
+  }
+  i->tail = NULL;
+}
+
+struct ol_class trace_list_class =
+{ STATIC_HEADER,
+  0, "trace_list", sizeof(struct trace_list),
+  do_trace_list_mark,
+  do_trace_list_free
+};
+#endif /* !CLASS_DECLARE */
+
+#ifndef CLASS_DEFINE
 struct filter_expr_op
 {
   struct filter_expr_node super;
--- src/filters.h
+++ src/filters.h	2007/03/02 12:31:26
@@ -56,6 +56,8 @@
 
 extern int lex_filter_params;
 
+int    verify_filter_rules(struct log_filter *filter_rules);
+
 struct log_filter *make_filter_rule(const char *name, struct filter_expr_node *root);
 
 struct filter_expr_node *make_filter_and(struct filter_expr_node *l, struct filter_expr_node *r);

Places

File syslog-ng-filter_checks.dif of Package syslog-ng (Revision d42a7a9075bb6d14e962e26385bfb0f8)

Places