Merge remote-tracking branch 'brett/itsdangerous'
* brett/itsdangerous: Call is_updated instead of testing it boolean. Harden It's Dangerous key management. First tests for the Session class. Set a starting value for session.send_new_cookie. Remove beaker stuff from the code. Delete the session cookie on an empty session. Back sessions with It's Dangerous. Improve fs security for itsdangerous secret. Docs for get_timed_signer_url. Basic itsdangerous infrastructure. Conflicts: mediagoblin/tests/test_cache.py
This commit is contained in:
@@ -1,50 +0,0 @@
|
||||
# GNU MediaGoblin -- federated, autonomous media hosting
|
||||
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
from mediagoblin import mg_globals
|
||||
|
||||
|
||||
DATA_TO_CACHE = {
|
||||
'herp': 'derp',
|
||||
'lol': 'cats'}
|
||||
|
||||
|
||||
def _get_some_data(key):
|
||||
"""
|
||||
Stuid function that makes use of some caching.
|
||||
"""
|
||||
some_data_cache = mg_globals.cache.get_cache('sum_data')
|
||||
if some_data_cache.has_key(key):
|
||||
return some_data_cache.get(key)
|
||||
|
||||
value = DATA_TO_CACHE.get(key)
|
||||
some_data_cache.put(key, value)
|
||||
return value
|
||||
|
||||
|
||||
def test_cache_working(test_app):
|
||||
some_data_cache = mg_globals.cache.get_cache('sum_data')
|
||||
assert not some_data_cache.has_key('herp')
|
||||
assert _get_some_data('herp') == 'derp'
|
||||
assert some_data_cache.get('herp') == 'derp'
|
||||
# should get the same value again
|
||||
assert _get_some_data('herp') == 'derp'
|
||||
|
||||
# now we force-change it, but the function should use the cached
|
||||
# version
|
||||
some_data_cache.put('herp', 'pred')
|
||||
assert _get_some_data('herp') == 'pred'
|
||||
30
mediagoblin/tests/test_session.py
Normal file
30
mediagoblin/tests/test_session.py
Normal file
@@ -0,0 +1,30 @@
|
||||
# GNU MediaGoblin -- federated, autonomous media hosting
|
||||
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from mediagoblin.tools import session
|
||||
|
||||
def test_session():
|
||||
sess = session.Session()
|
||||
assert not sess
|
||||
assert not sess.is_updated()
|
||||
sess['user_id'] = 27
|
||||
assert sess
|
||||
assert not sess.is_updated()
|
||||
sess.save()
|
||||
assert sess.is_updated()
|
||||
sess.delete()
|
||||
assert not sess
|
||||
assert sess.is_updated()
|
||||
@@ -45,9 +45,7 @@ TEST_USER_DEV = pkg_resources.resource_filename(
|
||||
'mediagoblin.tests', 'test_user_dev')
|
||||
|
||||
|
||||
USER_DEV_DIRECTORIES_TO_SETUP = [
|
||||
'media/public', 'media/queue',
|
||||
'beaker/sessions/data', 'beaker/sessions/lock']
|
||||
USER_DEV_DIRECTORIES_TO_SETUP = ['media/public', 'media/queue']
|
||||
|
||||
BAD_CELERY_MESSAGE = """\
|
||||
Sorry, you *absolutely* must run tests with the
|
||||
|
||||
Reference in New Issue
Block a user