[PATCH v5 07/12] insert: add --folder option

2013-04-28 Thread Peter Wang 
On Sun, 28 Apr 2013 00:32:47 +0300, Jani Nikula  wrote:
> > +notmuch_opt_desc_t options[] = {
> > +   { NOTMUCH_OPT_STRING, , "folder", 0, 0 },
> > +   { NOTMUCH_OPT_END, 0, 0, 0, 0 }
> > +};
> > +
> > +opt_index = parse_arguments (argc, argv, options, 1);
> > +
> > +if (opt_index < 0) {
> > +   fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
> > +argv[-opt_index]);
> 
> I'm too tired to check what's correct, but argv[-opt_index] isn't.

Nice catch.  I'll just delete that message as parse_arguments
already prints a message, like other callers.

Peter

[PATCH v5 07/12] insert: add --folder option

2013-04-28 Thread Jani Nikula 
On Wed, 03 Apr 2013, Peter Wang  wrote:
> Allow the new message to be inserted into a folder within the Maildir
> hierarchy instead of the top-level folder.
> ---
>  notmuch-insert.c | 47 +--
>  1 file changed, 45 insertions(+), 2 deletions(-)
>
> diff --git a/notmuch-insert.c b/notmuch-insert.c
> index 19b1cf9..778ac04 100644
> --- a/notmuch-insert.c
> +++ b/notmuch-insert.c
> @@ -83,6 +83,23 @@ sync_dir (const char *dir)
>  return ret;
>  }
>  
> +/* Check the specified folder name does not contain a directory
> + * component ".." to prevent writes outside of the Maildir hierarchy. */
> +static notmuch_bool_t
> +check_folder_name (const char *folder)
> +{
> +const char *p = folder;
> +
> +for (;;) {
> + if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))
> + return FALSE;
> + p = strchr (p, '/');
> + if (!p)
> + return TRUE;
> + p++;
> +}
> +}
> +
>  /* Open a unique file in the Maildir 'tmp' directory.
>   * Returns the file descriptor on success, or -1 on failure.
>   * On success, file paths for the message in the 'tmp' and 'new'
> @@ -287,11 +304,25 @@ notmuch_insert_command (notmuch_config_t *config, int 
> argc, char *argv[])
>  size_t new_tags_length;
>  tag_op_list_t *tag_ops;
>  char *query_string = NULL;
> +const char *folder = NULL;
>  const char *maildir;
> -int opt_index = 1;
> +int opt_index;
>  unsigned int i;
>  notmuch_bool_t ret;
>  
> +notmuch_opt_desc_t options[] = {
> + { NOTMUCH_OPT_STRING, , "folder", 0, 0 },
> + { NOTMUCH_OPT_END, 0, 0, 0, 0 }
> +};
> +
> +opt_index = parse_arguments (argc, argv, options, 1);
> +
> +if (opt_index < 0) {
> + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
> +  argv[-opt_index]);

I'm too tired to check what's correct, but argv[-opt_index] isn't.

J.


> + return 1;
> +}
> +
>  db_path = notmuch_config_get_database_path (config);
>  new_tags = notmuch_config_get_new_tags (config, _tags_length);
>  
> @@ -314,7 +345,19 @@ notmuch_insert_command (notmuch_config_t *config, int 
> argc, char *argv[])
>   return 1;
>  }
>  
> -maildir = db_path;
> +if (folder == NULL) {
> + maildir = db_path;
> +} else {
> + if (! check_folder_name (folder)) {
> + fprintf (stderr, "Error: bad folder name: %s\n", folder);
> + return 1;
> + }
> + maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
> + if (! maildir) {
> + fprintf (stderr, "Out of memory\n");
> + return 1;
> + }
> +}
>  
>  /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
>   * from standard input may be interrupted. */
> -- 
> 1.7.12.1
>
> ___
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH v5 07/12] insert: add --folder option

2013-04-27 Thread Jani Nikula 
On Wed, 03 Apr 2013, Peter Wang noval...@gmail.com wrote:
 Allow the new message to be inserted into a folder within the Maildir
 hierarchy instead of the top-level folder.
 ---
  notmuch-insert.c | 47 +--
  1 file changed, 45 insertions(+), 2 deletions(-)

 diff --git a/notmuch-insert.c b/notmuch-insert.c
 index 19b1cf9..778ac04 100644
 --- a/notmuch-insert.c
 +++ b/notmuch-insert.c
 @@ -83,6 +83,23 @@ sync_dir (const char *dir)
  return ret;
  }
  
 +/* Check the specified folder name does not contain a directory
 + * component .. to prevent writes outside of the Maildir hierarchy. */
 +static notmuch_bool_t
 +check_folder_name (const char *folder)
 +{
 +const char *p = folder;
 +
 +for (;;) {
 + if ((p[0] == '.')  (p[1] == '.')  (p[2] == '\0' || p[2] == '/'))
 + return FALSE;
 + p = strchr (p, '/');
 + if (!p)
 + return TRUE;
 + p++;
 +}
 +}
 +
  /* Open a unique file in the Maildir 'tmp' directory.
   * Returns the file descriptor on success, or -1 on failure.
   * On success, file paths for the message in the 'tmp' and 'new'
 @@ -287,11 +304,25 @@ notmuch_insert_command (notmuch_config_t *config, int 
 argc, char *argv[])
  size_t new_tags_length;
  tag_op_list_t *tag_ops;
  char *query_string = NULL;
 +const char *folder = NULL;
  const char *maildir;
 -int opt_index = 1;
 +int opt_index;
  unsigned int i;
  notmuch_bool_t ret;
  
 +notmuch_opt_desc_t options[] = {
 + { NOTMUCH_OPT_STRING, folder, folder, 0, 0 },
 + { NOTMUCH_OPT_END, 0, 0, 0, 0 }
 +};
 +
 +opt_index = parse_arguments (argc, argv, options, 1);
 +
 +if (opt_index  0) {
 + fprintf (stderr, Error: bad argument to notmuch insert: %s\n,
 +  argv[-opt_index]);

I'm too tired to check what's correct, but argv[-opt_index] isn't.

J.


 + return 1;
 +}
 +
  db_path = notmuch_config_get_database_path (config);
  new_tags = notmuch_config_get_new_tags (config, new_tags_length);
  
 @@ -314,7 +345,19 @@ notmuch_insert_command (notmuch_config_t *config, int 
 argc, char *argv[])
   return 1;
  }
  
 -maildir = db_path;
 +if (folder == NULL) {
 + maildir = db_path;
 +} else {
 + if (! check_folder_name (folder)) {
 + fprintf (stderr, Error: bad folder name: %s\n, folder);
 + return 1;
 + }
 + maildir = talloc_asprintf (config, %s/%s, db_path, folder);
 + if (! maildir) {
 + fprintf (stderr, Out of memory\n);
 + return 1;
 + }
 +}
  
  /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
   * from standard input may be interrupted. */
 -- 
 1.7.12.1

 ___
 notmuch mailing list
 notmuch@notmuchmail.org
 http://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH v5 07/12] insert: add --folder option

2013-04-27 Thread Peter Wang 
On Sun, 28 Apr 2013 00:32:47 +0300, Jani Nikula j...@nikula.org wrote:
  +notmuch_opt_desc_t options[] = {
  +   { NOTMUCH_OPT_STRING, folder, folder, 0, 0 },
  +   { NOTMUCH_OPT_END, 0, 0, 0, 0 }
  +};
  +
  +opt_index = parse_arguments (argc, argv, options, 1);
  +
  +if (opt_index  0) {
  +   fprintf (stderr, Error: bad argument to notmuch insert: %s\n,
  +argv[-opt_index]);
 
 I'm too tired to check what's correct, but argv[-opt_index] isn't.

Nice catch.  I'll just delete that message as parse_arguments
already prints a message, like other callers.

Peter
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH v5 07/12] insert: add --folder option

2013-04-03 Thread Peter Wang 
Allow the new message to be inserted into a folder within the Maildir
hierarchy instead of the top-level folder.
---
 notmuch-insert.c | 47 +--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 19b1cf9..778ac04 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -83,6 +83,23 @@ sync_dir (const char *dir)
 return ret;
 }

+/* Check the specified folder name does not contain a directory
+ * component ".." to prevent writes outside of the Maildir hierarchy. */
+static notmuch_bool_t
+check_folder_name (const char *folder)
+{
+const char *p = folder;
+
+for (;;) {
+   if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))
+   return FALSE;
+   p = strchr (p, '/');
+   if (!p)
+   return TRUE;
+   p++;
+}
+}
+
 /* Open a unique file in the Maildir 'tmp' directory.
  * Returns the file descriptor on success, or -1 on failure.
  * On success, file paths for the message in the 'tmp' and 'new'
@@ -287,11 +304,25 @@ notmuch_insert_command (notmuch_config_t *config, int 
argc, char *argv[])
 size_t new_tags_length;
 tag_op_list_t *tag_ops;
 char *query_string = NULL;
+const char *folder = NULL;
 const char *maildir;
-int opt_index = 1;
+int opt_index;
 unsigned int i;
 notmuch_bool_t ret;

+notmuch_opt_desc_t options[] = {
+   { NOTMUCH_OPT_STRING, , "folder", 0, 0 },
+   { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+};
+
+opt_index = parse_arguments (argc, argv, options, 1);
+
+if (opt_index < 0) {
+   fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
+argv[-opt_index]);
+   return 1;
+}
+
 db_path = notmuch_config_get_database_path (config);
 new_tags = notmuch_config_get_new_tags (config, _tags_length);

@@ -314,7 +345,19 @@ notmuch_insert_command (notmuch_config_t *config, int 
argc, char *argv[])
return 1;
 }

-maildir = db_path;
+if (folder == NULL) {
+   maildir = db_path;
+} else {
+   if (! check_folder_name (folder)) {
+   fprintf (stderr, "Error: bad folder name: %s\n", folder);
+   return 1;
+   }
+   maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
+   if (! maildir) {
+   fprintf (stderr, "Out of memory\n");
+   return 1;
+   }
+}

 /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
  * from standard input may be interrupted. */
-- 
1.7.12.1

[PATCH v5 07/12] insert: add --folder option

2013-04-02 Thread Peter Wang 
Allow the new message to be inserted into a folder within the Maildir
hierarchy instead of the top-level folder.
---
 notmuch-insert.c | 47 +--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 19b1cf9..778ac04 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -83,6 +83,23 @@ sync_dir (const char *dir)
 return ret;
 }
 
+/* Check the specified folder name does not contain a directory
+ * component .. to prevent writes outside of the Maildir hierarchy. */
+static notmuch_bool_t
+check_folder_name (const char *folder)
+{
+const char *p = folder;
+
+for (;;) {
+   if ((p[0] == '.')  (p[1] == '.')  (p[2] == '\0' || p[2] == '/'))
+   return FALSE;
+   p = strchr (p, '/');
+   if (!p)
+   return TRUE;
+   p++;
+}
+}
+
 /* Open a unique file in the Maildir 'tmp' directory.
  * Returns the file descriptor on success, or -1 on failure.
  * On success, file paths for the message in the 'tmp' and 'new'
@@ -287,11 +304,25 @@ notmuch_insert_command (notmuch_config_t *config, int 
argc, char *argv[])
 size_t new_tags_length;
 tag_op_list_t *tag_ops;
 char *query_string = NULL;
+const char *folder = NULL;
 const char *maildir;
-int opt_index = 1;
+int opt_index;
 unsigned int i;
 notmuch_bool_t ret;
 
+notmuch_opt_desc_t options[] = {
+   { NOTMUCH_OPT_STRING, folder, folder, 0, 0 },
+   { NOTMUCH_OPT_END, 0, 0, 0, 0 }
+};
+
+opt_index = parse_arguments (argc, argv, options, 1);
+
+if (opt_index  0) {
+   fprintf (stderr, Error: bad argument to notmuch insert: %s\n,
+argv[-opt_index]);
+   return 1;
+}
+
 db_path = notmuch_config_get_database_path (config);
 new_tags = notmuch_config_get_new_tags (config, new_tags_length);
 
@@ -314,7 +345,19 @@ notmuch_insert_command (notmuch_config_t *config, int 
argc, char *argv[])
return 1;
 }
 
-maildir = db_path;
+if (folder == NULL) {
+   maildir = db_path;
+} else {
+   if (! check_folder_name (folder)) {
+   fprintf (stderr, Error: bad folder name: %s\n, folder);
+   return 1;
+   }
+   maildir = talloc_asprintf (config, %s/%s, db_path, folder);
+   if (! maildir) {
+   fprintf (stderr, Out of memory\n);
+   return 1;
+   }
+}
 
 /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
  * from standard input may be interrupted. */
-- 
1.7.12.1

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch