Skip to content

Fixes in auth_complete_view #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Preston-Landers wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes in auth_complete_view #159

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8debaa5
Use `secrets` builtin module if available when autogenerating session…
Preston-Landers Jul 23, 2017
e630a34
Use `pyramid.SignedCookieSessionFactory` instead of `UnencryptedCooki…
Preston-Landers Jul 23, 2017
46889a0
Handle case where `SignedCookieSessionFactory` is not available.
Preston-Landers Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions velruse/app/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import sys

from anykeystore import create_store_from_settings

Expand All @@ -9,9 +10,15 @@
from velruse.app.utils import generate_token
from velruse.app.utils import redirect_form

try:
import secrets
except ImportError:
secrets = None

log = __import__('logging').getLogger(__name__)

PYTHON_2 = sys.version_info.major == 2


def auth_complete_view(context, request):
endpoint = request.registry.settings.get('endpoint')
Expand Down Expand Up @@ -73,7 +80,10 @@ def default_setup(config):
specified then an in-memory storage backend will be used.

"""
from pyramid.session import UnencryptedCookieSessionFactoryConfig
try:
from pyramid.session import SignedCookieSessionFactory as SessionFactory
except ImportError:
from pyramid.session import UnencryptedCookieSessionFactoryConfig as SessionFactory

log.info('Using an unencrypted cookie-based session. This can be '
'changed by pointing the "velruse.setup" setting at a different '
Expand All @@ -83,13 +93,18 @@ def default_setup(config):
secret = settings.get('session.secret')
cookie_name = settings.get('session.cookie_name', 'velruse.session')
if secret is None:
log.warn('Configuring unencrypted cookie-based session with a '
'random secret which will invalidate old cookies when '
'restarting the app.')
secret = ''.join('%02x' % ord(x) for x in os.urandom(16))
log.info(
'Configuring unencrypted cookie-based session with a '
'random secret which will invalidate old cookies when '
'restarting the app.')
if secrets is not None:
secret = secrets.token_urlsafe(32)
elif PYTHON_2:
secret = ''.join('%02x' % ord(x) for x in os.urandom(16))
else:
secret = ''.join('%02x' % x for x in os.urandom(16))
log.info('autogenerated session secret: %s', secret)
factory = UnencryptedCookieSessionFactoryConfig(
secret, cookie_name=cookie_name)
factory = SessionFactory(secret, cookie_name=cookie_name)
config.set_session_factory(factory)

# setup backing storage
Expand Down