debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework form history with policy decision and better error handling

Browse source
This commit is contained in:
Alexander Butenko 2009-11-12 21:54:25 +01:00 committed by Christian Dywan
parent 204f0fd98a
commit 57a58f39a4
1 changed files with 109 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
extensions/formhistory.c
View file

@ -8,12 +8,13 @@
version 2.1 of the License, or (at your option) any later version. version 2.1 of the License, or (at your option) any later version.
*/ */
#define MAXCHARS 20 #define MAXCHARS 60
#define MINCHARS 2 #define MINCHARS 2
#include <midori/midori.h> #include <midori/midori.h>
#include "config.h" #include "config.h"
#include "midori/sokoke.h"
#include <glib/gstdio.h> #include <glib/gstdio.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
@ -77,6 +78,22 @@ formhistory_prepare_js ()
return TRUE; return TRUE;
} }
static gchar*
formhistory_fixup_value (char* value)
{
guint i = 0;
g_strchomp (value);
while (value[i])
{
if (value[i] == '\n')
value[i] = ' ';
else if (value[i] == '"')
value[i] = '\'';
i++;
}
return value;
}
static gchar* static gchar*
formhistory_build_js () formhistory_build_js ()
{ {
@ -128,24 +145,17 @@ formhistory_update_database (gpointer db,
} }
static void static void
formhistory_update_main_hash (GHashTable* keys, formhistory_update_main_hash (gchar* key,
gpointer db) gchar* value)
{ {
GHashTableIter iter;
gchar* key;
gchar* value;
g_hash_table_iter_init (&iter, keys);
while (g_hash_table_iter_next (&iter, (gpointer)&key, (gpointer)&value))
{
guint length; guint length;
gchar* tmp; gchar* tmp;
if (!(value && *value)) if (!(value && *value))
continue; return;
length = strlen (value); length = strlen (value);
if (length > MAXCHARS || length < MINCHARS) if (length > MAXCHARS || length < MINCHARS)
continue; return;
if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key))) if ((tmp = g_hash_table_lookup (global_keys, (gpointer)key)))
{ {
@ -154,47 +164,79 @@ formhistory_update_main_hash (GHashTable* keys,
G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)) G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
{ {
gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue); gchar* new_value = g_strdup_printf ("%s%s,", tmp, rvalue);
formhistory_fixup_value (new_value);
g_hash_table_insert (global_keys, g_strdup (key), new_value); g_hash_table_insert (global_keys, g_strdup (key), new_value);
formhistory_update_database (db, key, value);
} }
g_free (rvalue); g_free (rvalue);
} }
else else
{ {
gchar* new_value = g_strdup_printf ("\"%s\",",value); gchar* new_value = g_strdup_printf ("\"%s\",",value);
formhistory_fixup_value (new_value);
g_hash_table_replace (global_keys, g_strdup (key), new_value); g_hash_table_replace (global_keys, g_strdup (key), new_value);
formhistory_update_database (db, key, value);
}
} }
} }
static void #if WEBKIT_CHECK_VERSION (1, 1, 4)
formhistory_session_request_queued_cb (SoupSession* session, static gboolean
SoupMessage* msg, formhistory_navigation_decision_cb (WebKitWebView* web_view,
WebKitWebFrame* web_frame,
WebKitNetworkRequest* request,
WebKitWebNavigationAction* action,
WebKitWebPolicyDecision* decision,
MidoriExtension* extension) MidoriExtension* extension)
{ {
gchar* method = katze_object_get_string (msg, "method"); gchar* exception;
if (method && !strncmp (method, "POST", 4)) JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
{ /* The script returns form data in the form "field_name|,|value|,|field_type".
SoupMessageBody* body = msg->request_body; We are handling only input fields with 'text' or 'password' type.
if (soup_message_body_get_accumulate (body)) The field separator is "|||" */
{ const gchar* script = "function dumpForm (inputs) {"
SoupBuffer* buffer; " var out = '';"
GHashTable* keys; " for (i=0;i<inputs.length;i++) {"
gpointer db; " if (inputs[i].value && (inputs[i].type == 'text' || inputs[i].type == 'password')) {"
" var ename = inputs[i].getAttribute('name');"
" var eid = inputs[i].getAttribute('id');"
" if (!ename && eid)"
" ename=eid;"
" out += ename+'|,|'+inputs[i].value +'|,|'+inputs[i].type +'|||';"
" }"
" }"
" return out;"
"}"
"dumpForm (document.getElementsByTagName('input'))";
buffer = soup_message_body_flatten (body); if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED
keys = soup_form_decode (body->data); || webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED)
{
db = g_object_get_data (G_OBJECT (extension), "formhistory-db"); gchar* value = sokoke_js_script_eval (js_context, script, &exception);
formhistory_update_main_hash (keys, db); if (value)
soup_buffer_free (buffer); {
g_hash_table_destroy (keys); gpointer db = g_object_get_data (G_OBJECT (extension), "formhistory-db");
gchar** inputs = g_strsplit (value, "|||", 0);
guint i = 0;
while (inputs[i] != NULL)
{
gchar** parts = g_strsplit (inputs[i], "|,|", 3);
if (parts && parts[0] && parts[1] && parts[2])
{
/* FIXME: We need to handle passwords */
if (strcmp (parts[2], "password"))
{
formhistory_update_main_hash (parts[0], parts[1]);
formhistory_update_database (db, parts[0], parts[1]);
} }
} }
g_free (method); g_strfreev (parts);
i++;
}
g_strfreev (inputs);
g_free (value);
}
}
return FALSE;
} }
#endif
static void static void
formhistory_window_object_cleared_cb (GtkWidget* web_view, formhistory_window_object_cleared_cb (GtkWidget* web_view,
@ -212,11 +254,12 @@ formhistory_add_tab_cb (MidoriBrowser* browser,
MidoriExtension* extension) MidoriExtension* extension)
{ {
GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
SoupSession *session = webkit_get_default_session ();
g_signal_connect (web_view, "window-object-cleared", g_signal_connect (web_view, "window-object-cleared",
G_CALLBACK (formhistory_window_object_cleared_cb), NULL); G_CALLBACK (formhistory_window_object_cleared_cb), NULL);
g_signal_connect (session, "request-queued", #if WEBKIT_CHECK_VERSION (1, 1, 4)
G_CALLBACK (formhistory_session_request_queued_cb), extension); g_signal_connect (web_view, "navigation-policy-decision-requested",
G_CALLBACK (formhistory_navigation_decision_cb), extension);
#endif
} }
static void static void
@ -250,13 +293,14 @@ formhistory_deactivate_tabs (MidoriView* view,
MidoriExtension* extension) MidoriExtension* extension)
{ {
GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view)); GtkWidget* web_view = gtk_bin_get_child (GTK_BIN (view));
SoupSession *session = webkit_get_default_session ();
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
browser, formhistory_add_tab_cb, extension); browser, formhistory_add_tab_cb, extension);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
web_view, formhistory_window_object_cleared_cb, NULL); web_view, formhistory_window_object_cleared_cb, NULL);
#if WEBKIT_CHECK_VERSION (1, 1, 4)
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
session, formhistory_session_request_queued_cb, extension); web_view, formhistory_navigation_decision_cb, extension);
#endif
} }
static void static void
@ -307,8 +351,7 @@ formhistory_add_field (gpointer data,
&& colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "value")) && colname[i + 2] && !g_ascii_strcasecmp (colname[i + 2], "value"))
{ {
gchar* key = argv[i + 1]; gchar* key = argv[i + 1];
gchar* new_value = g_strdup_printf ("\"%s\",", argv[i + 2]); formhistory_update_main_hash (g_strdup (key), g_strdup (argv[i + 2]));
g_hash_table_replace (global_keys, g_strdup (key), new_value);
} }
} }
} }