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

Write cookies to a temporary file first, to be safe

Browse source 
It may happen that we are running out of space in the middle
of writing the file, and fopen deleted it already.
This commit is contained in:
Christian Dywan 2010-09-20 23:33:08 +02:00
parent 2c10312ce2
commit 16ce2e9516
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
katze/katze-http-cookies.c
View file

@ -16,9 +16,13 @@
#include "katze-http-cookies.h" #include "katze-http-cookies.h"
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <libsoup/soup.h> #include <libsoup/soup.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gstdio.h>
struct _KatzeHttpCookies struct _KatzeHttpCookies
{ {
@ -145,12 +149,12 @@ cookie_jar_load (SoupCookieJar* jar,
Copyright (C) 2008 Xan Lopez <xan@gnome.org> Copyright (C) 2008 Xan Lopez <xan@gnome.org>
Copyright (C) 2008 Dan Winship <danw@gnome.org> Copyright (C) 2008 Dan Winship <danw@gnome.org>
Copied from libSoup 2.24, coding style preserved */ Copied from libSoup 2.24, coding style preserved */
static void static gboolean
write_cookie (FILE *out, SoupCookie *cookie) write_cookie (FILE *out, SoupCookie *cookie)
{ {
fseek (out, 0, SEEK_END); fseek (out, 0, SEEK_END);
fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n", if (fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n",
cookie->http_only ? "#HttpOnly_" : "", cookie->http_only ? "#HttpOnly_" : "",
cookie->domain, cookie->domain,
*cookie->domain == '.' ? "TRUE" : "FALSE", *cookie->domain == '.' ? "TRUE" : "FALSE",
@ -158,7 +162,9 @@ write_cookie (FILE *out, SoupCookie *cookie)
cookie->secure ? "TRUE" : "FALSE", cookie->secure ? "TRUE" : "FALSE",
(gulong)soup_date_to_time_t (cookie->expires), (gulong)soup_date_to_time_t (cookie->expires),
cookie->name, cookie->name,
cookie->value); cookie->value) < 0)
return FALSE;
return TRUE;
} }
/* Cookie jar saving to Mozilla format /* Cookie jar saving to Mozilla format
@ -170,18 +176,21 @@ delete_cookie (const char *filename, SoupCookie *cookie)
{ {
char *contents = NULL, *line, *p; char *contents = NULL, *line, *p;
gsize length = 0; gsize length = 0;
gint fn = 0;
FILE *f; FILE *f;
gchar* temporary_filename = NULL;
SoupCookie *c; SoupCookie *c;
time_t now = time (NULL); time_t now = time (NULL);
if (!g_file_get_contents (filename, &contents, &length, NULL)) if (!g_file_get_contents (filename, &contents, &length, NULL))
return; return;
f = fopen (filename, "w"); fn = g_file_open_tmp (NULL, &temporary_filename, NULL);
if (!f) { if (fn == -1)
g_free (contents); goto failed;
return; f = fopen (temporary_filename, "w");
} if (!f)
goto failed;
line = contents; line = contents;
for (p = contents; *p; p++) { for (p = contents; *p; p++) {
@ -200,12 +209,24 @@ delete_cookie (const char *filename, SoupCookie *cookie)
c = parse_cookie (line, now); c = parse_cookie (line, now);
if (c) { if (c) {
if (!soup_cookie_equal (cookie, c)) if (!soup_cookie_equal (cookie, c))
write_cookie (f, c); if (!write_cookie (f, c))
goto failed;
soup_cookie_free (c); soup_cookie_free (c);
} }
if (!fclose (f))
goto failed;
g_free (contents); g_free (contents);
fclose (f); close (fn);
g_rename (temporary_filename, filename);
g_free (temporary_filename);
return;
failed:
g_free (contents);
close (fn);
g_unlink (temporary_filename);
g_free (temporary_filename);
} }
/* Cookie jar saving to Mozilla format /* Cookie jar saving to Mozilla format