fix #373 breaking collecting user information on *not* starlette

rollbar/__init__.py

@@ -935,7 +935,7 @@ def _build_person_data(request):
     if StarletteRequest:
         from rollbar.contrib.starlette.requests import hasuser
     else:
-        hasuser = lambda request: False
+        def hasuser(request): return True
 
     if hasuser(request) and hasattr(request, 'user'):
         user_prop = request.user

rollbar/test/test_rollbar.py

@@ -327,6 +327,76 @@ def test_fastapi_request_data_empty_values(self):
         self.assertEqual(data['user_ip'], scope['client'][0])
         self.assertEqual(data['method'], scope['method'])
 
+    def test_django_build_person_data(self):
+        try:
+            import django
+            from django.conf import settings
+        except ImportError:
+            self.skipTest('Requires Django to be installed')
+        else:
+            settings.configure(
+                INSTALLED_APPS=['django.contrib.auth', 'django.contrib.contenttypes']
+            )
+            if django.VERSION >= (1, 7):
+                django.setup()
+
+        from django.contrib.auth.models import User
+        from django.http.request import HttpRequest
+
+        request = HttpRequest()
+        request.user = User()
+        request.user.id = 123
+        request.user.username = 'admin'
+        request.user.email = 'admin@example.org'
+
+        data = rollbar._build_person_data(request)
+
+        self.assertDictEqual(
+            data, {'id': '123', 'username': 'admin', 'email': 'admin@example.org'}
+        )
+
+    def test_starlette_build_person_data_if_user_authenticated(self):
+        try:
+            from starlette.authentication import SimpleUser
+            from starlette.requests import Request
+        except ImportError:
+            self.skipTest('Requires Starlette to be installed')
+
+        # Implement interface with the id attribute
+        class User(SimpleUser):
+            counter = 0
+
+            def __init__(self, username, email):
+                super().__init__(username)
+                self.email = email
+
+                User.counter += 1
+                self.id = User.counter
+
+        scope = {'type': 'http'}
+        request = Request(scope)
+        # Make the user authenticated
+        request.scope['user'] = User('admin', 'admin@example.org')
+
+        data = rollbar._build_person_data(request)
+
+        self.assertDictEqual(
+            data, {'id': '1', 'username': 'admin', 'email': 'admin@example.org'}
+        )
+
+    def test_starlette_failsafe_build_person_data_if_user_not_authenticated(self):
+        try:
+            from starlette.requests import Request
+        except ImportError:
+            self.skipTest('Requires Starlette to be installed')
+
+        scope = {'type': 'http'}
+        request = Request(scope)
+
+        data = rollbar._build_person_data(request)
+
+        self.assertIsNone(data)
+
     @unittest.skipUnless(sys.version_info >= (3, 6), 'Python3.6+ required')
     def test_get_request_starlette_middleware(self):
         try:

setup.py

@@ -1,6 +1,5 @@
 import re
 import os.path
-import sys
 from setuptools import setup, find_packages
 
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -78,8 +77,20 @@
         "Topic :: System :: Monitoring",
         ],
     install_requires=[
-        'requests>=0.12.1',
+        # The currently used version of `setuptools` has a bug,
+        # so the version requirements are not properly respected.
+        #
+        # In the current version, `requests>= 0.12.1`
+        # always installs the latest version of the package.
+        'requests>=0.12.1; python_version == "2.7"',
+        'requests>=0.12.1; python_version >= "3.6"',
+        'requests<2.26,>=0.12.1; python_version == "3.5"',
+        'requests<2.22,>=0.12.1; python_version == "3.4"',
+        'requests<2.19,>=0.12.1; python_version == "3.3"',
+        'requests<1.2,>=0.12.1; python_version == "3.2"',
+        'requests<1.2,>=0.12.1; python_version == "3.1"',
+        'requests<1.2,>=0.12.1; python_version == "3.0"',
         'six>=1.9.0'
     ],
     tests_require=tests_require,
-    )
+)