Capture substrings in ACL regex= . Bug 425.

6 files changed, 115 insertions, 151 deletions

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index c33e09805..596e651f0 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -116,6 +116,8 @@ it's a default value. */
 #define RADIUS_CONFIG_FILE
 #define RADIUS_LIB_TYPE
 
+#define REGEX_VARS                 9
+
 #define ROUTER_ACCEPT
 #define ROUTER_DNSLOOKUP
 #define ROUTER_IPLITERAL
diff --git a/src/src/exim.c b/src/src/exim.c
index d7cb5d88b..999b94cc1 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1753,6 +1753,8 @@ regex_whitelisted_macro =
   regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE);
 #endif
 
+for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
+
 
 /* If the program is called as "mailq" treat it as equivalent to "exim -bp";
 this seems to be a generally accepted convention, since one finds symbolic
diff --git a/src/src/expand.c b/src/src/expand.c
index 89e0ac779..1bff52105 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1726,7 +1726,14 @@ if (Ustrncmp(name, "auth", 4) == 0)
   uschar *endptr;
   int n = Ustrtoul(name + 4, &endptr, 10);
   if (*endptr == 0 && n != 0 && n <= AUTH_VARS)
-    return (auth_vars[n-1] == NULL)? US"" : auth_vars[n-1];
+    return !auth_vars[n-1] ? US"" : auth_vars[n-1];
+  }
+else if (Ustrncmp(name, "regex", 5) == 0)
+  {
+  uschar *endptr;
+  int n = Ustrtoul(name + 5, &endptr, 10);
+  if (*endptr == 0 && n != 0 && n <= REGEX_VARS)
+    return !regex_vars[n-1] ? US"" : regex_vars[n-1];
   }
 
 /* For all other variables, search the table */
diff --git a/src/src/globals.c b/src/src/globals.c
index 4188b4d84..8445f001c 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1090,8 +1090,9 @@ const pcre *regex_From         = NULL;
 const pcre *regex_IGNOREQUOTA  = NULL;
 const pcre *regex_PIPELINING   = NULL;
 const pcre *regex_SIZE         = NULL;
-const pcre *regex_smtp_code    = NULL;
 const pcre *regex_ismsgid      = NULL;
+const pcre *regex_smtp_code    = NULL;
+uschar *regex_vars[REGEX_VARS];
 #ifdef WHITELIST_D_MACROS
 const pcre *regex_whitelisted_macro = NULL;
 #endif
diff --git a/src/src/globals.h b/src/src/globals.h
index 978a4cc78..3c69e43b2 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -717,8 +717,9 @@ extern const pcre  *regex_From;        /* For recognizing "From_" lines */
 extern const pcre  *regex_IGNOREQUOTA; /* For recognizing IGNOREQUOTA (LMTP) */
 extern const pcre  *regex_PIPELINING;  /* For recognizing PIPELINING */
 extern const pcre  *regex_SIZE;        /* For recognizing SIZE settings */
-extern const pcre  *regex_smtp_code;   /* For recognizing SMTP codes */
 extern const pcre  *regex_ismsgid;     /* Compiled r.e. for message it */
+extern const pcre  *regex_smtp_code;   /* For recognizing SMTP codes */
+extern uschar *regex_vars[];           /* $regexN variables */
 #ifdef WHITELIST_D_MACROS
 extern const pcre  *regex_whitelisted_macro; /* For -D macro values */
 #endif
diff --git a/src/src/regex.c b/src/src/regex.c
index ed73b6e0f..93422fadc 100644
--- a/src/src/regex.c
+++ b/src/src/regex.c
@@ -25,109 +25,120 @@ uschar regex_match_string_buffer[1024];
 extern FILE *mime_stream;
 extern uschar *mime_current_boundary;
 
-int
-regex(const uschar **listptr)
+static pcre_list *
+compile(const uschar * list)
 {
   int sep = 0;
-  const uschar *list = *listptr;
   uschar *regex_string;
   uschar regex_string_buffer[1024];
-  unsigned long mbox_size;
-  FILE *mbox_file;
-  pcre *re;
-  pcre_list *re_list_head = NULL;
-  pcre_list *re_list_item;
   const char *pcre_error;
   int pcre_erroffset;
+  pcre_list *re_list_head = NULL;
+  pcre_list *ri;
+
+  /* precompile our regexes */
+  while ((regex_string = string_nextinlist(&list, &sep,
+                                           regex_string_buffer,
+                                           sizeof(regex_string_buffer))) != NULL) {
+    pcre *re;
+
+    /* parse option */
+    if ( (strcmpic(regex_string,US"false") == 0) ||
+         (Ustrcmp(regex_string,"0") == 0) )
+      continue;				/* explicitly no matching */
+
+    /* compile our regular expression */
+    if (!(re = pcre_compile( CS regex_string,
+                       0, &pcre_error, &pcre_erroffset, NULL ))) {
+      log_write(0, LOG_MAIN,
+           "regex acl condition warning - error in regex '%s': %s at offset %d, skipped.",
+	   regex_string, pcre_error, pcre_erroffset);
+      continue;
+    }
+
+    ri = store_get(sizeof(pcre_list));
+    ri->re = re;
+    ri->pcre_text = string_copy(regex_string);
+    ri->next = re_list_head;
+    re_list_head = ri;
+  }
+  return re_list_head;
+}
+
+static int
+matcher(pcre_list * re_list_head, uschar * linebuffer, int len)
+{
+  pcre_list * ri;
+
+  for(ri = re_list_head; ri; ri = ri->next)
+    {
+    int ovec[3*(REGEX_VARS+1)];
+    int n, nn;
+
+    /* try matcher on the line */
+    n = pcre_exec(ri->re, NULL,
+	 CS linebuffer, len, 0, 0,
+	 ovec, nelem(ovec));
+    if (n > 0)
+      {
+      Ustrncpy(regex_match_string_buffer, ri->pcre_text, 1023);
+      regex_match_string = regex_match_string_buffer;
+
+      for (nn = 1; nn < n; nn++)
+	regex_vars[nn-1] =
+	  string_copyn(linebuffer + ovec[nn*2], ovec[nn*2+1] - ovec[nn*2]);
+
+      return OK;
+      }
+    }
+  return FAIL;
+}
+
+int
+regex(const uschar **listptr)
+{
+  unsigned long mbox_size;
+  FILE *mbox_file;
+  pcre_list *re_list_head;
   uschar *linebuffer;
   long f_pos = 0;
+  int ret = FAIL;
 
   /* reset expansion variable */
   regex_match_string = NULL;
 
-  if (mime_stream == NULL) {
-    /* We are in the DATA ACL */
+  if (mime_stream == NULL) {			/* We are in the DATA ACL */
     mbox_file = spool_mbox(&mbox_size, NULL);
-    if (mbox_file == NULL) {
-      /* error while spooling */
+    if (mbox_file == NULL) {			/* error while spooling */
       log_write(0, LOG_MAIN|LOG_PANIC,
              "regex acl condition: error while creating mbox spool file");
       return DEFER;
-    };
+    }
   }
   else {
     f_pos = ftell(mime_stream);
     mbox_file = mime_stream;
-  };
+  }
 
   /* precompile our regexes */
-  while ((regex_string = string_nextinlist(&list, &sep,
-                                           regex_string_buffer,
-                                           sizeof(regex_string_buffer))) != NULL) {
-
-    /* parse option */
-    if ( (strcmpic(regex_string,US"false") == 0) ||
-         (Ustrcmp(regex_string,"0") == 0) ) {
-      /* explicitly no matching */
-      continue;
-    };
-
-    /* compile our regular expression */
-    re = pcre_compile( CS regex_string,
-                       0,
-                       &pcre_error,
-                       &pcre_erroffset,
-                       NULL );
-
-    if (re == NULL) {
-      log_write(0, LOG_MAIN,
-           "regex acl condition warning - error in regex '%s': %s at offset %d, skipped.", regex_string, pcre_error, pcre_erroffset);
-      continue;
-    }
-    else {
-      re_list_item = store_get(sizeof(pcre_list));
-      re_list_item->re = re;
-      re_list_item->pcre_text = string_copy(regex_string);
-      re_list_item->next = re_list_head;
-      re_list_head = re_list_item;
-    };
-  };
-
-  /* no regexes -> nothing to do */
-  if (re_list_head == NULL) {
-    return FAIL;
-  };
+  if (!(re_list_head = compile(*listptr)))
+    return FAIL;			/* no regexes -> nothing to do */
 
   /* match each line against all regexes */
   linebuffer = store_get(32767);
   while (fgets(CS linebuffer, 32767, mbox_file) != NULL) {
-    if ( (mime_stream != NULL) && (mime_current_boundary != NULL) ) {
-      /* check boundary */
-      if (Ustrncmp(linebuffer,"--",2) == 0) {
-        if (Ustrncmp((linebuffer+2),mime_current_boundary,Ustrlen(mime_current_boundary)) == 0)
-          /* found boundary */
-          break;
-      };
-    };
-    re_list_item = re_list_head;
-    do {
-      /* try matcher on the line */
-      if (pcre_exec(re_list_item->re, NULL, CS linebuffer,
-      (int)Ustrlen(linebuffer), 0, 0, NULL, 0) >= 0) {
-        Ustrncpy(regex_match_string_buffer, re_list_item->pcre_text, 1023);
-        regex_match_string = regex_match_string_buffer;
-        if (mime_stream == NULL)
-          (void)fclose(mbox_file);
-        else {
-          clearerr(mime_stream);
-          fseek(mime_stream,f_pos,SEEK_SET);
-        };
-        return OK;
-      };
-      re_list_item = re_list_item->next;
-    } while (re_list_item != NULL);
-  };
 
+    if (  mime_stream && mime_current_boundary		/* check boundary */
+       && Ustrncmp(linebuffer,"--",2) == 0
+       && Ustrncmp((linebuffer+2),mime_current_boundary,Ustrlen(mime_current_boundary)) == 0)
+	break;						/* found boundary */
+
+    if ((ret = matcher(re_list_head, linebuffer, (int)Ustrlen(linebuffer))) == OK)
+      goto done;
+  }
+  /* no matches ... */
+
+done:
   if (mime_stream == NULL)
     (void)fclose(mbox_file);
   else {
@@ -135,67 +146,25 @@ regex(const uschar **listptr)
     fseek(mime_stream,f_pos,SEEK_SET);
   };
 
-  /* no matches ... */
-  return FAIL;
+  return ret;
 }
 
 
 int
 mime_regex(const uschar **listptr)
 {
-  int sep = 0;
-  const uschar *list = *listptr;
-  uschar *regex_string;
-  uschar regex_string_buffer[1024];
-  pcre *re;
   pcre_list *re_list_head = NULL;
-  pcre_list *re_list_item;
-  const char *pcre_error;
-  int pcre_erroffset;
   FILE *f;
   uschar *mime_subject = NULL;
   int mime_subject_len = 0;
+  int ret;
 
   /* reset expansion variable */
   regex_match_string = NULL;
 
   /* precompile our regexes */
-  while ((regex_string = string_nextinlist(&list, &sep,
-                                           regex_string_buffer,
-                                           sizeof(regex_string_buffer))) != NULL) {
-
-    /* parse option */
-    if ( (strcmpic(regex_string,US"false") == 0) ||
-         (Ustrcmp(regex_string,"0") == 0) ) {
-      /* explicitly no matching */
-      continue;
-    };
-
-    /* compile our regular expression */
-    re = pcre_compile( CS regex_string,
-                       0,
-                       &pcre_error,
-                       &pcre_erroffset,
-                       NULL );
-
-    if (re == NULL) {
-      log_write(0, LOG_MAIN,
-           "regex acl condition warning - error in regex '%s': %s at offset %d, skipped.", regex_string, pcre_error, pcre_erroffset);
-      continue;
-    }
-    else {
-      re_list_item = store_get(sizeof(pcre_list));
-      re_list_item->re = re;
-      re_list_item->pcre_text = string_copy(regex_string);
-      re_list_item->next = re_list_head;
-      re_list_head = re_list_item;
-    };
-  };
-
-  /* no regexes -> nothing to do */
-  if (re_list_head == NULL) {
-    return FAIL;
-  };
+  if (!(re_list_head = compile(*listptr)))
+    return FAIL;			/* no regexes -> nothing to do */
 
   /* check if the file is already decoded */
   if (mime_decoded_filename == NULL) {
@@ -207,43 +176,25 @@ mime_regex(const uschar **listptr)
       log_write(0, LOG_MAIN,
            "mime_regex acl condition warning - could not decode MIME part to file.");
       return DEFER;
-    };
-  };
-
+    }
+  }
 
   /* open file */
-  f = fopen(CS mime_decoded_filename, "rb");
-  if (f == NULL) {
-    /* open failed */
+  if (!(f = fopen(CS mime_decoded_filename, "rb"))) {
     log_write(0, LOG_MAIN,
-         "mime_regex acl condition warning - can't open '%s' for reading.", mime_decoded_filename);
+         "mime_regex acl condition warning - can't open '%s' for reading.",
+	 mime_decoded_filename);
     return DEFER;
-  };
+  }
 
   /* get 32k memory */
   mime_subject = (uschar *)store_get(32767);
 
-  /* read max 32k chars from file */
   mime_subject_len = fread(mime_subject, 1, 32766, f);
 
-  re_list_item = re_list_head;
-  do {
-    /* try matcher on the mmapped file */
-    debug_printf("Matching '%s'\n", re_list_item->pcre_text);
-    if (pcre_exec(re_list_item->re, NULL, CS mime_subject,
-                  mime_subject_len, 0, 0, NULL, 0) >= 0) {
-      Ustrncpy(regex_match_string_buffer, re_list_item->pcre_text, 1023);
-      regex_match_string = regex_match_string_buffer;
-      (void)fclose(f);
-      return OK;
-    };
-    re_list_item = re_list_item->next;
-  } while (re_list_item != NULL);
-
+  ret = matcher(re_list_head, mime_subject, mime_subject_len);
   (void)fclose(f);
-
-  /* no matches ... */
-  return FAIL;
+  return ret;
 }
 
 #endif /* WITH_CONTENT_SCAN */