Cleanup and depend on social modules

Author: omab

Dockerfile

@@ -0,0 +1,5 @@
+FROM n42org/tox
+MAINTAINER Matías Aguirre <[email protected]>
+RUN apt-get update
+RUN apt-get install -y make libssl-dev libxml2-dev libxmlsec1-dev mongodb-server mongodb-dev swig openssl
+RUN ln -s /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl/opensslconf.h

Makefile

@@ -14,9 +14,28 @@ publish:
 	python setup.py bdist_wheel --python-tag py2 upload
 	BUILD_VERSION=3 python setup.py bdist_wheel --python-tag py3 upload
 
+run-tox:
+	@ tox
+
+docker-tox-build:
+	@ docker build -t omab/psa-legacy .
+
+docker-tox: docker-tox-build
+	@ docker run -it --rm \
+		     --name psa-legacy-test \
+		     -v "`pwd`:/code" \
+		     -w /code omab/psa-legacy tox
+
+docker-shell: docker-tox-build
+	@ docker run -it --rm \
+		     --name psa-legacy-test \
+		     -v "`pwd`:/code" \
+		     -w /code omab/psa-legacy bash
+
 clean:
-	find . -name '*.py[co]' -delete
-	find . -name '__pycache__' -delete
-	rm -rf python_social_auth.egg-info dist build
+	@ find . -name '*.py[co]' -delete
+	@ find . -name '__pycache__' -delete
+	@ rm -rf *.egg-info dist build
+
 
 .PHONY: site docs publish

requirements-python3.txt

@@ -4,3 +4,17 @@ oauthlib>=1.0.3
 requests-oauthlib>=0.6.1
 six>=1.10.0
 PyJWT>=1.4.0
+social-auth-core
+social-auth-storage-mongoengine
+social-auth-storage-peewee
+social-auth-storage-sqlalchemy
+social-auth-app-cherrypy
+social-auth-app-django
+social-auth-app-django-mongoengine
+social-auth-app-flask
+social-auth-app-flask-mongoengine
+social-auth-app-flask-peewee
+social-auth-app-flask-sqlalchemy
+social-auth-app-pyramid
+social-auth-app-tornado
+social-auth-app-webpy

requirements.txt

@@ -1,6 +1 @@
-python-openid>=2.2.5
-requests>=2.9.1
-oauthlib>=1.0.3
-requests-oauthlib>=0.6.1
-six>=1.10.0
-PyJWT>=1.4.0
+social-auth-core

social/actions.py

@@ -1,122 +1 @@
-from social.p3 import quote
-from social.utils import sanitize_redirect, user_is_authenticated, \
-                         user_is_active, partial_pipeline_data, setting_url
-
-
-def do_auth(backend, redirect_name='next'):
-    # Clean any partial pipeline data
-    backend.strategy.clean_partial_pipeline()
-
-    # Save any defined next value into session
-    data = backend.strategy.request_data(merge=False)
-
-    # Save extra data into session.
-    for field_name in backend.setting('FIELDS_STORED_IN_SESSION', []):
-        if field_name in data:
-            backend.strategy.session_set(field_name, data[field_name])
-
-    if redirect_name in data:
-        # Check and sanitize a user-defined GET/POST next field value
-        redirect_uri = data[redirect_name]
-        if backend.setting('SANITIZE_REDIRECTS', True):
-            allowed_hosts = backend.setting('ALLOWED_REDIRECT_HOSTS', []) + \
-                            [backend.strategy.request_host()]
-            redirect_uri = sanitize_redirect(allowed_hosts, redirect_uri)
-        backend.strategy.session_set(
-            redirect_name,
-            redirect_uri or backend.setting('LOGIN_REDIRECT_URL')
-        )
-    return backend.start()
-
-
-def do_complete(backend, login, user=None, redirect_name='next',
-                *args, **kwargs):
-    data = backend.strategy.request_data()
-
-    is_authenticated = user_is_authenticated(user)
-    user = is_authenticated and user or None
-
-    partial = partial_pipeline_data(backend, user, *args, **kwargs)
-    if partial:
-        xargs, xkwargs = partial
-        user = backend.continue_pipeline(*xargs, **xkwargs)
-    else:
-        user = backend.complete(user=user, *args, **kwargs)
-
-    # pop redirect value before the session is trashed on login(), but after
-    # the pipeline so that the pipeline can change the redirect if needed
-    redirect_value = backend.strategy.session_get(redirect_name, '') or \
-                     data.get(redirect_name, '')
-
-    user_model = backend.strategy.storage.user.user_model()
-    if user and not isinstance(user, user_model):
-        return user
-
-    if is_authenticated:
-        if not user:
-            url = setting_url(backend, redirect_value, 'LOGIN_REDIRECT_URL')
-        else:
-            url = setting_url(backend, redirect_value,
-                              'NEW_ASSOCIATION_REDIRECT_URL',
-                              'LOGIN_REDIRECT_URL')
-    elif user:
-        if user_is_active(user):
-            # catch is_new/social_user in case login() resets the instance
-            is_new = getattr(user, 'is_new', False)
-            social_user = user.social_user
-            login(backend, user, social_user)
-            # store last login backend name in session
-            backend.strategy.session_set('social_auth_last_login_backend',
-                                         social_user.provider)
-
-            if is_new:
-                url = setting_url(backend,
-                                  'NEW_USER_REDIRECT_URL',
-                                  redirect_value,
-                                  'LOGIN_REDIRECT_URL')
-            else:
-                url = setting_url(backend, redirect_value,
-                                  'LOGIN_REDIRECT_URL')
-        else:
-            if backend.setting('INACTIVE_USER_LOGIN', False):
-                social_user = user.social_user
-                login(backend, user, social_user)
-            url = setting_url(backend, 'INACTIVE_USER_URL', 'LOGIN_ERROR_URL',
-                              'LOGIN_URL')
-    else:
-        url = setting_url(backend, 'LOGIN_ERROR_URL', 'LOGIN_URL')
-
-    if redirect_value and redirect_value != url:
-        redirect_value = quote(redirect_value)
-        url += ('?' in url and '&' or '?') + \
-               '{0}={1}'.format(redirect_name, redirect_value)
-
-    if backend.setting('SANITIZE_REDIRECTS', True):
-        allowed_hosts = backend.setting('ALLOWED_REDIRECT_HOSTS', []) + \
-                        [backend.strategy.request_host()]
-        url = sanitize_redirect(allowed_hosts, url) or \
-              backend.setting('LOGIN_REDIRECT_URL')
-    return backend.strategy.redirect(url)
-
-
-def do_disconnect(backend, user, association_id=None, redirect_name='next',
-                  *args, **kwargs):
-    partial = partial_pipeline_data(backend, user, *args, **kwargs)
-    if partial:
-        xargs, xkwargs = partial
-        if association_id and not xkwargs.get('association_id'):
-            xkwargs['association_id'] = association_id
-        response = backend.disconnect(*xargs, **xkwargs)
-    else:
-        response = backend.disconnect(user=user, association_id=association_id,
-                                      *args, **kwargs)
-
-    if isinstance(response, dict):
-        response = backend.strategy.redirect(
-            backend.strategy.absolute_uri(
-                backend.strategy.request_data().get(redirect_name, '') or
-                backend.setting('DISCONNECT_REDIRECT_URL') or
-                backend.setting('LOGIN_REDIRECT_URL')
-            )
-        )
-    return response
+from social_core.actions import do_auth, do_complete, do_disconnect

social/apps/cherrypy_app/models.py

@@ -1,57 +1 @@
-"""Flask SQLAlchemy ORM models for Social Auth"""
-import cherrypy
-
-from sqlalchemy import Column, Integer, String, ForeignKey
-from sqlalchemy.orm import relationship
-from sqlalchemy.ext.declarative import declarative_base
-
-from social.utils import setting_name, module_member
-from social.storage.sqlalchemy_orm import SQLAlchemyUserMixin, \
-                                          SQLAlchemyAssociationMixin, \
-                                          SQLAlchemyNonceMixin, \
-                                          BaseSQLAlchemyStorage
-
-
-SocialBase = declarative_base()
-
-DB_SESSION_ATTR = cherrypy.config.get(setting_name('DB_SESSION_ATTR'), 'db')
-UID_LENGTH = cherrypy.config.get(setting_name('UID_LENGTH'), 255)
-User = module_member(cherrypy.config[setting_name('USER_MODEL')])
-
-
-class CherryPySocialBase(object):
-    @classmethod
-    def _session(cls):
-        return getattr(cherrypy.request, DB_SESSION_ATTR)
-
-
-class UserSocialAuth(CherryPySocialBase, SQLAlchemyUserMixin, SocialBase):
-    """Social Auth association model"""
-    uid = Column(String(UID_LENGTH))
-    user_id = Column(Integer, ForeignKey(User.id),
-                     nullable=False, index=True)
-    user = relationship(User, backref='social_auth')
-
-    @classmethod
-    def username_max_length(cls):
-        return User.__table__.columns.get('username').type.length
-
-    @classmethod
-    def user_model(cls):
-        return User
-
-
-class Nonce(CherryPySocialBase, SQLAlchemyNonceMixin, SocialBase):
-    """One use numbers"""
-    pass
-
-
-class Association(CherryPySocialBase, SQLAlchemyAssociationMixin, SocialBase):
-    """OpenId account association"""
-    pass
-
-
-class CherryPyStorage(BaseSQLAlchemyStorage):
-    user = UserSocialAuth
-    nonce = Nonce
-    association = Association
+from social_cherrypy.models import CherryPySocialBase, UserSocialAuth, Nonce, Association, CherryPyStorage

social/apps/cherrypy_app/utils.py

@@ -1,51 +1 @@
-import warnings
-from functools import wraps
-
-import cherrypy
-
-from social.utils import setting_name, module_member
-from social.strategies.utils import get_strategy
-from social.backends.utils import get_backend, user_backends_data
-
-
-DEFAULTS = {
-    'STRATEGY': 'social.strategies.cherrypy_strategy.CherryPyStrategy',
-    'STORAGE': 'social.apps.cherrypy_app.models.CherryPyStorage'
-}
-
-
-def get_helper(name):
-    return cherrypy.config.get(setting_name(name), DEFAULTS.get(name, None))
-
-
-def load_backend(strategy, name, redirect_uri):
-    backends = get_helper('AUTHENTICATION_BACKENDS')
-    Backend = get_backend(backends, name)
-    return Backend(strategy=strategy, redirect_uri=redirect_uri)
-
-
-def psa(redirect_uri=None):
-    def decorator(func):
-        @wraps(func)
-        def wrapper(self, backend=None, *args, **kwargs):
-            uri = redirect_uri
-            if uri and backend and '%(backend)s' in uri:
-                uri = uri % {'backend': backend}
-            self.strategy = get_strategy(get_helper('STRATEGY'),
-                                         get_helper('STORAGE'))
-            self.backend = load_backend(self.strategy, backend, uri)
-            return func(self, backend, *args, **kwargs)
-        return wrapper
-    return decorator
-
-
-def backends(user):
-    """Load Social Auth current user data to context under the key 'backends'.
-    Will return the output of social.backends.utils.user_backends_data."""
-    return user_backends_data(user, get_helper('AUTHENTICATION_BACKENDS'),
-                              module_member(get_helper('STORAGE')))
-
-
-def strategy(*args, **kwargs):
-    warnings.warn('@strategy decorator is deprecated, use @psa instead')
-    return psa(*args, **kwargs)
+from social_cherrypy.utils import get_helper, load_backend, psa, backends, strategy

social/apps/cherrypy_app/views.py

@@ -1,29 +1 @@
-import cherrypy
-
-from social.utils import setting_name, module_member
-from social.actions import do_auth, do_complete, do_disconnect
-from social.apps.cherrypy_app.utils import psa
-
-
-class CherryPyPSAViews(object):
-    @cherrypy.expose
-    @psa('/complete/%(backend)s')
-    def login(self, backend):
-        return do_auth(self.backend)
-
-    @cherrypy.expose
-    @psa('/complete/%(backend)s')
-    def complete(self, backend, *args, **kwargs):
-        login = cherrypy.config.get(setting_name('LOGIN_METHOD'))
-        do_login = module_member(login) if login else self.do_login
-        user = getattr(cherrypy.request, 'user', None)
-        return do_complete(self.backend, do_login, user=user, *args, **kwargs)
-
-    @cherrypy.expose
-    @psa()
-    def disconnect(self, backend, association_id=None):
-        user = getattr(cherrypy.request, 'user', None)
-        return do_disconnect(self.backend, user, association_id)
-
-    def do_login(self, backend, user, social_user):
-        backend.strategy.session_set('user_id', user.id)
+from social_cherrypy.views import CherryPyPSAViews

social/apps/django_app/__init__.py

@@ -1,21 +0,0 @@
-"""
-Django framework support.
-
-To use this:
-  * Add 'social.apps.django_app.default' if using default ORM,
-    or 'social.apps.django_app.me' if using mongoengine
-  * Add url('', include('social.apps.django_app.urls', namespace='social')) to
-    urls.py
-  * Define SOCIAL_AUTH_STORAGE and SOCIAL_AUTH_STRATEGY, default values:
-    SOCIAL_AUTH_STRATEGY = 'social.strategies.django_strategy.DjangoStrategy'
-    SOCIAL_AUTH_STORAGE = 'social.apps.django_app.default.models.DjangoStorage'
-"""
-import django
-
-
-if django.VERSION[0] == 1 and django.VERSION[1] < 7:
-    from social.strategies.utils import set_current_strategy_getter
-    from social.apps.django_app.utils import load_strategy
-    # Set strategy loader method to workaround current strategy getter needed on
-    # get_user() method on authentication backends when working with Django
-    set_current_strategy_getter(load_strategy)