X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=acl.c;h=02df1e481e8f683a90d0c69a5ced3c40cf3f9e9c;hp=a3e161db3278c3db1e7b82d1836cbaa16e8897ec;hb=f16b28109fe2f4a7caf83350fff8bfcfe73b7b6c;hpb=7d30b7e68ff5219312622d6b5c3c2b8e8866585d;ds=sidebyside

diff --git a/acl.c b/acl.c
index a3e161db..02df1e48 100644
--- a/acl.c
+++ b/acl.c
@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file acl.c Access control lists for paraslash senders. */
 
+#include <regex.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -73,14 +75,13 @@ no_match:
  * \param addr The address to add.
  * \param netmask The netmask to use for this entry.
  */
-static void acl_add_entry(struct list_head *acl, struct in_addr addr,
-		int netmask)
+static void acl_add_entry(struct list_head *acl, char *addr, int netmask)
 {
 	struct access_info *ai = para_malloc(sizeof(struct access_info));
-	ai->addr = addr;
+
+	inet_pton(AF_INET, addr, &ai->addr);
 	ai->netmask = netmask;
-	PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
-		ai->netmask);
+	PARA_INFO_LOG("adding %s/%i to access list\n", addr, ai->netmask);
 	para_list_add(&ai->node, acl);
 }
 
@@ -91,21 +92,22 @@ static void acl_add_entry(struct list_head *acl, struct in_addr addr,
  * \param addr The address to delete.
  * \param netmask The netmask of the entry to be removed from the list.
  */
-static void acl_del_entry(struct list_head *acl, struct in_addr addr,
-		int netmask)
+static void acl_del_entry(struct list_head *acl, char *addr, unsigned netmask)
 {
 	struct access_info *ai, *tmp;
+	struct in_addr to_delete;
+
+	inet_pton(AF_INET, addr, &to_delete);
 
 	list_for_each_entry_safe(ai, tmp, acl, node) {
-		char *nad = para_strdup(inet_ntoa(ai->addr));
-		if (!strcmp(nad, inet_ntoa(addr)) &&
-				ai->netmask == netmask) {
+
+		if (v4_addr_match(to_delete.s_addr, ai->addr.s_addr,
+					PARA_MIN(netmask, ai->netmask))) {
 			PARA_NOTICE_LOG("removing %s/%i from access list\n",
-				nad, ai->netmask);
+					addr, ai->netmask);
 			list_del(&ai->node);
 			free(ai);
 		}
-		free(nad);
 	}
 }
 
@@ -140,31 +142,16 @@ char *acl_get_contents(struct list_head *acl)
  */
 void acl_init(struct list_head *acl, char * const *acl_info, int num)
 {
-	int i;
+	char	addr[16];
+	int	mask, i;
 
 	INIT_LIST_HEAD(acl);
-	for (i = 0; i < num; i++) {
-		char *arg = para_strdup(acl_info[i]);
-		char *p = strchr(arg, '/');
-		struct in_addr addr;
-		int netmask;
-
-		if (!p)
-			goto err;
-		*p = '\0';
-		if (!inet_pton(AF_INET, arg, &addr))
-			goto err;
-		netmask = atoi(++p);
-		if (netmask < 0 || netmask > 32)
-			goto err;
-		acl_add_entry(acl, addr, netmask);
-		goto success;
-err:
-		PARA_CRIT_LOG("syntax error: %s\n", acl_info[i]);
-success:
-		free(arg);
-		continue;
-	}
+	for (i = 0; i < num; i++)
+		if (parse_cidr(acl_info[i], addr, sizeof(addr), &mask) == NULL)
+			PARA_CRIT_LOG("ACL syntax error: %s, ignoring\n",
+				      acl_info[i]);
+		else
+			acl_add_entry(acl, addr, mask);
 }
 
 /**
@@ -193,8 +180,8 @@ int acl_check_access(int fd, struct list_head *acl, int default_deny)
  * \param acl The access control list.
  * \param default_deny Whether \a acl is a whitelist.
  */
-void acl_allow(struct in_addr addr, int netmask,
-		struct list_head *acl, int default_deny)
+void acl_allow(char *addr, int netmask,
+	       struct list_head *acl, int default_deny)
 {
 	if (default_deny)
 		acl_add_entry(acl, addr, netmask);
@@ -205,13 +192,13 @@ void acl_allow(struct in_addr addr, int netmask,
 /**
  * Deny access for a range of IP addresses.
  *
- * \param addr The address to permit.
- * \param netmask The netmask of the entry to be permitted.
+ * \param addr The address to deny.
+ * \param netmask The netmask of the entry to be denied.
  * \param acl The access control list.
  * \param default_deny Whether \a acl is a whitelist.
  */
-void acl_deny(struct in_addr addr, int netmask,
-		struct list_head *acl, int default_deny)
+void acl_deny(char *addr, int netmask,
+	      struct list_head *acl, int default_deny)
 {
 	acl_allow(addr, netmask, acl, !default_deny);
 }