Author: jmb Date: Fri Feb 2 23:08:13 2007 New Revision: 3165 URL: http://svn.semichrome.net?rev=3165&view=rev Log: Fix handling of cookies in unverifiable transactions caused by a redirect from a fetch into a browser window which was varifiable. Modified: trunk/netsurf/content/content.c trunk/netsurf/content/fetch.c trunk/netsurf/content/fetch.h trunk/netsurf/content/fetchcache.c trunk/netsurf/content/fetchcache.h trunk/netsurf/css/css.c trunk/netsurf/desktop/browser.c trunk/netsurf/render/html.c trunk/netsurf/riscos/plugin.c Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3165&r1... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Fri Feb 2 23:08:13 2007 @@ -535,6 +535,8 @@ c->user_list->next->next) { /* type not shareable, and more than one user: split into * a content per user */ + const char *referer = fetch_get_referer(c->fetch); + while (c->user_list->next->next) { clone = content_create(c->url); if (!clone) { @@ -566,10 +568,11 @@ } content_remove_user(c, callback, p1, p2); content_broadcast(clone, CONTENT_MSG_NEWPTR, msg_data); - fetchcache_go(clone, fetch_get_referer(c->fetch), + fetchcache_go(clone, referer, callback, p1, p2, clone->width, clone->height, - 0, 0, false); + 0, 0, false, + referer ? referer : c->url); } } Modified: trunk/netsurf/content/fetch.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.c?rev=3165&r1=3... ============================================================================== --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Fri Feb 2 23:08:13 2007 @@ -69,6 +69,8 @@ char *url; /**< URL. */ char *referer; /**< URL for Referer header. */ bool send_referer; /**< Valid to send the referer */ + char *parent_fetch_url; /**< URL of parent fetch (not necessarily + * the same as the referer) */ void *p; /**< Private data for callback. */ struct curl_slist *headers; /**< List of request headers. */ char *host; /**< Host part of URL. */ @@ -310,7 +312,7 @@ unsigned long size), void *p, bool only_2xx, const char *post_urlenc, struct form_successful_control *post_multipart, - bool verifiable, char *headers[]) + bool verifiable, const char *parent_url, char *headers[]) { char *host; struct fetch *fetch; @@ -372,6 +374,7 @@ strcasecmp(ref1, ref2) == 0) fetch->send_referer = true; } + fetch->parent_fetch_url = parent_url ? strdup(parent_url) : 0; fetch->p = p; fetch->headers = 0; fetch->host = host; @@ -404,6 +407,7 @@ fetch->r_next = 0; if (!fetch->url || (referer && !fetch->referer) || + (parent_url && !fetch->parent_fetch_url) || (post_urlenc && !fetch->post_urlenc) || (post_multipart && !fetch->post_multipart)) goto failed; @@ -478,6 +482,7 @@ if (ref2) free(ref2); free(fetch->url); + free(fetch->parent_fetch_url); free(fetch->referer); free(fetch->post_urlenc); if (fetch->post_multipart) @@ -794,6 +799,7 @@ curl_easy_cleanup(f->curl_handle); free(f->url); free(f->host); + free(f->parent_fetch_url); free(f->referer); free(f->location); free(f->cookie_string); @@ -1223,15 +1229,17 @@ /* extract Set-Cookie header */ SKIP_ST(11); - /* If the fetch is unverifiable and there's no referer, - * err on the side of caution and do not set the cookie */ - - if (f->verifiable || f->referer) { + /* If the fetch is unverifiable and there's no parent fetch + * url, err on the side of caution and do not set the + cookie */ + + if (f->verifiable || f->parent_fetch_url) { /* If the transaction's verifiable, we don't require - * that the request uri and the referer domain match, - * so don't pass in the referer in this case. */ + * that the request uri and the parent domain match, + * so don't pass in the parent in this case. */ urldb_set_cookie(&data[i], f->url, - f->verifiable ? 0 : f->referer); + f->verifiable ? 0 + : f->parent_fetch_url); } } Modified: trunk/netsurf/content/fetch.h URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.h?rev=3165&r1=3... ============================================================================== --- trunk/netsurf/content/fetch.h (original) +++ trunk/netsurf/content/fetch.h Fri Feb 2 23:08:13 2007 @@ -72,7 +72,7 @@ unsigned long size), void *p, bool only_2xx, const char *post_urlenc, struct form_successful_control *post_multipart, - bool verifiable, char *headers[]); + bool verifiable, const char *parent_url, char *headers[]); void fetch_abort(struct fetch *f); void fetch_poll(void); void fetch_quit(void); Modified: trunk/netsurf/content/fetchcache.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetchcache.c?rev=3165&... ============================================================================== --- trunk/netsurf/content/fetchcache.c (original) +++ trunk/netsurf/content/fetchcache.c Fri Feb 2 23:08:13 2007 @@ -204,6 +204,7 @@ * \param post_urlenc url encoded post data, or 0 if none * \param post_multipart multipart post data, or 0 if none * \param verifiable this transaction is verifiable + * \param parent_url URL of fetch which spawned this one, or 0 if none * * Errors will be sent back through the callback. */ @@ -215,7 +216,7 @@ int width, int height, char *post_urlenc, struct form_successful_control *post_multipart, - bool verifiable) + bool verifiable, const char *parent_url) { char error_message[500]; union content_msg_data msg_data; @@ -309,7 +310,7 @@ fetchcache_callback, content, content->no_error_pages, post_urlenc, post_multipart, verifiable, - headers); + parent_url, headers); for (i = 0; headers[i]; i++) free(headers[i]); free(headers); @@ -771,7 +772,7 @@ for (u = c->user_list->next; u; u = u->next) { fetchcache_go(c, referer, u->callback, u->p1, u->p2, c->width, c->height, 0, 0, - false); + false, ref ? referer : c->url); } free(referer); Modified: trunk/netsurf/content/fetchcache.h URL: http://svn.semichrome.net/trunk/netsurf/content/fetchcache.h?rev=3165&... ============================================================================== --- trunk/netsurf/content/fetchcache.h (original) +++ trunk/netsurf/content/fetchcache.h Fri Feb 2 23:08:13 2007 @@ -39,6 +39,6 @@ int width, int height, char *post_urlenc, struct form_successful_control *post_multipart, - bool verifiable); + bool verifiable, const char *parent_url); #endif Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3165&r1=3164&am... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Fri Feb 2 23:08:13 2007 @@ -877,7 +877,7 @@ fetchcache_go(c->data.css.import_content[i], c->url, css_atimport_callback, (intptr_t) c, i, c->width, c->height, - 0, 0, false); + 0, 0, false, c->url); } free(url); @@ -949,7 +949,7 @@ c->url, css_atimport_callback, (intptr_t) c, i, css->width, css->height, - 0, 0, false); + 0, 0, false, c->url); } break; Modified: trunk/netsurf/desktop/browser.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.c?rev=3165&r1... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Fri Feb 2 23:08:13 2007 @@ -64,7 +64,7 @@ const char *url, char *post_urlenc, struct form_successful_control *post_multipart, bool history_add, const char *referer, bool download, - bool verifiable); + bool verifiable, const char *parent_url); static void browser_window_callback(content_msg msg, struct content *c, intptr_t p1, intptr_t p2, union content_msg_data data); static void browser_window_refresh(void *p); @@ -175,12 +175,12 @@ */ void browser_window_go(struct browser_window *bw, const char *url, - const char* referer, bool history_add) + const char *referer, bool history_add) { /* All fetches passing through here are verifiable * (i.e are the result of user action) */ browser_window_go_post(bw, url, 0, 0, history_add, referer, - false, true); + false, true, referer); } @@ -195,12 +195,12 @@ */ void browser_window_go_unverifiable(struct browser_window *bw, - const char *url, const char* referer, bool history_add) + const char *url, const char *referer, bool history_add) { /* All fetches passing through here are unverifiable * (i.e are not the result of user action) */ browser_window_go_post(bw, url, 0, 0, history_add, referer, - false, false); + false, false, referer); } /** @@ -214,6 +214,8 @@ * \param referer the referring uri (copied), or 0 if none * \param download download, rather than render the uri * \param verifiable this transaction is verifiable + * \param parent_url URL of fetch which spawned this one (copied), + * or 0 if none * * Any existing fetches in the window are aborted. * @@ -227,7 +229,7 @@ char *post_urlenc, struct form_successful_control *post_multipart, bool history_add, const char *referer, bool download, - bool verifiable) + bool verifiable, const char *parent_url) { struct content *c; char *url2; @@ -337,7 +339,7 @@ bw->download = download; fetchcache_go(c, referer, browser_window_callback, (intptr_t) bw, 0, width, height, - post_urlenc, post_multipart, verifiable); + post_urlenc, post_multipart, verifiable, parent_url); } @@ -475,6 +477,9 @@ break; case CONTENT_MSG_REDIRECT: + { + const char *prev_url = bw->loading_content->url; + bw->loading_content = 0; browser_window_set_status(bw, messages_get("Redirecting")); @@ -483,7 +488,9 @@ * referer across the redirect */ browser_window_go_post(bw, data.redirect, 0, 0, bw->history_add, bw->referer, - bw->download, false); + bw->download, false, + bw->referer ? bw->referer : prev_url); + } break; case CONTENT_MSG_REFORMAT: @@ -789,7 +796,7 @@ } bw->current_content->fresh = false; browser_window_go_post(bw, bw->current_content->url, 0, 0, - false, 0, false, true); + false, 0, false, true, 0); } @@ -1443,7 +1450,7 @@ mouse & BROWSER_MOUSE_MOD_1) { /* force download of link */ browser_window_go_post(bw, url, 0, 0, false, - c->url, true, true); + c->url, true, true, 0); } else if (mouse & BROWSER_MOUSE_CLICK_1) { bw = browser_window_find_target(bw, target); @@ -2304,14 +2311,14 @@ } browser_window_go_post(bw_form, form->action, data, 0, true, bw->current_content->url, - false, true); + false, true, 0); break; case method_POST_MULTIPART: browser_window_go_post(bw_form, form->action, 0, success, true, bw->current_content->url, - false, true); + false, true, 0); break; default: Modified: trunk/netsurf/render/html.c URL: http://svn.semichrome.net/trunk/netsurf/render/html.c?rev=3165&r1=316... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Fri Feb 2 23:08:13 2007 @@ -613,10 +613,10 @@ if (!c->data.html.stylesheet_content[STYLESHEET_BASE]) return false; c->active++; - fetchcache_go(c->data.html.stylesheet_content[STYLESHEET_BASE], 0, - html_convert_css_callback, (intptr_t) c, + fetchcache_go(c->data.html.stylesheet_content[STYLESHEET_BASE], + c->url, html_convert_css_callback, (intptr_t) c, STYLESHEET_BASE, c->width, c->height, - 0, 0, false); + 0, 0, false, 0); if (option_block_ads) { c->data.html.stylesheet_content[STYLESHEET_ADBLOCK] = @@ -629,9 +629,9 @@ c->active++; fetchcache_go(c->data.html. stylesheet_content[STYLESHEET_ADBLOCK], - 0, html_convert_css_callback, (intptr_t) c, - STYLESHEET_ADBLOCK, c->width, - c->height, 0, 0, false); + c->url, html_convert_css_callback, + (intptr_t) c, STYLESHEET_ADBLOCK, c->width, + c->height, 0, 0, false, 0); } for (node = head == 0 ? 0 : head->children; node; node = node->next) { @@ -703,7 +703,7 @@ c->url, html_convert_css_callback, (intptr_t) c, i, c->width, c->height, - 0, 0, false); + 0, 0, false, c->url); free(url); i++; @@ -890,7 +890,8 @@ c->url, html_convert_css_callback, (intptr_t) c, i, css->width, - css->height, 0, 0, false); + css->height, 0, 0, false, + c->url); } break; @@ -977,7 +978,7 @@ fetchcache_go(c_fetch, c->url, html_object_callback, (intptr_t) c, i, available_width, available_height, - 0, 0, false); + 0, 0, false, c->url); return true; } @@ -1044,7 +1045,7 @@ html_object_callback, (intptr_t) c, i, c->data.html.object[i].box->width, c->data.html.object[i].box->height, - post_urlenc, post_multipart, false); + post_urlenc, post_multipart, false, c->url); return true; } @@ -1144,7 +1145,8 @@ html_object_callback, (intptr_t) c, i, 0, 0, - 0, 0, false); + 0, 0, + false, c->url); } } break; Modified: trunk/netsurf/riscos/plugin.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/plugin.c?rev=3165&r1=3... ============================================================================== --- trunk/netsurf/riscos/plugin.c (original) +++ trunk/netsurf/riscos/plugin.c Fri Feb 2 23:08:13 2007 @@ -1659,7 +1659,7 @@ p->c = c; fetchcache_go(c, 0, plugin_stream_callback, (intptr_t)p, 0, - 100, 100, 0, 0, false); + 100, 100, 0, 0, false, 0); return true; }