From: Andrea Zagli Date: Fri, 12 May 2017 15:30:17 +0000 (+0200) Subject: Refactored function parse_stdin (for binary attached files). X-Git-Tag: v0.1.1~1^2~5^2~1 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=2d8ed58845dba7d74a6744ec597fc570683e8617;p=libzakcgi Refactored function parse_stdin (for binary attached files). --- diff --git a/debugcgi.sh b/debugcgi.sh index 17a20d3..2ec0bf0 100755 --- a/debugcgi.sh +++ b/debugcgi.sh @@ -1,4 +1,4 @@ #!/bin/bash -PID=`ps ax | grep $1 | awk '{ print $1 }'` -su -c "gdb --pid $PID --symbols=$2" +PID=`ps ax | grep $1 | grep -v grep | grep -v debugcgi | awk '{ print $1 }'` +su -c "gdb -p $PID -symbols=$2" diff --git a/src/main.c b/src/main.c index e2e90ae..7dee7ee 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2016 Andrea Zagli + * Copyright (C) 2015-2017 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,7 @@ #include #include +#include #include #include "main.h" @@ -34,13 +35,13 @@ static void zak_cgi_main_class_init (ZakCgiMainClass *class); static void zak_cgi_main_init (ZakCgiMain *zak_cgi_main); static void zak_cgi_main_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); + guint property_id, + const GValue *value, + GParamSpec *pspec); static void zak_cgi_main_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); + guint property_id, + GValue *value, + GParamSpec *pspec); static void zak_cgi_main_dispose (GObject *gobject); static void zak_cgi_main_finalize (GObject *gobject); @@ -779,53 +780,120 @@ gchar &error); if (l != bytesread) { - g_warning ("Error reading stdin: bytes read differ from content length"); + g_warning ("Error reading stdin: bytes read (%d) differ from content length (%d).", bytesread, l); } if (error != NULL) { g_warning ("Error reading stdin: %s", error->message); } + + FILE *fout; + fout = fopen("/tmp/pippo.txt", "wb"); + fwrite(ret, bytesread, 1, fout); + fclose(fout); } } if (zakcgimain != NULL) { - priv->stdin = g_strdup (ret); + priv->stdin = g_memdup (ret, bytesread); } return ret; } -static gchar -*zak_cgi_main_read_line (const gchar *buf, guint l, guint *i, - gboolean no_new_line_but_null_terminated, - guint *bytesread) +typedef struct { - gchar *line; - guint line_start; - guint count; + gchar *data; + gsize length; +} Block; + +static GPtrArray +*zak_cgi_main_split_content (const gchar *buf, + guint l, + const gchar *delimiter) +{ + guint i; + guint l_delimiter; + guint start; + + gchar *_delimiter; + + GPtrArray *ar; + + gsize length; + + _delimiter = g_strdup_printf ("%s%c%c", delimiter, 13, 10); + + ar = g_ptr_array_new (); - for (line_start = *i, count = 1; *i < l - 1; (*i)++, count++) + l_delimiter = strlen (_delimiter); + + FILE *fout; + fout = fopen ("/tmp/buf.txt", "wb"); + fwrite (buf, l, 1, fout); + fclose (fout); + + start = 0; + for (i = 0; i < (l - (l_delimiter + 2)); i++) { - if (buf[*i] == 13 && buf[*i + 1] == 10) + /* start to control if delimiter is reached */ + if (i >= l_delimiter + && memcmp (buf + (i - l_delimiter), _delimiter, l_delimiter) == 0) { - (*i)++; - count++; - break; + Block *b; + + length = i - l_delimiter - start; + + if (length > 0) + { + b = g_new0 (Block, 1); + + b->data = g_memdup (buf + start, length); + b->length = length; + + g_ptr_array_add (ar, b); + + FILE *fout; + fout = fopen (g_strdup_printf("/tmp/blocco_loop_%d_%d_%d.txt", i, start, length), "wb"); + fwrite (b->data, b->length, 1, fout); + fclose (fout); + } + + start = i; } } - line = (gchar *)g_memdup (buf + line_start, count); - if (no_new_line_but_null_terminated) + if (i >= l_delimiter) { - line[count - 2] = '\0'; - } + Block *b; + + length = i - start; + + b = g_new0 (Block, 1); + + b->data = g_memdup (buf + start, length); + b->length = length; + + g_ptr_array_add (ar, b); - *bytesread = count; + FILE *fout; + fout = fopen (g_strdup_printf("/tmp/blocco_loop_%d_%d_%d.txt", i, start, length), "wb"); + fwrite (b->data, b->length, 1, fout); + fclose (fout); + } - (*i)++; + for (i = 0; i < ar->len; i++) + { + FILE *fout; + Block *b; + b = (Block *)g_ptr_array_index(ar, i); + fout = fopen (g_strdup_printf("/tmp/blocco_%d.txt", i), "wb"); + fwrite (b->data, b->length, 1, fout); + fclose (fout); + } - return line; + return ar; } ZakCgiFile @@ -886,7 +954,7 @@ static GHashTable return ht; } - content_type = (gchar *)g_getenv ("CONTENT_TYPE"); + content_type = (gchar *)g_getenv ("CONTENT_TYPE"); if (content_type == NULL) { return ht; @@ -900,6 +968,10 @@ static GHashTable } else if (g_strcmp0 (splitted[0], "multipart/form-data") == 0) { + GPtrArray *content_splitted; + guint j; + guint l_boundary; + if (g_strv_length (splitted) > 1 && boundary == NULL) { @@ -916,171 +988,171 @@ static GHashTable } g_strfreev (splitted); + l_boundary = strlen (_boundary); + ht = g_hash_table_new (g_str_hash, g_str_equal); - i = 0; - do - { - /* read line */ - line = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread); - if (g_strcmp0 (line, _boundary) == 0) - { - /* content-disposition */ - gchar **v_content; - gchar **parts; - guint l_v_content; + content_splitted = zak_cgi_main_split_content (buf, l, _boundary); - gchar *param_name; - gchar *param_name_file; - gchar *param_value; - guint file_l; + for (j = 0; j < content_splitted->len; j++) + { + GMemoryInputStream *mstream; + GDataInputStream *dataistream; + gsize length; + GError *error; - GValue *gval; - GValue *gval_tmp; + Block *b; - ZakCgiFile *zgfile; + b = (Block *)g_ptr_array_index (content_splitted, j); - GPtrArray *ar; + if (b->length == 0 + || memcmp (b->data, "--", 2) == 0) + { + continue; + } - content_disposition = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread); + /* read line */ + mstream = G_MEMORY_INPUT_STREAM (g_memory_input_stream_new_from_data (b->data, b->length, NULL)); + dataistream = g_data_input_stream_new (G_INPUT_STREAM (mstream)); - v_content = g_strsplit (content_disposition, ";", -1); - l_v_content = g_strv_length (v_content); + /* content-disposition */ + gchar **v_content; + gchar **parts; + guint l_v_content; - parts = g_strsplit (v_content[1], "=", 2); - param_name = g_strndup (parts[1] + 1, strlen (parts[1]) - 2); - param_name[strlen (parts[1]) - 2] = '\0'; - g_strfreev (parts); + gchar *param_name; + gchar *param_name_file; + gchar *param_value; + guint file_l; - if (l_v_content == 3) - { - parts = g_strsplit (v_content[2], "=", 2); - param_name_file = g_strndup (parts[1] + 1, strlen (parts[1]) - 2); - param_name_file[strlen (parts[1]) - 2] = '\0'; - g_strfreev (parts); - - /* content-type */ - content_type = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread); - g_free (content_type); - } + GValue *gval; + GValue *gval_tmp; - g_strfreev (v_content); - g_free (content_disposition); + ZakCgiFile *zgfile; - /* empty */ - g_free (zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread)); + GPtrArray *ar; - if (l_v_content == 3) + error = NULL; + content_disposition = g_data_input_stream_read_line (dataistream, NULL, NULL, &error); + if (content_disposition == NULL) + { + if (error != NULL) { - param_value = (gchar *)g_malloc (1); - if (g_strcmp0 (param_name_file, "") != 0) - { - gboolean exit; - - exit = FALSE; - file_l = 0; - do - { - tmp = zak_cgi_main_read_line (buf, l, &i, FALSE, &bytesread); - - if (memcmp (tmp, _boundary, strlen (_boundary)) == 0) - { - i -= bytesread; - exit = TRUE; - } - else - { - param_value = g_realloc (param_value, file_l + bytesread); - memmove (param_value + file_l, tmp, bytesread); - file_l += bytesread; - } - - g_free (tmp); - } while (!exit); - } - else - { - /* empty */ - g_free (zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread)); - - file_l = 3; - param_value[0] = '\0'; - } + g_warning ("Error on read content disposition: %s", error->message); } else { - param_value = zak_cgi_main_read_line (buf, l, &i, TRUE, &bytesread); + g_warning ("No content disposition found."); } + } + + v_content = g_strsplit (content_disposition, ";", -1); + l_v_content = g_strv_length (v_content); + + parts = g_strsplit_set (v_content[1], "=\"", 0); + param_name = g_strdup (parts[2]); + g_strfreev (parts); + + if (l_v_content == 3) + { + parts = g_strsplit_set (v_content[2], "=\"", 0); + param_name_file = g_strdup (parts[2]); + g_strfreev (parts); + + /* content-type */ + content_type = g_data_input_stream_read_line (dataistream, &length, NULL, NULL); + g_free (content_type); + } - gval_tmp = g_new0 (GValue, 1); - if (l_v_content == 3) + g_strfreev (v_content); + g_free (content_disposition); + + /* empty */ + g_data_input_stream_read_line (dataistream, NULL, NULL, NULL); + + if (l_v_content == 3) + { + param_value = (gchar *)g_malloc (1); + if (g_strcmp0 (param_name_file, "") != 0) { - zgfile = (ZakCgiFile *)g_new0 (ZakCgiFile, 1); - zgfile->name = g_strdup (param_name_file); - zgfile->content = g_memdup (param_value, file_l - 2); - zgfile->size = file_l - 2; + tmp = g_data_input_stream_read_upto (dataistream, "", -1, &length, NULL, NULL); - g_value_init (gval_tmp, ZAK_CGI_TYPE_FILE); - g_value_take_boxed (gval_tmp, zgfile); + param_value = g_realloc (param_value, length); + memmove (param_value, tmp, length); + + file_l = length; } else { - g_value_init (gval_tmp, G_TYPE_STRING); - g_value_set_string (gval_tmp, g_strdup (param_value)); + /* empty */ + g_data_input_stream_read_line (dataistream, NULL, NULL, NULL); + + file_l = 2; + param_value[0] = '\0'; } + } + else + { + param_value = g_data_input_stream_read_line (dataistream, &length, NULL, NULL); + param_value[length - 1] = '\0'; + } - gval = g_hash_table_lookup (ht, param_name); - if (gval != NULL) + gval_tmp = g_new0 (GValue, 1); + if (l_v_content == 3) + { + zgfile = (ZakCgiFile *)g_new0 (ZakCgiFile, 1); + zgfile->name = g_strdup (param_name_file); + zgfile->content = g_memdup (param_value, file_l - 2); + zgfile->size = file_l - 2; + + g_value_init (gval_tmp, ZAK_CGI_TYPE_FILE); + g_value_take_boxed (gval_tmp, zgfile); + } + else + { + g_value_init (gval_tmp, G_TYPE_STRING); + g_value_set_string (gval_tmp, g_strdup (param_value)); + } + + gval = g_hash_table_lookup (ht, param_name); + if (gval != NULL) + { + if (!G_VALUE_HOLDS (gval, G_TYPE_PTR_ARRAY)) { - if (!G_VALUE_HOLDS (gval, G_TYPE_PTR_ARRAY)) - { - GValue *g; - - g = (GValue *)g_new0 (GValue, 1); - g_value_init (g, G_VALUE_TYPE (gval)); - g_value_copy (gval, g); - g_value_unset (gval); - - /* converto to GPtrArray */ - ar = g_ptr_array_new (); - - g_ptr_array_add (ar, g); - - g_value_init (gval, G_TYPE_PTR_ARRAY); - g_value_take_boxed (gval, ar); - g_hash_table_replace (ht, g_strdup (param_name), gval); - } - else - { - ar = (GPtrArray *)g_value_get_boxed (gval); - } - g_ptr_array_add (ar, gval_tmp); + GValue *g; + + g = (GValue *)g_new0 (GValue, 1); + g_value_init (g, G_VALUE_TYPE (gval)); + g_value_copy (gval, g); + g_value_unset (gval); + + /* converto to GPtrArray */ + ar = g_ptr_array_new (); + + g_ptr_array_add (ar, g); + + g_value_init (gval, G_TYPE_PTR_ARRAY); + g_value_take_boxed (gval, ar); + g_hash_table_replace (ht, g_strdup (param_name), gval); } else { - g_hash_table_replace (ht, g_strdup (param_name), gval_tmp); - } - - g_free (param_name); - g_free (param_value); - if (l_v_content == 3) - { - g_free (param_name_file); + ar = (GPtrArray *)g_value_get_boxed (gval); } + g_ptr_array_add (ar, gval_tmp); } else { - tmp = g_strdup_printf ("%s--", _boundary); - if (g_strcmp0 (line, tmp) == 0) - { - g_free (tmp); - break; - } - g_free (tmp); + g_hash_table_replace (ht, g_strdup (param_name), gval_tmp); } - g_free (line); - } while (i < l); + g_free (param_name); + g_free (param_value); + if (l_v_content == 3) + { + g_free (param_name_file); + } + } g_free (_boundary); } diff --git a/src/main.h b/src/main.h index 54f8f20..5a4eb79 100644 --- a/src/main.h +++ b/src/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Andrea Zagli + * Copyright (C) 2015-2017 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -91,7 +91,7 @@ struct _ZakCgiFile { gchar *name; gchar *content; - guint size; + guint size; }; #define ZAK_CGI_TYPE_FILE (zak_cgi_file_get_type ()) diff --git a/tests/env.c b/tests/env.c index c2bf08f..f578a73 100644 --- a/tests/env.c +++ b/tests/env.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2016 Andrea Zagli + * Copyright (C) 2015-2017 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -42,15 +42,15 @@ gchar iostream = NULL; gfile = g_file_new_tmp (g_strdup_printf ("cgi-XXXXXX-%s", zgfile->name), - &iostream, - NULL); + &iostream, + NULL); ostream = g_io_stream_get_output_stream (G_IO_STREAM (iostream)); g_output_stream_write (ostream, - zgfile->content, - zgfile->size, - NULL, - NULL); + zgfile->content, + zgfile->size, + NULL, + NULL); g_output_stream_close (ostream, NULL, NULL); g_object_unref (ostream); @@ -71,19 +71,19 @@ gchar void ht_foreach (gpointer key, - gpointer value, - gpointer user_data) + gpointer value, + gpointer user_data) { GString *str = (GString *)user_data; g_string_append_printf (str, "%s%s\n", - (gchar *)key, g_value_get_string ((GValue *)value)); + (gchar *)key, g_value_get_string ((GValue *)value)); } void ht_foreach_stdin (gpointer key, - gpointer value, - gpointer user_data) + gpointer value, + gpointer user_data) { gchar *ret; @@ -97,8 +97,8 @@ ht_foreach_stdin (gpointer key, { ret = get_value (g_ptr_array_index (ar, i)); g_string_append_printf (str, - "%s[%d]%s\n", - (gchar *)key, i, ret); + "%s[%d]%s\n", + (gchar *)key, i, ret); g_free (ret); } } @@ -106,8 +106,8 @@ ht_foreach_stdin (gpointer key, { ret = get_value ((GValue *)value); g_string_append_printf (str, - "%s%s\n", - (gchar *)key, ret); + "%s%s\n", + (gchar *)key, ret); g_free (ret); } } @@ -120,12 +120,12 @@ main (int argc, char *argv[]) GHashTable *ht; gchar *env; gchar *ret; - + sleep(10); zakcgimain = zak_cgi_main_new (); str = g_string_new ("\n" - "Environment variables\n" - "\n"); + "Environment variables\n" + "\n"); g_string_append_printf (str, "\n"); zak_cgi_main_env_foreach (zakcgimain, ht_foreach, str); @@ -136,19 +136,19 @@ main (int argc, char *argv[]) if (env != NULL) { g_string_append_printf (str, - "
\n" - "%s", - env); + "
\n" + "%s", + env); g_string_append_printf (str, "
\n
\n"); g_string_append_printf (str, - "\n", - zak_cgi_main_is_get (zakcgimain) ? "TRUE" : "FALSE"); + "\n", + zak_cgi_main_is_get (zakcgimain) ? "TRUE" : "FALSE"); g_string_append_printf (str, - "\n", - zak_cgi_main_is_post (zakcgimain) ? "TRUE" : "FALSE"); + "\n", + zak_cgi_main_is_post (zakcgimain) ? "TRUE" : "FALSE"); zak_cgi_main_stdin_foreach (zakcgimain, ht_foreach_stdin, str);
IS GET?%s
IS GET?%s
IS POST?%s
IS POST?%s