Heed cookies from 401s.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9795bbc43fe21e75ec2b07a9516e4e73beda516b..03795ef72b07ce76cf6d2b3389b356e6c63b7fd9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-27  Micah Cowan  <micah@cowan.name>
+
+       * http.c (gethttp): Make sure Wget heeds cookies when they
+       are sent with a 401 response; or any other sort of response for
+       that matter (#26775).
+
 2009-08-19  Micah Cowan  <micah@cowan.name>
 
        * openssl.c (ssl_check_certificate): Only warn about an attack if

diff --git a/src/http.c b/src/http.c
index a469745c46360d52f921da96b3c57fed5b4b71c3..a8705aa4b53f759aa95c9c42b12d4cf5e823c2f0 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1871,6 +1871,24 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
         }
     }
 
+  /* Handle (possibly multiple instances of) the Set-Cookie header. */
+  if (opt.cookies)
+    {
+      int scpos;
+      const char *scbeg, *scend;
+      /* The jar should have been created by now. */
+      assert (wget_cookie_jar != NULL);
+      for (scpos = 0;
+           (scpos = resp_header_locate (resp, "Set-Cookie", scpos,
+                                        &scbeg, &scend)) != -1;
+           ++scpos)
+        {
+          char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
+          cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port,
+                                    u->path, set_cookie);
+        }
+    }
+
   if (keep_alive)
     /* The server has promised that it will not close the connection
        when we're done.  This means that we can register it.  */
@@ -2099,24 +2117,6 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file));
   hs->newloc = resp_header_strdup (resp, "Location");
   hs->remote_time = resp_header_strdup (resp, "Last-Modified");
 
-  /* Handle (possibly multiple instances of) the Set-Cookie header. */
-  if (opt.cookies)
-    {
-      int scpos;
-      const char *scbeg, *scend;
-      /* The jar should have been created by now. */
-      assert (wget_cookie_jar != NULL);
-      for (scpos = 0;
-           (scpos = resp_header_locate (resp, "Set-Cookie", scpos,
-                                        &scbeg, &scend)) != -1;
-           ++scpos)
-        {
-          char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
-          cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port,
-                                    u->path, set_cookie);
-        }
-    }
-
   if (resp_header_copy (resp, "Content-Range", hdrval, sizeof (hdrval)))
     {
       wgint first_byte_pos, last_byte_pos, entity_length;

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 785b36e41f4e203bdbdf0c3a534106d144ca19e3..9d367e84048fb9766651436b4ebdd1f55223c911 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,18 @@
+2009-08-27  Micah Cowan  <micah@cowan.name>
+
+       * run-px: Added Test-cookies.px, Test-cookies-401.px
+
+       * Test-cookies.px: Basic testing to make sure Wget doesn't send
+       cookies; no path/domain checking.
+
+       * Test-cookies.px: Test to make sure Wget heeds cookies when they
+       are sent with a 401 response (#26775).
+
+       * HTTPServer.pm (send_response): Don't try to substitute port in
+       response body, if there isn't one.
+       (verify_request_headers): Avoid uninitialized warning when an
+       expected header isn't provided by Wget.
+
 2009-07-27  Micah Cowan  <micah@cowan.name>
 
        * Test-restrict-ascii.px: New.

diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
index 58b1a363b4fc0570ad45858f5fde20c80cb6d747..627c10283f539c0af44a5554dc13bcffd2e15d60 100644 (file)
--- a/tests/HTTPServer.pm
+++ b/tests/HTTPServer.pm
@@ -123,7 +123,7 @@ sub send_response {
             next;
         }
         # fill in content
-        $content = $self->_substitute_port($content);
+        $content = $self->_substitute_port($content) if defined $content;
         $resp->content($content);
         print STDERR "HTTP::Response with content: \n", $resp->as_string if $log;
     }
@@ -221,6 +221,7 @@ sub verify_request_headers {
         my $rhdr = $req->header ($hdrname);
         my $ehdr = $url_rec->{'request_headers'}{$hdrname};
         unless (defined $rhdr && $rhdr =~ $ehdr) {
+            $rhdr = '' unless defined $rhdr;
             print STDERR "\n*** Mismatch on $hdrname: $rhdr =~ $ehdr\n";
             return undef;
         }

diff --git a/tests/Test-cookies-401.px b/tests/Test-cookies-401.px
new file mode 100755 (executable)
index 0000000..bb0d60e
--- /dev/null
+++ b/tests/Test-cookies-401.px
@@ -0,0 +1,53 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $content = "You got it.\n";
+
+# code, msg, headers, content
+my %urls = (
+    '/one.txt' => {
+        code => "401",
+        msg => "Forbidden",
+        headers => {
+            "Set-Cookie" => "foo=bar",
+        },
+    },
+    '/two.txt' => {
+        code => "200",
+        msg => "Ok",
+        content => $content,
+        request_headers => {
+            "Cookie" => qr|foo=bar|,
+        },
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " -d http://localhost:{{port}}/one.txt"
+    . " http://localhost:{{port}}/two.txt";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'two.txt' => {
+        content => $content,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-cookies-401",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

diff --git a/tests/Test-cookies.px b/tests/Test-cookies.px
new file mode 100755 (executable)
index 0000000..ec22ef2
--- /dev/null
+++ b/tests/Test-cookies.px
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $page1 = "Hello, world!\n";
+my $page2 = "Goodbye, Sam.\n";
+
+# code, msg, headers, content
+my %urls = (
+    '/one.txt' => {
+        code => "200",
+        msg => "Ok",
+        headers => {
+            "Content-type" => "text/plain",
+            "Set-Cookie" => "foo=bar",
+        },
+        content => $page1,
+    },
+    '/two.txt' => {
+        code => "200",
+        msg => "Ok",
+        content => $page2,
+        request_headers => {
+            "Cookie" => qr|foo=bar|,
+        },
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " http://localhost:{{port}}/one.txt"
+    . " http://localhost:{{port}}/two.txt";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'one.txt' => {
+        content => $page1,
+    },
+    'two.txt' => {
+        content => $page2,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-cookies",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

diff --git a/tests/run-px b/tests/run-px
index 17a52cdffc9b088008e616c12110c3f7822a602a..e4e7c7dcad1818edb5e3f6e8c1db9d21d32345d1 100755 (executable)
--- a/tests/run-px
+++ b/tests/run-px
@@ -14,6 +14,8 @@ my @tests = (
     'Test-auth-basic.px',
     'Test-auth-no-challenge.px',
     'Test-auth-no-challenge-url.px',
+    'Test-cookies.px',
+    'Test-cookies-401.px',
     'Test-proxy-auth-basic.px',
     'Test-proxied-https-auth.px',
     'Test-N-HTTP-Content-Disposition.px',