diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | TODO.txt | 2 | ||||
| -rw-r--r-- | docs/zcml/authtktauthenticationpolicy.rst | 2 | ||||
| -rw-r--r-- | pyramid/authentication.py | 4 | ||||
| -rw-r--r-- | pyramid/tests/test_zcml.py | 4 | ||||
| -rw-r--r-- | pyramid/zcml.py | 4 |
6 files changed, 13 insertions, 9 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 955c07601..893fb3f5f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -152,3 +152,9 @@ Backwards Incompatibilities (with BFG 1.3.X) during internationalization for caching purposes were never APIs. These however have changed to ``localizer`` and ``locale_name``, respectively. +- The default ``cookie_name`` value of the ``authtktauthenticationpolicy`` ZCML + now defaults to ``auth_tkt`` (it used to default to ``repoze.bfg.auth_tkt``). + +- The default ``cookie_name`` value of the + ``pyramid.authentication.AuthTktAuthenticationPolicy`` constructor now + defaults to ``auth_tkt`` (it used to default to ``repoze.bfg.auth_tkt``). @@ -76,8 +76,6 @@ - ``docs`` directory for each paster template. -- repoze.bfg.auth_tkt - - "BFG" in environ variables. - request.link (route_url) diff --git a/docs/zcml/authtktauthenticationpolicy.rst b/docs/zcml/authtktauthenticationpolicy.rst index fd97a42eb..1119de9b0 100644 --- a/docs/zcml/authtktauthenticationpolicy.rst +++ b/docs/zcml/authtktauthenticationpolicy.rst @@ -25,7 +25,7 @@ Attributes ``cookie_name`` The ``cookie_name`` is the name used for the cookie that contains - the user information. It defaults to ``repoze.bfg.auth_tkt``. + the user information. It defaults to ``auth_tkt``. ``secure`` ``secure`` is a boolean value. If it's set to "true", the cookie diff --git a/pyramid/authentication.py b/pyramid/authentication.py index 126ed5ec8..a68f660c3 100644 --- a/pyramid/authentication.py +++ b/pyramid/authentication.py @@ -177,7 +177,7 @@ class AuthTktAuthenticationPolicy(CallbackAuthenticationPolicy): ``cookie_name`` - Default: ``repoze.bfg.auth_tkt``. The cookie name used + Default: ``auth_tkt``. The cookie name used (string). Optional. ``secure`` @@ -242,7 +242,7 @@ class AuthTktAuthenticationPolicy(CallbackAuthenticationPolicy): def __init__(self, secret, callback=None, - cookie_name='repoze.bfg.auth_tkt', + cookie_name='auth_tkt', secure=False, include_ip=False, timeout=None, diff --git a/pyramid/tests/test_zcml.py b/pyramid/tests/test_zcml.py index b996dff53..5de9229cf 100644 --- a/pyramid/tests/test_zcml.py +++ b/pyramid/tests/test_zcml.py @@ -446,7 +446,7 @@ class TestAuthTktAuthenticationPolicyDirective(unittest.TestCase): def callback(identity, request): """ """ self._callFUT(context, 'sosecret', callback=callback, - cookie_name='repoze.bfg.auth_tkt', + cookie_name='auth_tkt', secure=True, include_ip=True, timeout=100, reissue_time=60, http_only=True, path="/sub/") actions = context.actions @@ -469,7 +469,7 @@ class TestAuthTktAuthenticationPolicyDirective(unittest.TestCase): self.assertRaises(ConfigurationError, self._callFUT, context, 'sosecret', callback=callback, - cookie_name='repoze.bfg.auth_tkt', + cookie_name='auth_tkt', secure=True, include_ip=True, timeout=100, reissue_time=500, http_only=True, path="/cgi-bin/app.cgi/") diff --git a/pyramid/zcml.py b/pyramid/zcml.py index 5382deb99..e2ea64d9b 100644 --- a/pyramid/zcml.py +++ b/pyramid/zcml.py @@ -482,7 +482,7 @@ class IAuthTktAuthenticationPolicyDirective(Interface): secret = TextLine(title=u'secret', required=True) callback = GlobalObject(title=u'callback', required=False) cookie_name = ASCIILine(title=u'cookie_name', required=False, - default='repoze.bfg.auth_tkt') + default='auth_tkt') secure = Bool(title=u"secure", required=False, default=False) include_ip = Bool(title=u"include_ip", required=False, default=False) timeout = Int(title=u"timeout", required=False, default=None) @@ -494,7 +494,7 @@ class IAuthTktAuthenticationPolicyDirective(Interface): def authtktauthenticationpolicy(_context, secret, callback=None, - cookie_name='repoze.bfg.auth_tkt', + cookie_name='auth_tkt', secure=False, include_ip=False, timeout=None, |