diff --git a/pywb/rewrite/test/test_cookie_rewriter.py b/pywb/rewrite/test/test_cookie_rewriter.py index 4f57464f..1984fb5a 100644 --- a/pywb/rewrite/test/test_cookie_rewriter.py +++ b/pywb/rewrite/test/test_cookie_rewriter.py @@ -24,17 +24,28 @@ r""" >>> rewrite_cookie('abc@def=123') [] -# ExactCookieRewriter ->>> rewrite_cookie('some=value; Path=/diff/path/;', urlrewriter, ExactPathCookieRewriter) + +# ExactCookieRewriter -- always removes Path and Domain +>>> rewrite_cookie('some=value; Path=/diff/path/;', urlrewriter, 'exact') [('Set-Cookie', 'some=value')] ->>> rewrite_cookie('some=value; Domain=.example.com; Path=/diff/path/; Max-Age=1500', urlrewriter, ExactPathCookieRewriter) +>>> rewrite_cookie('some=value; Domain=.example.com; Path=/diff/path/; Max-Age=1500', urlrewriter, 'exact') [('Set-Cookie', 'some=value')] + +# RootCookieRewriter -- always sets Path=/, removes Domain +>>> rewrite_cookie('some=value; Path=/diff/path/;', urlrewriter, 'root') +[('Set-Cookie', 'some=value; Path=/')] + +>>> rewrite_cookie('some=value; Domain=.example.com; Path=/diff/path/; Max-Age=1500', urlrewriter, 'root') +[('Set-Cookie', 'some=value; Path=/')] + + + """ -from pywb.rewrite.cookie_rewriter import MinimalScopeCookieRewriter, ExactPathCookieRewriter +from pywb.rewrite.cookie_rewriter import MinimalScopeCookieRewriter, get_cookie_rewriter from pywb.rewrite.url_rewriter import UrlRewriter urlrewriter = UrlRewriter('20131226101010/http://example.com/some/path/index.html', '/pywb/') @@ -42,6 +53,7 @@ urlrewriter = UrlRewriter('20131226101010/http://example.com/some/path/index.htm urlrewriter2 = UrlRewriter('em_/http://example.com/', '/preview/') -def rewrite_cookie(cookie_str, rewriter=urlrewriter, cookie_rewriter=MinimalScopeCookieRewriter): +def rewrite_cookie(cookie_str, rewriter=urlrewriter, scope='default'): + cookie_rewriter = get_cookie_rewriter(scope) return cookie_rewriter(rewriter).rewrite(cookie_str) diff --git a/pywb/rewrite/test/test_html_rewriter.py b/pywb/rewrite/test/test_html_rewriter.py index 31515250..7e17e28f 100644 --- a/pywb/rewrite/test/test_html_rewriter.py +++ b/pywb/rewrite/test/test_html_rewriter.py @@ -72,6 +72,13 @@ ur""" >>> parse('