Update README

CHANGELOG.md

@@ -1,19 +0,0 @@
-### 1.0.3 2021-08-31
-
-- Migrated to aioredis 2
-- SameSite support https://github.com/sanderfoobar/quart-session/commit/8daae3a6734e8f7da13954d5a1a5da8f5fc5a49a
-- Memcached stuff https://github.com/filak/quart-session/commit/004871c495a069784e57e604b69f65af1b7e645a
-
-### 1.0.0 2020-01-15
-
-- Added support for arbitrary usage of caching backends.
-    - Exposed `get`, `set`, `delete` on the session interface for direct usage.
-- Renamed `SESSION_HIJACK_REVERSE_PROXY` to `SESSION_REVERSE_PROXY`.
-- Renamed `SESSION_HIJACK_PROTECTION` to `SESSION_PROTECTION`.
-- Removed fallback when `X-Forwarded-For` is not present whilst USING `SESSION_REVERSE_PROXY`, emit error instead.
-- Fixed a bug where session timeouts would default to 600 seconds.
-- Deprecated/disabled the `dirty()` method.
-
-### 0.0.1 2020-01-04
-
-- Released initial pre alpha version.

LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2014 by Shipeng Feng.
-Copyright (c) 2020 by Sander.
+Copyright (c) 2020 by dsc.
 
 Some rights reserved.
 

MANIFEST.in

@@ -1,9 +0,0 @@
-include LICENSE
-include CHANGELOG.md
-include README.md
-include setup.cfg
-recursive-include quart_session *.py
-recursive-include quart_session *.md
-exclude .gitlab-ci.yml
-exclude examples
-exclude docs

README.md

@@ -1,15 +1,14 @@
-# Quart-Session
+# Quart-session
 
-![pyversions](https://img.shields.io/pypi/pyversions/Quart-Session.svg) [![pypiversion](https://badge.fury.io/py/Quart-Session.svg)](https://pypi.org/project/Quart-Session/) ![PyPI license](https://img.shields.io/pypi/l/Quart-Session.svg)
+Quart-Session is an extension for Quart that adds support for
-
-Quart-Session is an extension for [Quart](https://gitlab.com/pgjones/quart/blob/master/README.rst) that adds support for
 server-side sessions to your application.
 
 Based on [flask-session](https://pypi.org/project/Flask-Session/).
 
 ## Quick start
 
-Quart-Session can be installed via pipenv or pip,
+Quart-Session can be installed via pipenv or
+pip,
 
 ```bash
 $ pipenv install quart-session
@@ -56,13 +55,13 @@ app.config['SESSION_TYPE'] = 'redis'
 
 @app.before_serving
 async def setup():
-    cache = await aioredis.create_redis_pool(...)
+    cache = await aioredis.create_redis_pool({"address": "..."})
     app.config['SESSION_REDIS'] = cache
     Session(app)
 ```
 
 By default, Quart-session creates a single connection to Redis, while
-the example above sets up a connection pool.
+the example above creates a connection pool.
 
 #### Trio support
 
@@ -90,8 +89,8 @@ Session(app)
 ### JSON serializer
 
 [flask-session](https://pypi.org/project/Flask-Session/) uses `pickle`
-for session data while Quart-Session uses [a JSON serializer](https://gitlab.com/pgjones/quart/blob/37e249b9b146824a8668eaa1daa12392aeb00256/src/quart/json/tag.py#L141)
+for session data, Quart-Session opts for a JSON serializer capable of
-capable of serializing the usual JSON types, as well as: `Tuple`, `Bytes`,
+(de)serializing the usual JSON types, as well as: `Tuple`, `Bytes`,
 `Markup`, `UUID`, and `DateTime`.
 
 JSON as session data allows for greater interoperability with other
@@ -113,69 +112,86 @@ except ImportError:
 app.session_interface.serialize = pickle
 ```
 
-### Back-end usage
+### Session control
 
-At any point you may interface with the session back-end directly:
+By default, [flask-session](https://pypi.org/project/Flask-Session/) sets a
-
-```python3
-@app.route("/")
-async def hello():
-    cache = app.session_interface
-    await cache.set("random_key", "val", expiry=3600)
-    data = await cache.get("random_key")
-```
-
-The interface will have the `get`, `set`, and `delete` methods available (regardless of
-back-end - similar to how [aiocache](https://github.com/argaen/aiocache) works).
-
-### Performance
-
-[flask-session](https://pypi.org/project/Flask-Session/) sets a
 session for each incoming request, including static files. From experience,
-this often puts unneeded load on underlying session infrastructure,
+this approach can put unneeded load on underlying session infrastructure,
 especially in high-traffic environments.
 
-Quart-Session only contacts the back-end when a session changed (or created). In addition,
+Quart-Session offers control over the session creation. For example, often you'll only need to create a session when
-static file serves never emit a `Set-Cookie` header. If you'd like to enable
+a user successfully logs in.
-this though, set `SESSION_STATIC_FILE` to `True`.
 
-
+To enable this behaviour, set `SESSION_EXPLICIT` to `True`.
-### Session pinning
-
-Associates an user's session to his/her IP address. This mitigates cookie stealing via XSS etc, and is handy
-for web applications that require extra security.
 
 ```python3
 app = Quart(__name__)
 app.config['SESSION_TYPE'] = 'redis'
-app.config['SESSION_PROTECTION'] = True
+app.config['SESSION_EXPLICIT'] = True
+Session(app)
+
+@app.route('/')
+async def root():
+    if session.get('authenticated'):
+        return "Welcome back!"
+    return "Welcome anonymous!"
+
+@app.route('/login')
+async def login():
+    session["authenticated"] = True
+    session.dirty()  # mark session for saving
+    return 'Logged in!'
+
+app.run()
+```
+
+To re-gain the old behaviour of always emitting a `Set-Cookie` header on static file serves,
+set `SESSION_STATIC_FILE` to `True`.
+
+
+### Session hijack prevention
+
+(Optionally) pins an user's session to his/her IP address. This mitigates cookie stealing via XSS etc, and is handy
+for paranoid web applications.
+
+```python3
+app = Quart(__name__)
+app.config['SESSION_TYPE'] = 'redis'
+app.config['SESSION_HIJACK_PROTECTION'] = True
 Session(app)
 ```
 
-Session reuse from a different IP will now result in the creation of a new session, and the deletion of the old.
+With this option, session reuse from a different IP will result in the
+creation of a new session, and the deletion of the old.
 
 **Important:** If your application is behind a reverse proxy, it most
 likely provides the `X-Forwarded-For` header which you **must** make use of
-by explicitly setting `SESSION_REVERSE_PROXY` to `True`.
+by explicitly setting `SESSION_HIJACK_REVERSE_PROXY` to `True`.
 
 ## Future development
 
+The following session interfaces would be nice to have:
+
 - `MongoDBSessionInterface`
 - `FileSystemSessionInterface`
 - `GoogleCloudDatastoreSessionInterface`
-- Pytest
 
-## Flask-Session
+Other to-do's:
+
+- Unit testing
+- Documentation (Sphinx)
+
+## Migrating from Flask
 
 This library works very similarly to [flask-session](https://pypi.org/project/Flask-Session/).
-The changes are specified below:
+The `quart_session.sessions` APIs are not 100% the same, but unless you
+are embedded in Flask-Session's internals, a migration should be fairly
+straightforward. The distinct changes are specified below:
 
-- Quart-Session does not emit a `Set-Cookie` on every request.
+- Quart-Session does not `Set-Cookie` on (static) files by default.
-- Quart-Session does not emit a `Set-Cookie` on static file serves.
+- Quart-Session might not have all the back-end interfaces implemented (yet), such as "filesystem".
 - Quart-Session uses a different serializer: `quart.json.tag.TaggedJSONSerializer` instead of `pickle`.
 - Quart-Session disallows the client to supply their own made up `sid` cookie value.
-- Quart-Session can do session protection.
-- Quart-Session might not have all the back-end interfaces implemented (yet), such as "filesystem".
 
 ## Help
 

examples/hello.py

@@ -5,7 +5,7 @@
 
     Quart-Session demo.
 
-    :copyright: (c) 2020 by Sander.
+    :copyright: (c) 2020 by dsc.
     :license: BSD, see LICENSE for more details.
 """
 from quart import Quart, session
@@ -21,13 +21,13 @@ Session(app)
 
 
 @app.route('/set/')
-async def set():
+def set():
     session['key'] = 'value'
     return 'ok'
 
 
 @app.route('/get/')
-async def get():
+def get():
     return session.get('key', 'not set')
 
 

quart_session/__init__.py

@@ -6,13 +6,15 @@
     Adds server session support to your application.
 
     :copyright: (c) 2014 by Shipeng Feng.
-    :copyright: (c) 2020 by Sander.
+    :copyright: (c) 2020 by dsc.
     :license: BSD, see LICENSE for more details.
 """
 
-__version__ = '1.0.3'
+__version__ = '0.0.1'
 
 import os
+import sniffio
+from typing import Optional
 
 from quart import Quart
 
@@ -78,8 +80,8 @@ class Session(object):
         config.setdefault('SESSION_PERMANENT', True)
         config.setdefault('SESSION_USE_SIGNER', False)
         config.setdefault('SESSION_KEY_PREFIX', 'session:')
-        config.setdefault('SESSION_PROTECTION', False)
+        config.setdefault('SESSION_HIJACK_PROTECTION', False)
-        config.setdefault('SESSION_REVERSE_PROXY', False)
+        config.setdefault('SESSION_HIJACK_REVERSE_PROXY', False)
         config.setdefault('SESSION_STATIC_FILE', False)
         config.setdefault('SESSION_EXPLICIT', False)
         config.setdefault('SESSION_REDIS', None)
@@ -90,18 +92,6 @@ class Session(object):
         config.setdefault('SESSION_FILE_MODE', 384)
         config = {k: v for k, v in config.items() if k.startswith('SESSION_')}
 
-        if isinstance(config.get("SESSION_HIJACK_PROTECTION"), bool):
-            app.logger.warning("Deprecation: `SESSION_HIJACK_PROTECTION` "
-                               "has been renamed to `SESSION_PROTECTION`")
-
-        if isinstance(config.get("SESSION_HIJACK_REVERSE_PROXY"), str):
-            app.logger.warning("Deprecation: `SESSION_HIJACK_REVERSE_PROXY` "
-                               "has been renamed to `SESSION_REVERSE_PROXY`")
-
-        backend_warning = f"Please specify a session backend. " \
-                          f"Available interfaces: redis, redis+trio, " \
-                          f"memcached, null. e.g: app.config['SESSION_TYPE'] = 'redis'"
-
         if config['SESSION_TYPE'] == 'redis':
             options = {
                 "redis": config['SESSION_REDIS'],
@@ -133,15 +123,7 @@ class Session(object):
                 use_signer=config['SESSION_USE_SIGNER'],
                 permanent=config['SESSION_PERMANENT'],
                 **config)
-        elif config['SESSION_TYPE'] == 'null':
-            app.logger.warning(f"{backend_warning}. Currently using: null")
-            session_interface = NullSessionInterface(
-                key_prefix=config['SESSION_KEY_PREFIX'],
-                use_signer=config['SESSION_USE_SIGNER'],
-                permanent=config['SESSION_PERMANENT'],
-                **config)
         else:
-            raise NotImplementedError(f"No such session interface "
+            session_interface = NullSessionInterface()
-                                      f"\"{config['SESSION_TYPE']}\". {backend_warning}")
 
         return session_interface

quart_session/sessions.py

@@ -6,15 +6,15 @@
     Server-side Sessions and SessionInterfaces.
 
     :copyright: (c) 2014 by Shipeng Feng.
-    :copyright: (c) 2020 by Sander.
+    :copyright: (c) 2020 by dsc.
     :license: BSD, see LICENSE for more details.
 """
 import time
-from typing import Optional
+from typing import Any, Callable, Optional, TYPE_CHECKING
 from uuid import uuid4
 import asyncio
 
-from quart import Quart, current_app
+from quart import Quart
 from quart.wrappers import BaseRequestWebsocket, Response
 from quart.wrappers.response import FileBody
 from quart.sessions import SessionInterface as QuartSessionInterface, SecureCookieSession
@@ -36,12 +36,7 @@ class ServerSideSession(SecureCookieSession):
             self.permanent = permanent
         if addr:
             self.addr = addr
-        self.modified = False
+        self._dirty = False
-
-    def dirty(self):
-        current_app.logger.warning("Deprecation: `dirty()` has "
-                                   "been made obsolete. Will be "
-                                   "removed soon^tm.")
 
     @property
     def addr(self) -> str:
@@ -51,6 +46,28 @@ class ServerSideSession(SecureCookieSession):
     def addr(self, value: str) -> None:
         self['_addr'] = value  # type: ignore
 
+    def dirty(self):
+        """Marks the session to be written/saved.
+
+        .. note::
+
+            This feature only works if you have set ``SESSION_EXPLICIT``
+            to ``True``, at which point you'll have to explicitly mark
+            each session before they'll get processed and saved.
+
+        Example::
+
+            app.config['SESSION_EXPLICIT'] = True
+            Session(app)
+
+            @app.route('/')
+            def root():
+                session['foo'] = 'bar'
+                session.dirty()
+                return "Hello World!"
+        """
+        self._dirty = True
+
 
 class RedisSession(ServerSideSession):
     pass
@@ -88,15 +105,8 @@ class SessionInterface(QuartSessionInterface):
             request: BaseRequestWebsocket
     ) -> Optional[SecureCookieSession]:
         sid = request.cookies.get(app.session_cookie_name)
-        if self._config['SESSION_REVERSE_PROXY'] is True:
+        addr = request.headers.get('X-Forwarded-For', request.remote_addr) if \
-            # and no, you cannot define your own incoming
+            self._config['SESSION_HIJACK_PROTECTION'] else None
-            # header, stick to standards :-)
-            addr = request.headers.get('X-Forwarded-For')
-            if not addr:
-                app.logger.error("Could not grab IP from reverse proxy, "
-                                 "session protection is DISABLED!")
-        else:
-            addr = request.remote_addr
         options = {"sid": sid, "permanent": self.permanent, "addr": addr}
 
         if not sid:
@@ -115,7 +125,7 @@ class SessionInterface(QuartSessionInterface):
                 options['sid'] = self._generate_sid()
                 return self.session_class(**options)
 
-        val = await self.get(key=self.key_prefix + sid, app=app)
+        val = await self._backend_get(app, self.key_prefix + sid)
         if val is None:
             options['sid'] = self._generate_sid()
             return self.session_class(**options)
@@ -125,14 +135,17 @@ class SessionInterface(QuartSessionInterface):
         except:
             app.logger.warning(f"Failed to deserialize session "
                                f"data for sid: {sid}. Generating new sid.")
-            app.logger.debug(f"data: {val}")
             options['sid'] = self._generate_sid()
             return self.session_class(**options)
 
-        protection = self._config['SESSION_PROTECTION']
+        prevent_hijack = self._config['SESSION_HIJACK_PROTECTION']
-        if protection is True and addr is not None and \
+        if prevent_hijack is True:
-                data.get('_addr', addr) != addr:
+            if self._config['SESSION_HIJACK_REVERSE_PROXY'] is True:
-            await self.delete(key=self.key_prefix + sid, app=app)
+                addr = request.headers.get('X-Forwarded-For', request.remote_addr)
+            else:
+                addr = request.remote_addr
+            if data.get('_addr', addr) != addr:
+                await self._backend_delete(app, self.key_prefix + sid)
                 options['sid'] = self._generate_sid()
                 return self.session_class(**options)
 
@@ -145,8 +158,9 @@ class SessionInterface(QuartSessionInterface):
         session: SecureCookieSession,
         response: Response
     ) -> None:
-        # prevent set-cookie on unmodified session objects
+        # prevent set-cookie
-        if not session.modified:
+        if self._config['SESSION_EXPLICIT'] is True and \
+                not session._dirty:
             return
 
         # prevent set-cookie on (static) file responses
@@ -154,42 +168,39 @@ class SessionInterface(QuartSessionInterface):
         if self._config['SESSION_STATIC_FILE'] is False and \
                 isinstance(response.response, FileBody):
             return
-
         session_key = self.key_prefix + session.sid
         domain = self.get_cookie_domain(app)
         path = self.get_cookie_path(app)
         if not session:
             if session.modified:
-                await self.delete(key=session_key, app=app)
+                await self._backend_delete(app=app, key=session_key)
                 response.delete_cookie(app.session_cookie_name,
                                        domain=domain, path=path)
             return
         httponly = self.get_cookie_httponly(app)
-        samesite = self.get_cookie_samesite(app)
         secure = self.get_cookie_secure(app)
         expires = self.get_expiration_time(app, session)
 
         val = self.serializer.dumps(dict(session))
-        await self.set(key=session_key, value=val, app=app)
+        await self._backend_set(app=app, key=session_key, value=val)
         if self.use_signer:
             session_id = self._get_signer(app).sign(want_bytes(session.sid))
         else:
             session_id = session.sid
         response.set_cookie(app.session_cookie_name, session_id,
                             expires=expires, httponly=httponly,
-                            domain=domain, path=path, secure=secure, samesite=samesite)
+                            domain=domain, path=path, secure=secure)
 
     async def create(self, app: Quart):
         raise NotImplementedError()
 
-    async def get(self, app: Quart, key: str):
+    async def _backend_get(self, app: Quart, key: str):
         raise NotImplementedError()
 
-    async def set(self, key: str, value, expiry: int = None,
+    async def _backend_set(self, app: Quart, key: str, value):
-                  app: Quart = None):
         raise NotImplementedError()
 
-    async def delete(self, key: str, app: Quart = None):
+    async def _backend_delete(self, app: Quart, key: str):
         raise NotImplementedError()
 
     def _generate_sid(self) -> str:
@@ -216,7 +227,7 @@ class RedisSessionInterface(SessionInterface):
 
     def __init__(self, redis, **kwargs):
         super(RedisSessionInterface, self).__init__(**kwargs)
-        self.backend = redis
+        self.redis = redis
 
     async def create(self, app: Quart) -> None:
         """Creates ``aioredis.Redis`` instance.
@@ -226,25 +237,20 @@ class RedisSessionInterface(SessionInterface):
             Creates a single Redis connection, you might prefer
             pooling instead (see ``aioredis.Redis.create_redis_pool``)
         """
-        if self.backend is None:
+        if self.redis is None:
             import aioredis
-            self.backend = await aioredis.from_url(
+            self.redis = await aioredis.create_redis("redis://localhost")
-                "redis://localhost", encoding="utf-8", decode_responses=True
-            )
 
-    async def get(self, key: str, app: Quart = None):
+    async def _backend_get(self, app: Quart, key: str):
-        return await self.backend.get(key)
+        return await self.redis.get(key)
 
-    async def set(self, key: str, value, expiry: int = None,
+    async def _backend_set(self, app: Quart, key: str, value):
-                  app: Quart = None):
+        return await self.redis.setex(
-        if app and not expiry:
+            key=key, value=value,
-            expiry = total_seconds(app.permanent_session_lifetime)
+            seconds=total_seconds(app.permanent_session_lifetime))
-        return await self.backend.setex(
-            name=key, value=value,
-            time=expiry)
 
-    async def delete(self, key: str, app: Quart = None):
+    async def _backend_delete(self, app: Quart, key: str):
-        return await self.backend.delete(key)
+        return await self.redis.delete(key)
 
 
 class RedisTrioSessionInterface(SessionInterface):
@@ -261,7 +267,7 @@ class RedisTrioSessionInterface(SessionInterface):
 
     def __init__(self, redis, **kwargs):
         super(RedisTrioSessionInterface, self).__init__(**kwargs)
-        self.backend = redis
+        self.redis_trio = redis
 
     async def create(self, app: Quart) -> None:
         """Creates ``aioredis.Redis`` instance.
@@ -271,26 +277,23 @@ class RedisTrioSessionInterface(SessionInterface):
             Creates a single Redis connection. Pooling not
             supported yet for ``RedisTrio``.
         """
-        if self.backend is None:
+        if self.redis_trio is None:
             from quart_session.redis_trio import RedisTrio
-            self.backend = RedisTrio()
+            self.redis_trio = RedisTrio()
-            await self.backend.connect()
+            await self.redis_trio.connect()
 
-    async def get(self, key: str, app: Quart = None):
+    async def _backend_get(self, app: Quart, key: str):
-        data = await self.backend.get(key)
+        data = await self.redis_trio.get(key)
         if data:
             return data.decode()
 
-    async def set(self, key: str, value, expiry: int = None,
+    async def _backend_set(self, app: Quart, key: str, value):
-                  app: Quart = None):
+        return await self.redis_trio.setex(
-        if app and not expiry:
-            expiry = total_seconds(app.permanent_session_lifetime)
-        return await self.backend.setex(
             key=key, value=value,
-            seconds=expiry)
+            seconds=total_seconds(app.permanent_session_lifetime))
 
-    async def delete(self, key: str, app: Quart = None):
+    async def _backend_delete(self, app: Quart, key: str):
-        return await self.backend.delete(key)
+        return await self.redis_trio.delete(key)
 
 
 class MemcachedSessionInterface(SessionInterface):
@@ -311,17 +314,14 @@ class MemcachedSessionInterface(SessionInterface):
         super(MemcachedSessionInterface, self).__init__(
             key_prefix=key_prefix, use_signer=use_signer,
             permanent=permanent, **kwargs)
-        self.backend = memcached
+        self.memcached = memcached
 
     @asyncio.coroutine
     def create(self, app: Quart) -> None:
-        if self.backend is None:
+        if self.memcached is None:
             import aiomcache
             loop = asyncio.get_running_loop()
-            #self.backend = aiomcache.Client("127.0.0.1", 11211, loop=loop)
+            self.memcached = aiomcache.Client("127.0.0.1", 11211, loop=loop)
-            self.backend = aiomcache.Client(self._config.get('SESSION_MEMCACHED_HOST', '127.0.0.1'),
-                                            self._config.get('SESSION_MEMCACHED_PORT', 11211),
-                                            loop=loop)
 
     def _get_memcache_timeout(self, timeout):
         """
@@ -338,44 +338,26 @@ class MemcachedSessionInterface(SessionInterface):
             timeout += int(time.time())
         return timeout
 
-    async def get(self, key: str, app: Quart = None):
+    async def _backend_get(self, app: Quart, key: str):
         key = key.encode()
-        return await self.backend.get(key)
+        return await self.memcached.get(key)
-
-    async def set(self, key: str, value, expiry: int = None,
-                  app: Quart = None):
-        if app and not expiry:
-            expiry = self._get_memcache_timeout(
-                total_seconds(app.permanent_session_lifetime))
 
+    async def _backend_set(self, app: Quart, key: str, value):
         key = key.encode()
         value = value.encode()
-        return await self.backend.set(key=key, value=value,
+        expiry = self._get_memcache_timeout(total_seconds(
+            app.permanent_session_lifetime))
+        return await self.memcached.set(key=key, value=value,
                                         exptime=expiry)
 
-    async def delete(self, key: str, app: Quart = None):
+    async def _backend_delete(self, app: Quart, key: str):
         key = key.encode()
-        return await self.backend.delete(key)
+        return await self.memcached.delete(key)
 
 
 class NullSessionInterface(SessionInterface):
-    """This class does absolutely nothing"""
+    """Used to open a :class:`quart.sessions.NullSession` instance.
-    session_class = NullSession
+    """
 
-    def __init__(
+    def open_session(self, app: Quart, request: BaseRequestWebsocket):
-            self, key_prefix: str, use_signer: bool = False,
+        return None
-            permanent: bool = True, **kwargs):
-        super(NullSessionInterface, self).__init__(
-            key_prefix=key_prefix, use_signer=use_signer,
-            permanent=permanent, **kwargs)
-        self.backend = None
-
-    async def create(self, app: Quart) -> None:
-        pass
-
-    async def get(self, key: str, app: Quart = None) -> None:
-        pass
-
-    async def set(self, key: str, value, expiry: int = None,
-                  app: Quart = None) -> None:
-        pass

setup.py

@@ -9,14 +9,11 @@ Links
 `````
 
 * `Github
-  <https://github.com/sferdi0/quart-session>`_
+  <https://github.com/xmrdsc/quart-session>`_
 
 """
 from setuptools import setup
 
-with open('README.md') as f:
-    long_description = f.read()
-
 
 INSTALL_REQUIRES = [
     "Quart>=0.10.0"
@@ -24,24 +21,20 @@ INSTALL_REQUIRES = [
 
 setup(
     name='Quart-Session',
-    version='1.0.3',
+    version='0.0.1',
-    url='https://github.com/sferdi0/quart-session',
+    url='https://github.com/xmrdsc/quart-session',
     license='BSD',
-    author='Sander',
+    author='dsc',
-    author_email='sander@sanderf.nl',
+    author_email='dsc@xmr.pm',
     description='Adds server-side session support to your Quart application',
-    long_description=long_description,
+    long_description=__doc__,
-    long_description_content_type='text/markdown',
     packages=['quart_session'],
     zip_safe=False,
     include_package_data=True,
     platforms='any',
     install_requires=INSTALL_REQUIRES,
     tests_require=INSTALL_REQUIRES + ["asynctest", "hypothesis", "pytest", "pytest-asyncio"],
-    extras_require={
+    extras_require={"dotenv": ["python-dotenv"]},
-        "dotenv": ["python-dotenv"],
-        "redis": ["aioredis>=2.0.0"]
-    },
     classifiers=[
         'Environment :: Web Environment',
         'Intended Audience :: Developers',