diff -pruN 0.012-1/Changes 0.014-1/Changes --- 0.012-1/Changes 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/Changes 2022-07-25 13:46:01.000000000 +0000 @@ -1,5 +1,16 @@ Revision history for HTTP-CookieJar +0.014 2022-07-25 09:45:56-04:00 America/New_York + + - No changes from 0.013 + +0.013 2022-07-17 10:13:20-04:00 America/New_York (TRIAL RELEASE) + + [FIXED] + + - Cookie last access time is updated when a cookie is retrieved; this has + no functional effect but is consistent with RFC 6265. + 0.012 2021-06-16 05:34:31-04:00 America/New_York - No changes from 0.011 diff -pruN 0.012-1/cpanfile 0.014-1/cpanfile --- 0.012-1/cpanfile 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/cpanfile 2022-07-25 13:46:01.000000000 +0000 @@ -1,4 +1,4 @@ -# This file is generated by Dist::Zilla::Plugin::CPANFile v6.020 +# This file is generated by Dist::Zilla::Plugin::CPANFile v6.025 # Do not edit this file directly. To change prereqs, edit the `dist.ini` file. requires "Carp" => "0"; diff -pruN 0.012-1/debian/changelog 0.014-1/debian/changelog --- 0.012-1/debian/changelog 2021-09-04 14:23:27.000000000 +0000 +++ 0.014-1/debian/changelog 2022-08-01 17:54:25.000000000 +0000 @@ -1,3 +1,11 @@ +libhttp-cookiejar-perl (0.014-1) unstable; urgency=medium + + * Import upstream version 0.014. + * Update years of packaging copyright. + * Declare compliance with Debian Policy 4.6.1. + + -- gregor herrmann Mon, 01 Aug 2022 19:54:25 +0200 + libhttp-cookiejar-perl (0.012-1) unstable; urgency=medium * Import upstream version 0.012. diff -pruN 0.012-1/debian/control 0.014-1/debian/control --- 0.012-1/debian/control 2021-09-04 14:23:27.000000000 +0000 +++ 0.014-1/debian/control 2022-08-01 17:54:25.000000000 +0000 @@ -12,7 +12,7 @@ Build-Depends-Indep: libhttp-date-perl < liburi-perl , libwww-perl , perl -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libhttp-cookiejar-perl Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libhttp-cookiejar-perl.git Homepage: https://metacpan.org/release/HTTP-CookieJar diff -pruN 0.012-1/debian/copyright 0.014-1/debian/copyright --- 0.012-1/debian/copyright 2021-09-04 14:23:27.000000000 +0000 +++ 0.014-1/debian/copyright 2022-08-01 17:54:25.000000000 +0000 @@ -8,7 +8,7 @@ Copyright: 2013, David Golden +Copyright: 2014-2022, gregor herrmann License: Apache-2.0 or Artistic or GPL-1+ License: Apache-2.0 diff -pruN 0.012-1/lib/HTTP/CookieJar/LWP.pm 0.014-1/lib/HTTP/CookieJar/LWP.pm --- 0.012-1/lib/HTTP/CookieJar/LWP.pm 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/lib/HTTP/CookieJar/LWP.pm 2022-07-25 13:46:01.000000000 +0000 @@ -4,7 +4,7 @@ use warnings; package HTTP::CookieJar::LWP; # ABSTRACT: LWP adapter for HTTP::CookieJar -our $VERSION = '0.012'; +our $VERSION = '0.014'; use parent 'HTTP::CookieJar'; @@ -88,7 +88,7 @@ HTTP::CookieJar::LWP - LWP adapter for H =head1 VERSION -version 0.012 +version 0.014 =head1 SYNOPSIS diff -pruN 0.012-1/lib/HTTP/CookieJar.pm 0.014-1/lib/HTTP/CookieJar.pm --- 0.012-1/lib/HTTP/CookieJar.pm 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/lib/HTTP/CookieJar.pm 2022-07-25 13:46:01.000000000 +0000 @@ -4,7 +4,7 @@ use warnings; package HTTP::CookieJar; # ABSTRACT: A minimalist HTTP user agent cookie jar -our $VERSION = '0.012'; +our $VERSION = '0.014'; use Carp (); use HTTP::Date (); @@ -124,8 +124,8 @@ sub clear { #pod * secure -- if present, the cookie was set C #pod * httponly -- if present, the cookie was set C #pod * hostonly -- if present, the cookie may only be used with the domain as a host -#pod * creation_time -- epoch seconds since the cookie was first stored -#pod * last_access_time -- epoch seconds since the cookie was last stored +#pod * creation_time -- epoch time when the cookie was first stored +#pod * last_access_time -- epoch time when the cookie was last accessed (i.e. "now") #pod #pod Keep in mind that C means it should only be used in requests and not #pod made available via Javascript, etc. This is pretty meaningless for Perl user @@ -139,6 +139,13 @@ sub clear { sub cookies_for { my ( $self, $request ) = @_; + my @found = $self->_cookies_for($request); + return map { {%$_} } @found; +} + +# _cookies_for returns originals, not copies, which helps in testing +sub _cookies_for { + my ( $self, $request ) = @_; my ( $scheme, $host, $port, $request_path ) = eval { _split_url($request) }; Carp::croak($@) if $@; @@ -150,6 +157,7 @@ sub cookies_for { next if defined( $cookie->{expires} ) && $cookie->{expires} < $now; next unless _domain_match( $host, $cookie->{domain} ); next unless _path_match( $request_path, $cookie->{path} ); + $cookie->{last_access_time} = time; push @found, $cookie; } @found = sort { @@ -256,11 +264,9 @@ sub load_cookies { # private methods #--------------------------------------------------------------------------# -# return a copy of all cookies +# return flattened list of all cookies sub _all_cookies { - return map { - { %$_ } - } map { values %$_ } map { values %$_ } values %{ $_[0]->{store} }; + return map { values %$_ } map { values %$_ } values %{ $_[0]->{store} }; } #--------------------------------------------------------------------------# @@ -388,7 +394,7 @@ HTTP::CookieJar - A minimalist HTTP user =head1 VERSION -version 0.012 +version 0.014 =head1 SYNOPSIS @@ -490,11 +496,11 @@ hostonly -- if present, the cookie may o =item * -creation_time -- epoch seconds since the cookie was first stored +creation_time -- epoch time when the cookie was first stored =item * -last_access_time -- epoch seconds since the cookie was last stored +last_access_time -- epoch time when the cookie was last accessed (i.e. "now") =back diff -pruN 0.012-1/LICENSE 0.014-1/LICENSE --- 0.012-1/LICENSE 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/LICENSE 2022-07-25 13:46:01.000000000 +0000 @@ -192,7 +192,7 @@ This is free software, licensed under: same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2013 David Golden Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff -pruN 0.012-1/Makefile.PL 0.014-1/Makefile.PL --- 0.012-1/Makefile.PL 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/Makefile.PL 2022-07-25 13:46:01.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.020. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.025. use strict; use warnings; @@ -34,7 +34,7 @@ my %WriteMakefileArgs = ( "URI" => 0, "lib" => 0 }, - "VERSION" => "0.012", + "VERSION" => "0.014", "test" => { "TESTS" => "t/*.t" } diff -pruN 0.012-1/MANIFEST 0.014-1/MANIFEST --- 0.012-1/MANIFEST 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/MANIFEST 2022-07-25 13:46:01.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.020. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.025. CONTRIBUTING.mkdn Changes LICENSE @@ -15,6 +15,7 @@ perlcritic.rc t/00-report-prereqs.dd t/00-report-prereqs.t t/add.t +t/cookies_for.t t/examples.t t/lib/MockTime.pm t/parse.t diff -pruN 0.012-1/META.json 0.014-1/META.json --- 0.012-1/META.json 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/META.json 2022-07-25 13:46:01.000000000 +0000 @@ -4,7 +4,7 @@ "David Golden " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 6.020, CPAN::Meta::Converter version 2.150010", + "generated_by" : "Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010", "license" : [ "apache_2_0" ], @@ -90,11 +90,11 @@ "provides" : { "HTTP::CookieJar" : { "file" : "lib/HTTP/CookieJar.pm", - "version" : "0.012" + "version" : "0.014" }, "HTTP::CookieJar::LWP" : { "file" : "lib/HTTP/CookieJar/LWP.pm", - "version" : "0.012" + "version" : "0.014" } }, "release_status" : "stable", @@ -109,15 +109,15 @@ "web" : "https://github.com/dagolden/HTTP-CookieJar" } }, - "version" : "0.012", + "version" : "0.014", "x_authority" : "cpan:DAGOLDEN", "x_contributors" : [ "Dan Book ", "David Golden ", "jvolkening " ], - "x_generated_by_perl" : "v5.34.0", - "x_serialization_backend" : "Cpanel::JSON::XS version 4.26", + "x_generated_by_perl" : "v5.36.0", + "x_serialization_backend" : "Cpanel::JSON::XS version 4.29", "x_spdx_expression" : "Apache-2.0" } diff -pruN 0.012-1/META.yml 0.014-1/META.yml --- 0.012-1/META.yml 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/META.yml 2022-07-25 13:46:01.000000000 +0000 @@ -16,7 +16,7 @@ configure_requires: ExtUtils::MakeMaker: '6.17' perl: '5.008001' dynamic_config: 0 -generated_by: 'Dist::Zilla version 6.020, CPAN::Meta::Converter version 2.150010' +generated_by: 'Dist::Zilla version 6.025, CPAN::Meta::Converter version 2.150010' license: apache meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -33,10 +33,10 @@ no_index: provides: HTTP::CookieJar: file: lib/HTTP/CookieJar.pm - version: '0.012' + version: '0.014' HTTP::CookieJar::LWP: file: lib/HTTP/CookieJar/LWP.pm - version: '0.012' + version: '0.014' recommends: Mozilla::PublicSuffix: '0' requires: @@ -51,12 +51,12 @@ resources: bugtracker: https://github.com/dagolden/HTTP-CookieJar/issues homepage: https://github.com/dagolden/HTTP-CookieJar repository: https://github.com/dagolden/HTTP-CookieJar.git -version: '0.012' +version: '0.014' x_authority: cpan:DAGOLDEN x_contributors: - 'Dan Book ' - 'David Golden ' - 'jvolkening ' -x_generated_by_perl: v5.34.0 +x_generated_by_perl: v5.36.0 x_serialization_backend: 'YAML::Tiny version 1.73' x_spdx_expression: Apache-2.0 diff -pruN 0.012-1/README 0.014-1/README --- 0.012-1/README 2021-06-16 09:34:39.000000000 +0000 +++ 0.014-1/README 2022-07-25 13:46:01.000000000 +0000 @@ -2,7 +2,7 @@ NAME HTTP::CookieJar - A minimalist HTTP user agent cookie jar VERSION - version 0.012 + version 0.014 SYNOPSIS use HTTP::CookieJar; @@ -78,9 +78,10 @@ METHODS * hostonly -- if present, the cookie may only be used with the domain as a host - * creation_time -- epoch seconds since the cookie was first stored + * creation_time -- epoch time when the cookie was first stored - * last_access_time -- epoch seconds since the cookie was last stored + * last_access_time -- epoch time when the cookie was last accessed + (i.e. "now") Keep in mind that "httponly" means it should only be used in requests and not made available via Javascript, etc. This is pretty meaningless diff -pruN 0.012-1/t/cookies_for.t 0.014-1/t/cookies_for.t --- 0.012-1/t/cookies_for.t 1970-01-01 00:00:00.000000000 +0000 +++ 0.014-1/t/cookies_for.t 2022-07-25 13:46:01.000000000 +0000 @@ -0,0 +1,52 @@ +use 5.008001; +use strict; +use warnings; +use Test::More 0.96; +use Test::Deep '!blessed'; +use lib 't/lib'; +use MockTime; + +use HTTP::CookieJar; + +my $url = "http://example.com/foo/bar/"; +my @input = ( + [ $url, "SID=2; Path=/" ], + [ $url, "SID=1; Path=/foo" ], + [ $url, "SID=0; Path=/foo/bar" ], +); + +# MockTime keeps this constant +my $creation_time = time; + +my $jar = HTTP::CookieJar->new; +$jar->add(@$_) for @input; + +# Move up the clock for access time +MockTime->offset(10); +my $last_access_time = time; + +# Check that cookies_for has expected times +for my $c ( $jar->cookies_for($url) ) { + is( $c->{creation_time}, $creation_time, "$c->{name}=$c->{value} creation_time" ); + is( $c->{last_access_time}, $last_access_time, "$c->{name}=$c->{value} last_access_time" ); +} + +# Modify cookies from cookies_for and verify they aren't changed +# from private originals. +for my $c ( $jar->cookies_for($url) ) { + $c->{creation_time} = 0; +} +for my $c ( $jar->_cookies_for($url) ) { + is( $c->{creation_time}, $creation_time, "$c->{name}=$c->{value} creation_time" ); +} + +done_testing; +# +# This file is part of HTTP-CookieJar +# +# This software is Copyright (c) 2013 by David Golden. +# +# This is free software, licensed under: +# +# The Apache License, Version 2.0, January 2004 +#