Commit c8e2f759 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #17931 -- Accepted aware datetimes to set cookies expiry dates. Thanks... 

Fixed #17931 -- Accepted aware datetimes to set cookies expiry dates. Thanks jaddison for the report.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c7cc4cfb

django/http/__init__.py

+9 −3
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ from django.http.utils import * 
from django.utils.datastructures import MultiValueDict, ImmutableList

from django.utils.encoding import smart_str, iri_to_uri, force_unicode

from django.utils.http import cookie_date

from django.utils import timezone



RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
@@ -641,13 +642,18 @@ class HttpResponse(object): 
        """

        Sets a cookie.



        ``expires`` can be a string in the correct format or a

        ``datetime.datetime`` object in UTC. If ``expires`` is a datetime

        object then ``max_age`` will be calculated.

        ``expires`` can be:

        - a string in the correct format,

        - a naive ``datetime.datetime`` object in UTC,

        - an aware ``datetime.datetime`` object in any time zone.

        If it is a ``datetime.datetime`` object then ``max_age`` will be calculated.



        """

        self.cookies[key] = value

        if expires is not None:

            if isinstance(expires, datetime.datetime):

                if timezone.is_aware(expires):

                    expires = timezone.make_naive(expires, timezone.utc)

                delta = expires - expires.utcnow()

                # Add one second so the date matches exactly (a fraction of

                # time gets lost between converting to a timedelta and

tests/regressiontests/requests/tests.py

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_r 
from django.test.utils import get_warnings_state, restore_warnings_state

from django.utils import unittest

from django.utils.http import cookie_date

from django.utils.timezone import utc





class RequestsTests(unittest.TestCase):
@@ -207,6 +208,15 @@ class RequestsTests(unittest.TestCase): 
        datetime_cookie = response.cookies['datetime']

        self.assertEqual(datetime_cookie['max-age'], 10)



    def test_aware_expiration(self):

        "Cookie accepts an aware datetime as expiration time"

        response = HttpResponse()

        expires = (datetime.utcnow() + timedelta(seconds=10)).replace(tzinfo=utc)

        time.sleep(0.001)

        response.set_cookie('datetime', expires=expires)

        datetime_cookie = response.cookies['datetime']

        self.assertEqual(datetime_cookie['max-age'], 10)



    def test_far_expiration(self):

        "Cookie will expire when an distant expiration time is provided"

        response = HttpResponse()