maidag: improve forwarding capability, add a testcase for it.

* maidag/forward.c (check_forward_permissions): Keep track of the
processed files.  Refuse to process a file twice.
(process_forward): Rewrite using streams instead of FILE.
(maidag_forward): Accept absolute file names (mainly for testing).
* maidag/maidag.c (forward_checks): New keyword "owner".
(cb2_forward_file_checks): New keyword "none".
(main): Require at least one recipient in MDA mode.
* maidag/maidag.h (FWD_OWNER): New mask.
* maidag/tests/forward.at: New file.
* maidag/tests/Makefile.am (TESTSUITE_AT): Add forward.at
* maidag/tests/testsuite.at: Include forward.at.

@@ -74,6 +74,52 @@ static struct perm_checker perm_check_tab[] = {
   { 0 }
   { 0 }
 };
 };
 
 
+static mu_list_t idlist;
+
+struct file_id
+{
+  dev_t dev;
+  ino_t inode;
+};
+
+static int
+file_id_cmp (const void *item, const void *data)
+{
+  const struct file_id *a = item;
+  const struct file_id *b = data;
+
+  if (a->dev != b->dev)
+    return 1;
+  if (a->inode != b->inode)
+    return 1;
+  return 0;
+}
+
+static int
+file_id_lookup (dev_t dev, ino_t ino)
+{
+  struct file_id id;
+
+  id.dev = dev;
+  id.inode = ino;
+  return mu_list_locate (idlist, &id, NULL);
+}
+
+static int
+file_id_remember (dev_t dev, ino_t ino)
+{
+  struct file_id *id = malloc (sizeof (*id));
+  if (!id)
+    {
+      mu_error ("%s", mu_strerror (errno));
+      return 1;
+    }
+  id->dev = dev;
+  id->inode = ino;
+  return mu_list_append (idlist, id);
+}
+
+
 /* Check if the forwrd file FILENAME has right permissions and file mode.
 /* Check if the forwrd file FILENAME has right permissions and file mode.
    DIRST describes the directory holding the file, AUTH gives current user
    DIRST describes the directory holding the file, AUTH gives current user
    authority. */
    authority. */
@@ -87,7 +133,21 @@ check_forward_permissions (const char *filename, struct stat *dirst,
     {
     {
       int i;
       int i;
 
 
-      if (auth->uid != st.st_uid)
+      if (!idlist)
+	{
+	  mu_list_create (&idlist);
+	  mu_list_set_comparator (idlist, file_id_cmp);
+	}
+      else if (file_id_lookup (st.st_dev, st.st_ino) == 0)
+	{
+	  mu_diag_output (MU_DIAG_NOTICE,
+			  _("skipping forward file %s: already processed"),
+			  filename);
+	  return 1;
+	}
+      
+      if ((forward_file_checks & FWD_OWNER) &&
+	  auth->uid != st.st_uid)
 	{
 	{
 	  mu_error (_("%s not owned by %s"), filename, auth->name);
 	  mu_error (_("%s not owned by %s"), filename, auth->name);
 	  return 1;
 	  return 1;
@@ -99,6 +159,7 @@ check_forward_permissions (const char *filename, struct stat *dirst,
 	    mu_error ("%s: %s", filename, gettext (perm_check_tab[i].descr));
 	    mu_error ("%s: %s", filename, gettext (perm_check_tab[i].descr));
 	    return 1;
 	    return 1;
 	  }
 	  }
+      file_id_remember (st.st_dev, st.st_ino);
       return 0;
       return 0;
     }
     }
   else if (errno != ENOENT)
   else if (errno != ENOENT)
@@ -203,22 +264,23 @@ create_from_address (mu_message_t msg, mu_address_t *pfrom)
 enum maidag_forward_result
 enum maidag_forward_result
 process_forward (mu_message_t msg, char *filename, const char *myname)
 process_forward (mu_message_t msg, char *filename, const char *myname)
 {
 {
-  FILE *fp;
-  size_t size = 0;
+  int rc;
+  mu_stream_t file;
+  size_t size = 0, n;
   char *buf = NULL;
   char *buf = NULL;
   enum maidag_forward_result result = maidag_forward_ok;
   enum maidag_forward_result result = maidag_forward_ok;
   mu_mailer_t mailer = NULL;
   mu_mailer_t mailer = NULL;
   mu_address_t from = NULL;
   mu_address_t from = NULL;
 
 
-  fp = fopen (filename, "r");
-  if (!fp)
+  rc = mu_file_stream_create (&file, filename, MU_STREAM_READ);
+  if (rc)
     {
     {
       mu_error (_("%s: cannot open forward file: %s"),
       mu_error (_("%s: cannot open forward file: %s"),
-		filename, mu_strerror (errno));
+		filename, mu_strerror (rc));
       return maidag_forward_error;
       return maidag_forward_error;
     }
     }
 
 
-  while (getline (&buf, &size, fp) > 0)
+  while (mu_stream_getline (file, &buf, &size, &n) == 0 && n > 0)
     {
     {
       char *p;
       char *p;
 
 
@@ -256,7 +318,7 @@ process_forward (mu_message_t msg, char *filename, const char *myname)
       mu_mailer_destroy (&mailer);
       mu_mailer_destroy (&mailer);
     }
     }
   free (buf);
   free (buf);
-  fclose (fp);
+  mu_stream_destroy (&file);
   return result;
   return result;
 }
 }
 
 
@@ -269,6 +331,8 @@ maidag_forward (mu_message_t msg, struct mu_auth_data *auth, char *fwfile)
   char *filename;
   char *filename;
   enum maidag_forward_result result = maidag_forward_none;
   enum maidag_forward_result result = maidag_forward_none;
 
 
+  if (fwfile[0] != '/')
+    {
       if (stat (auth->dir, &st))
       if (stat (auth->dir, &st))
 	{
 	{
 	  if (errno == ENOENT)
 	  if (errno == ENOENT)
@@ -281,6 +345,10 @@ maidag_forward (mu_message_t msg, struct mu_auth_data *auth, char *fwfile)
 	  return maidag_forward_none;
 	  return maidag_forward_none;
 	}
 	}
       asprintf (&filename, "%s/%s", auth->dir, fwfile);
       asprintf (&filename, "%s/%s", auth->dir, fwfile);
+    }
+  else
+    filename = strdup (fwfile);
+  
   if (!filename)
   if (!filename)
     {
     {
       mu_error ("%s", mu_strerror (errno));
       mu_error ("%s", mu_strerror (errno));

@@ -321,6 +321,7 @@ cb_group (mu_debug_t debug, void *data, mu_config_value_t *arg)
 
 
 static struct mu_kwd forward_checks[] = {
 static struct mu_kwd forward_checks[] = {
   { "all", FWD_ALL },
   { "all", FWD_ALL },
+  { "owner", FWD_OWNER },
   { "groupwritablefile", FWD_IWGRP },
   { "groupwritablefile", FWD_IWGRP },
   { "file_iwgrp", FWD_IWGRP },
   { "file_iwgrp", FWD_IWGRP },
   { "worldwritablefile", FWD_IWOTH },
   { "worldwritablefile", FWD_IWOTH },
@@ -341,6 +342,12 @@ cb2_forward_file_checks (mu_debug_t debug, const char *name, void *data)
   const char *str;
   const char *str;
   int val;
   int val;
 
 
+  if (strcmp (name, "none") == 0)
+    {
+      forward_file_checks = 0;
+      return 0;
+    }
+  
   if (strlen (name) > 2 && mu_c_strncasecmp (name, "no", 2) == 0)
   if (strlen (name) > 2 && mu_c_strncasecmp (name, "no", 2) == 0)
     {
     {
       negate = 1;
       negate = 1;
@@ -609,6 +616,11 @@ main (int argc, char *argv[])
       break;
       break;
       
       
     case mode_mda:
     case mode_mda:
+      if (argc == 0)
+	{
+	  mu_error (_("recipients not given"));
+	  return EX_USAGE;
+	}
       delivery_fun = deliver_to_user;
       delivery_fun = deliver_to_user;
       break;
       break;
     }
     }

@@ -111,12 +111,13 @@ extern int debug_level;
 #define EX_QUOTA() (ex_quota_tempfail ? EX_TEMPFAIL : EX_UNAVAILABLE)
 #define EX_QUOTA() (ex_quota_tempfail ? EX_TEMPFAIL : EX_UNAVAILABLE)
 
 
 /* .forward file checks */
 /* .forward file checks */
-#define FWD_IWGRP     0x0001 /* group writable forward file */
-#define FWD_IWOTH     0x0002 /* world writable forward file */
-#define FWD_LINK      0x0004 /* linked forward file in writable dir */
-#define FWD_DIR_IWGRP 0x0008 /* forward file in group writable directory */
-#define FWD_DIR_IWOTH 0x0010 /* forward file in world writable directory */
-#define FWD_ALL (FWD_IWGRP|FWD_IWOTH|FWD_LINK|FWD_DIR_IWOTH|FWD_DIR_IWGRP)
+#define FWD_OWNER     0x0001 /* file ownership */
+#define FWD_IWGRP     0x0002 /* group writable forward file */
+#define FWD_IWOTH     0x0004 /* world writable forward file */
+#define FWD_LINK      0x0008 /* linked forward file in writable dir */
+#define FWD_DIR_IWGRP 0x0010 /* forward file in group writable directory */
+#define FWD_DIR_IWOTH 0x0020 /* forward file in world writable directory */
+#define FWD_ALL (FWD_OWNER|FWD_IWGRP|FWD_IWOTH|FWD_LINK|FWD_DIR_IWOTH|FWD_DIR_IWGRP)
 
 
 enum maidag_mode
 enum maidag_mode
   {
   {

@@ -39,6 +39,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## ------------ ##
 ## ------------ ##
 
 
 TESTSUITE_AT = \
 TESTSUITE_AT = \
+ forward.at\
  lmtp.at\
  lmtp.at\
  mda.at\
  mda.at\
  testsuite.at\
  testsuite.at\

@@ -29,4 +29,5 @@ MUT_VERSION(maidag)
 m4_include([mda.at])
 m4_include([mda.at])
 m4_include([lmtp.at])
 m4_include([lmtp.at])
 m4_include([url-mbox.at])
 m4_include([url-mbox.at])
+m4_include([forward.at])
 
 

@@ -95,7 +95,6 @@ if ![mu_check_capability ENABLE_SENDMAIL] {
 	"  48: > All mimsy were the borogoves,"\
 	"  48: > All mimsy were the borogoves,"\
 	"  49: > And the mome raths outgrabe."\
 	"  49: > And the mome raths outgrabe."\
 	"  50: > "\
 	"  50: > "\
-	"  51: "\
 	"END OF MESSAGE"
 	"END OF MESSAGE"
 }
 }