Changeset 1062

Timestamp:

08/05/07 02:52:17 (1 year ago)

Author:

shawnw

Message:

sitelock improvements

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/devel/hdrs/access.h (modified) (3 diffs)
• 1.8.3/branches/devel/hdrs/externs.h (modified) (1 diff)
• 1.8.3/branches/devel/src/access.c (modified) (19 diffs)
• 1.8.3/branches/devel/src/wild.c (modified) (1 diff)
• 1.8.3/branches/devel/src/wiz.c (modified) (3 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -26 +26 @@
-   algorithm, with constant-time lookups even in the worst case.
-   (And appears to have generally faster lookup even in normal usage.)
-
+
+
+
-Fixes:
- * decode64() does better validation of its input. 
- * Various compile fixes reported by Interevis and Kimiko.
-   Win32 patched by Intrevis.
+ * @sitelock does better error reporting.
-
-Version 1.8.3 patchlevel 4                      July 9, 2007

1.8.3/branches/devel/hdrs/access.h

@@ -10 +10 @@
-  char comment[BUFFER_LEN];     /**< A comment about the rule */
-  dbref who;                    /**< Who created this rule if sitelock used */
-
-
+
+
+
-  struct access *next;          /**< Pointer to next rule in the list */
-};
@@ -17 +18 @@
-
-/* These flags are can/can't - a site may or may not be allowed to do them */
-
-
-
-
+U
+U
+U
+U
-/* These flags are set in the 'can' bit, but they mark special processing */
-
-
-
-
+U
+U
+U
+U
-
-
-
-
+U
+U
+U
-
-/* This is the usual default access */
@@ -45 +46 @@
-
-/* Public functions */
-int
+bool
-void write_access_file(void);
-int site_can_access(const char *hname, in
+bool site_can_access(const char *hname, uint32_
-struct access *site_check_access(const char *hname, dbref who, int *rulenum);
-int
+void
-                  dbref who
-                  __attribute__ ((__unused__)), char *buff, char **bp);
-int add_access_sitelock(dbref player, const char *host, dbref who, int can
-in
+bool add_access_sitelock(dbref player, const char *host, dbref who
+ uint32_t can, uint32_
-int remove_access_sitelock(const char *pattern);
-void do_list_access(dbref player);
-int parse_access_options
-int *can, in
+uint32_t *can, uint32_
-
-#endif                          /* __ACCESS_H */

1.8.3/branches/devel/hdrs/externs.h

@@ -591 +591 @@
-    bool quick_regexp_match(const char *restrict s,
-                            const char *restrict d, bool cs);
+bool qcomp_regexp_match(const pcre *re, const char *s);
-    bool wild_match_case_r(const char *restrict s,
-                           const char *restrict d, bool cs,

1.8.3/branches/devel/src/access.c

@@ -78 +78 @@
-#include "conf.h"
-#include "externs.h"
+#include "pcre.h"
-#include "access.h"
-#include "mymalloc.h"
@@ -95 +96 @@
-struct a_acsflag {
-  const char *name;             /**< Name of the access flag */
-int
-in
+bool
+uint32_
-};
-static acsflag acslist[] = {
@@ -114 +115 @@
-
-static struct access *access_top;
-static int add_access_node
-  (const char *host, const dbref who, const int can, const int cant,
-   const char *comment);
-static void free_access_list(void);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  struct access *tmp;
-
-
-
-
+
+
+
+
+
+
+
-  tmp->who = who;
-  tmp->can = can;
-  tmp->cant = cant;
-strcpy(tmp->host, host
+mush_strncpy(tmp->host, host, BUFFER_LEN
-  if (comment)
-strcpy(tmp->comment, comment
+mush_strncpy(tmp->comment, comment, BUFFER_LEN
-  else
-    tmp->comment[0] = '\0';
-  tmp->next = NULL;
+
+  if (can & ACS_REGEXP) {
+    int erroffset = 0;
+    tmp->re = pcre_compile(host, 0, errptr, &erroffset, tables);
+    if (!tmp->re) {
+      mush_free(tmp, "sitelock.rule");
+      return NULL;
+    }
+  } else
+    tmp->re = NULL;
+
+  return tmp;
+}
+
+static bool
+add_access_node(const char *host, dbref who, uint32_t can,
+                uint32_t cant, const char *comment, const char **errptr)
+{
+  struct access *end, *tmp;
+
+  tmp = sitelock_alloc(host, who, can, cant, comment, errptr);
+  if (!tmp)
+    return false;
-
-  if (!access_top) {
@@ -148 +178 @@
-    end->next = tmp;
-  }
-
-
+
-}
-
@@ -155 +184 @@
-/** Read the access.cnf file.
- * Initialize the access rules linked list and read in the access.cnf file.
-Return 1 if successful, 0
-
-
+\return true if successful, false
+
+
-read_access_file(void)
-{
@@ -163 +192 @@
-  char buf[BUFFER_LEN];
-  char *p;
-in
+uint32_
-  int retval;
-  dbref who;
-  char *comment;
+  const char *errptr = NULL;
-
-  if (access_top) {
@@ -198 +228 @@
-        /* Is this the @sitelock entry? */
-        if (!strncasecmp(p, "@sitelock", 9)) {
-
-
+
+
+
+
-        } else {
-          if ((comment = strchr(p, '#'))) {
@@ -214 +246 @@
-            /* Nothing listed, so assume we can't do anything! */
-            cant = ACS_DEFAULT;
-
-
+
+
+
-        }
-      }
@@ -317 +350 @@
- * \endverbatim
- */
-
-in
+
+uint32_
-{
-  struct access *ap;
@@ -333 +366 @@
-    if (!(ap->can & ACS_SITELOCK)
-        && ((ap->can & ACS_REGEXP)
-uick_regexp_match(ap->host, hname, 0
-uick_regexp_match(ap->host, p, 0
+comp_regexp_match(ap->re, hname
+comp_regexp_match(ap->re, p
-#ifdef FORCE_IPV4
-uick_regexp_match(ip4_to_ip6(ap->host), hname, 0
-uick_regexp_match(ip4_to_ip6(ap->host), p, 0
+comp_regexp_match(ip4_to_ip6(ap->re), hname
+comp_regexp_match(ip4_to_ip6(ap->re), p
-#endif
-            )
@@ -403 +436 @@
-    if (!(ap->can & ACS_SITELOCK)
-        && ((ap->can & ACS_REGEXP)
-uick_regexp_match(ap->host, hname, 0
-uick_regexp_match(ap->host, p, 0
+comp_regexp_match(ap->re, hname
+comp_regexp_match(ap->re, p
-#ifdef FORCE_IPV4
-uick_regexp_match(ip4_to_ip6(ap->host), hname, 0
-uick_regexp_match(ip4_to_ip6(ap->host), p, 0
+comp_regexp_match(ip4_to_ip6(ap->host), hname
+comp_regexp_match(ip4_to_ip6(ap->host), p
-#endif
-            )
@@ -434 +467 @@
- * in the list.
- */
-
+
-format_access(struct access *ap, int rulenum,
-              dbref who __attribute__ ((__unused__)), char *buff, char **bp)
@@ -475 +508 @@
-    safe_str(T("No matching access rule"), buff, bp);
-  }
-  return 0;
-}
-
@@ -494 +526 @@
- * \endverbatim
- */
-
-in
-in
+
+uint32_
+uint32_
-{
-  struct access *end;
-  struct access *tmp;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-  if (!access_top) {
-    /* Add to the beginning, but first add a sitelock marker */
-
+
+
+
-      return 0;
+    }
-    access_top->next = tmp;
-  } else {
@@ -525 +557 @@
-    if (end->can != ACS_SITELOCK) {
-      /* We're at the end and there's no sitelock marker. Add one */
-
+
+
+
+
-        return 0;
+      }
-      end = end->next;
-    } else {
@@ -540 +576 @@
- * \param pattern access rule host pattern to match.
- * \return number of rule removed.
- * \verbatim
- * This function removes an access rule from the list.
- * Only rules that appear after the "@sitelock" rule can be
- * removed with this function.
- * \endverbatim
- */
-int
@@ -564 +598 @@
-    if (strcasecmp(pattern, ap->host) == 0) {
-      n++;
-
+
+
+
-      if (prev)
-        prev->next = next;
@@ -586 +622 @@
-  while (ap) {
-    next = ap->next;
-
+
+
+
-    ap = next;
-  }
@@ -649 +687 @@
- */
-int
-int *can, int *cant
-
+uint32_t *can
+uint32_t *cant, 
-{
-  char myopts[BUFFER_LEN];

1.8.3/branches/devel/src/wild.c

@@ -625 +625 @@
-
-  return r >= 0;
+}
+
+/** Regexp match of a pre-compiled regexp, with no memory.
+ * \param re the regular expression
+ * \param subj the string to match against.
+ * \return true or false
+ */
+bool
+qcomp_regexp_match(const pcre *re, const char *subj)
+{
+  int len;
+  int offsets[99];
+
+  if (!re || !subj)
+    return false;
+
+  len = strlen(subj);
+
+  return pcre_exec(re, NULL, subj, len, 0, 0, offsets, 99) >= 0;
+
-}
-

1.8.3/branches/devel/src/wiz.c

@@ -1446 +1446 @@
-  }
-  if (opts && *opts) {
-in
+uint32_
-    dbref whod = AMBIGUOUS;
-    /* Options form of the command. */
@@ -1466 +1466 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  } else {
-    /* Backward-compatible non-options form of the command,
@@ -1490 +1491 @@
-      return;
-    case SITELOCK_ADD:
-
-
-
-
+
+
+
+
+
-      break;
-    case SITELOCK_BAN:
-
-
-
-
+
+
+
+
+
-      break;
-    case SITELOCK_CHECK:{