psat-server-web 0.5.10__tar.gz → 0.6.1__tar.gz

{psat_server_web-0.5.10 → psat_server_web-0.6.1}/MANIFEST.in

@@ -3,4 +3,4 @@ prune psat_server_web/atlas/media/images/data
 prune psat_server_web/atlas/static
 prune psat_server_web/ps1/static
 prune psat_server_web/ps1/media/images/data
-global-exclude .gitignore __pycache__ *.py[cod]
+global-exclude .gitignore __pycache__ *.py[cod] */migrations/*.py */migrations/*.pyc */migrations/__pycache__/*

{psat_server_web-0.5.10/psat_server_web.egg-info → psat_server_web-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.5.10
+Version: 0.6.1
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken
@@ -18,6 +18,7 @@ Requires-Dist: mysqlclient
 Requires-Dist: django<4.2
 Requires-Dist: django_tables2
 Requires-Dist: djangorestframework
+Requires-Dist: django-registration
 Requires-Dist: mod-wsgi
 Requires-Dist: pyyaml
 Requires-Dist: docopt

psat_server_web-0.6.1/psat_server_web/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.6.1'

{psat_server_web-0.5.10 → psat_server_web-0.6.1}/psat_server_web/atlas/accounts/admin.py

@@ -5,9 +5,9 @@ expiry time for tokens can be set.
 import logging
 
 from django.contrib import admin
-from django.contrib.auth.models import Group
+from django.contrib.auth.models import User, Group
 from django.forms.models import ModelForm
-from .models import GroupProfile
+from .models import GroupProfile, UserProfile
 
 
 logger = logging.getLogger(__name__)
@@ -29,6 +29,18 @@ class GroupProfileInline(admin.StackedInline):
 
 class GroupAdmin(admin.ModelAdmin):
     inlines = (GroupProfileInline,)
-
+    
 admin.site.unregister(Group)
-admin.site.register(Group, GroupAdmin)
+admin.site.register(Group, GroupAdmin)
+    
+class UserProfileInline(admin.StackedInline):
+    model = UserProfile
+    can_delete = False
+    extra = 1
+    form = AlwaysChangedModelForm
+    
+class UserAdmin(admin.ModelAdmin):
+    inlines = (UserProfileInline,)
+
+admin.site.unregister(User)
+admin.site.register(User, UserAdmin)

{psat_server_web-0.5.10 → psat_server_web-0.6.1}/psat_server_web/atlas/accounts/models.py

@@ -3,6 +3,31 @@ from django.utils.timezone import timedelta
 from django.contrib.auth.models import Group
 from django.db import models
 
+class UserProfile(models.Model):
+    """UserProfile.
+    
+    Extension of the User model to store additional information, such as token 
+    expiration time.
+    """
+    id = models.AutoField(primary_key=True)
+    user = models.OneToOneField(
+        'auth.User', 
+        on_delete=models.CASCADE, 
+        related_name='profile'
+    )
+    password_unuseable_fl = models.BooleanField(
+        default=False,
+        help_text='If true, password requires changing before login'
+    )
+    
+    class Meta:
+        """Meta.
+        """
+        app_label = 'accounts'
+        managed = True
+        verbose_name = 'User Profile'
+        verbose_name_plural = 'User Profiles'
+        db_table = 'auth_user_profile'
 
 
 class GroupProfile(models.Model):

psat_server_web-0.6.1/psat_server_web/atlas/accounts/permissions.py

@@ -0,0 +1,29 @@
+import logging 
+
+from django.contrib.auth.models import User
+from django.db import models
+
+logger = logging.getLogger(__name__)
+
+def has_write_permissions(user: User) -> bool:
+    """Check if the user has permission to edit observation data"""
+    if not user.is_authenticated:
+        logger.debug("User is not authenticated.")
+        return False
+    
+    return user.has_perm('accounts.has_write_access') or user.is_staff or user.is_superuser
+
+
+class GlobalPermissions(models.Model):
+    """
+    A dummy model used solely for global permissions.
+    This model does not store any data, but is simply used to define
+    global permissions for the application.
+    """
+
+    class Meta:
+        managed = False
+        default_permissions = ()
+        permissions = (
+            ('has_write_access', 'Write permission: can add and update observations'),
+        )

psat_server_web-0.6.1/psat_server_web/atlas/accounts/utils.py

@@ -0,0 +1,14 @@
+import logging 
+
+logger = logging.getLogger(__name__)
+
+def needs_to_change_password(user):
+    """
+    Custom test to check if the user is logged in and has a specific attribute.
+    """
+    try:
+        logger.debug(f"Checking if user {user.username} needs to change password.")
+        logger.debug(f"User profile: {user.profile}")
+        return user.profile.password_unuseable_fl
+    except AttributeError:
+        return False

psat_server_web-0.6.1/psat_server_web/atlas/atlas/django-default.log

@@ -0,0 +1,339 @@
+atlas.views DEBUG 2025-05-12 15:48:06,441 views User can edit observations: False
+atlas.views DEBUG 2025-05-12 15:52:50,552 views User can edit observations: True
+atlas.views DEBUG 2025-05-12 22:01:03,804 views User can edit observations: True
+atlas.views DEBUG 2025-05-12 22:01:06,018 views User can edit observations: True
+urllib3.connectionpool DEBUG 2025-05-12 22:01:06,339 connectionpool Starting new HTTPS connection (1): lasair-ztf.lsst.ac.uk:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:06,562 connectionpool https://lasair-ztf.lsst.ac.uk:443 "POST /api/cone/ HTTP/1.1" 200 2
+urllib3.connectionpool DEBUG 2025-05-12 22:01:06,575 connectionpool Starting new HTTP connection (1): localhost:8084
+matplotlib DEBUG 2025-05-12 22:01:10,596 __init__ matplotlib data path: /Users/kws/.local/lib/python3.11/site-packages/matplotlib/mpl-data
+matplotlib DEBUG 2025-05-12 22:01:10,599 __init__ CONFIGDIR=/Users/kws/.matplotlib
+matplotlib DEBUG 2025-05-12 22:01:10,599 __init__ interactive is False
+matplotlib DEBUG 2025-05-12 22:01:10,600 __init__ platform is darwin
+matplotlib DEBUG 2025-05-12 22:01:10,630 __init__ CACHEDIR=/Users/kws/.matplotlib
+matplotlib.font_manager DEBUG 2025-05-12 22:01:10,632 font_manager Using fontManager instance from /Users/kws/.matplotlib/fontlist-v390.json
+urllib3.connectionpool DEBUG 2025-05-12 22:01:10,831 connectionpool Starting new HTTPS connection (1): dataverse.harvard.edu:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:11,560 connectionpool https://dataverse.harvard.edu:443 "GET /api/datasets/:persistentId?persistentId=doi:10.7910/DVN/EWCNL5 HTTP/1.1" 200 None
+urllib3.connectionpool DEBUG 2025-05-12 22:01:11,671 connectionpool Starting new HTTPS connection (1): dataverse.harvard.edu:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:12,190 connectionpool https://dataverse.harvard.edu:443 "GET /api/access/datafile/2902687 HTTP/1.1" 303 0
+urllib3.connectionpool DEBUG 2025-05-12 22:01:12,199 connectionpool Starting new HTTPS connection (1): dvn-cloud.s3.amazonaws.com:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:12,738 connectionpool https://dvn-cloud.s3.amazonaws.com:443 "GET /10.7910/DVN/EWCNL5/157bb43e038-2856c7e44170?response-content-disposition=attachment%3B%20filename%2A%3DUTF-8%27%27SFD_dust_4096_ngp.fits&response-content-type=application%2Ffits&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20250512T220112Z&X-Amz-SignedHeaders=host&X-Amz-Expires=3600&X-Amz-Credential=AKIAIEJ3NV7UYCSRJC7A%2F20250512%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Signature=1d4139e3dac30c2abc684be231005fd0c99224c7a207337a3911e50b315abd17 HTTP/1.1" 200 67115520
+urllib3.connectionpool DEBUG 2025-05-12 22:01:16,190 connectionpool Starting new HTTPS connection (1): dataverse.harvard.edu:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:16,845 connectionpool https://dataverse.harvard.edu:443 "GET /api/datasets/:persistentId?persistentId=doi:10.7910/DVN/EWCNL5 HTTP/1.1" 200 None
+urllib3.connectionpool DEBUG 2025-05-12 22:01:16,954 connectionpool Starting new HTTPS connection (1): dataverse.harvard.edu:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:17,471 connectionpool https://dataverse.harvard.edu:443 "GET /api/access/datafile/2902695 HTTP/1.1" 303 0
+urllib3.connectionpool DEBUG 2025-05-12 22:01:17,479 connectionpool Starting new HTTPS connection (1): dvn-cloud.s3.amazonaws.com:443
+urllib3.connectionpool DEBUG 2025-05-12 22:01:18,080 connectionpool https://dvn-cloud.s3.amazonaws.com:443 "GET /10.7910/DVN/EWCNL5/157bb8a4df2-7537b98d9920?response-content-disposition=attachment%3B%20filename%2A%3DUTF-8%27%27SFD_dust_4096_sgp.fits&response-content-type=application%2Ffits&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Date=20250512T220117Z&X-Amz-SignedHeaders=host&X-Amz-Expires=3600&X-Amz-Credential=AKIAIEJ3NV7UYCSRJC7A%2F20250512%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Signature=01690cfbe6f80894ff9aabe287f89b2190421ea5351d5ac4b01835d33cb4efcd HTTP/1.1" 200 67115520
+atlas.views DEBUG 2025-05-13 17:07:09,848 views User can edit observations: True
+atlas.views DEBUG 2025-05-13 17:07:12,949 views User can edit observations: True
+accounts.utils DEBUG 2025-05-14 10:43:41,760 utils Checking if user  needs to change password.
+atlas.views WARNING 2025-05-14 10:43:45,699 views User rube has no profile.
+accounts.utils DEBUG 2025-05-14 10:43:45,705 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:43:45,755 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:45:45,746 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-14 10:45:45,791 utils Checking if user ken.smith needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:10,132 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:10,135 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:11,964 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:11,966 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:13,923 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:13,925 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:23,545 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:23,547 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:24,438 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:24,440 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:27,889 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:27,890 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 10:46:31,427 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 10:46:31,429 utils User profile: UserProfile object (1)
+django.request ERROR 2025-05-14 10:46:47,849 log Internal Server Error: /fruitbat/accounts/change_password/
+Traceback (most recent call last):
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/decorators/debug.py", line 143, in sensitive_post_parameters_wrapper
+    return view(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 188, in _view_wrapper
+    result = _process_exception(request, e)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 186, in _view_wrapper
+    response = view_func(request, *args, **kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/decorators.py", line 60, in _view_wrapper
+    return view_func(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/views.py", line 363, in dispatch
+    return super().dispatch(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/edit.py", line 150, in post
+    if form.is_valid():
+       ^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 197, in is_valid
+    return self.is_bound and not self.errors
+                                 ^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 192, in errors
+    self.full_clean()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 325, in full_clean
+    self._clean_fields()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 335, in _clean_fields
+    value = getattr(self, "clean_%s" % name)()
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/Documents/code/gitdev/psat-server-web/psat_server_web/atlas/atlas/views.py", line 233, in clean_new_password1
+    old_password = self.cleaned_data['old_password']
+                   ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
+KeyError: 'old_password'
+django.request ERROR 2025-05-14 10:48:47,748 log Internal Server Error: /fruitbat/accounts/change_password/
+Traceback (most recent call last):
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/decorators/debug.py", line 143, in sensitive_post_parameters_wrapper
+    return view(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 188, in _view_wrapper
+    result = _process_exception(request, e)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 186, in _view_wrapper
+    response = view_func(request, *args, **kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/decorators.py", line 60, in _view_wrapper
+    return view_func(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/views.py", line 363, in dispatch
+    return super().dispatch(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/edit.py", line 150, in post
+    if form.is_valid():
+       ^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 197, in is_valid
+    return self.is_bound and not self.errors
+                                 ^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 192, in errors
+    self.full_clean()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 325, in full_clean
+    self._clean_fields()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 335, in _clean_fields
+    value = getattr(self, "clean_%s" % name)()
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/Documents/code/gitdev/psat-server-web/psat_server_web/atlas/atlas/views.py", line 233, in clean_new_password1
+    old_password = self.cleaned_data['old_password']
+                   ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
+KeyError: 'old_password'
+django.request ERROR 2025-05-14 10:49:36,727 log Internal Server Error: /fruitbat/accounts/change_password/
+Traceback (most recent call last):
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/decorators/debug.py", line 143, in sensitive_post_parameters_wrapper
+    return view(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 188, in _view_wrapper
+    result = _process_exception(request, e)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 186, in _view_wrapper
+    response = view_func(request, *args, **kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/decorators.py", line 60, in _view_wrapper
+    return view_func(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/views.py", line 363, in dispatch
+    return super().dispatch(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/edit.py", line 150, in post
+    if form.is_valid():
+       ^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 197, in is_valid
+    return self.is_bound and not self.errors
+                                 ^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 192, in errors
+    self.full_clean()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 325, in full_clean
+    self._clean_fields()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 335, in _clean_fields
+    value = getattr(self, "clean_%s" % name)()
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/Documents/code/gitdev/psat-server-web/psat_server_web/atlas/atlas/views.py", line 233, in clean_new_password1
+    old_password = self.cleaned_data['old_password']
+                   ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
+KeyError: 'old_password'
+django.request ERROR 2025-05-14 10:49:52,978 log Internal Server Error: /fruitbat/accounts/change_password/
+Traceback (most recent call last):
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/decorators/debug.py", line 143, in sensitive_post_parameters_wrapper
+    return view(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 188, in _view_wrapper
+    result = _process_exception(request, e)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 186, in _view_wrapper
+    response = view_func(request, *args, **kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/decorators.py", line 60, in _view_wrapper
+    return view_func(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/views.py", line 363, in dispatch
+    return super().dispatch(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/edit.py", line 150, in post
+    if form.is_valid():
+       ^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 197, in is_valid
+    return self.is_bound and not self.errors
+                                 ^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 192, in errors
+    self.full_clean()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 325, in full_clean
+    self._clean_fields()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 335, in _clean_fields
+    value = getattr(self, "clean_%s" % name)()
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/Documents/code/gitdev/psat-server-web/psat_server_web/atlas/atlas/views.py", line 233, in clean_new_password1
+    old_password = self.cleaned_data['old_password']
+                   ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
+KeyError: 'old_password'
+django.request ERROR 2025-05-14 10:50:37,769 log Internal Server Error: /fruitbat/accounts/change_password/
+Traceback (most recent call last):
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/exception.py", line 55, in inner
+    response = get_response(request)
+               ^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/core/handlers/base.py", line 197, in _get_response
+    response = wrapped_callback(request, *callback_args, **callback_kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 104, in view
+    return self.dispatch(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/decorators/debug.py", line 143, in sensitive_post_parameters_wrapper
+    return view(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 188, in _view_wrapper
+    result = _process_exception(request, e)
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 186, in _view_wrapper
+    response = view_func(request, *args, **kwargs)
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/utils/decorators.py", line 48, in _wrapper
+    return bound_method(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/decorators.py", line 60, in _view_wrapper
+    return view_func(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/contrib/auth/views.py", line 363, in dispatch
+    return super().dispatch(*args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/base.py", line 143, in dispatch
+    return handler(request, *args, **kwargs)
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/views/generic/edit.py", line 150, in post
+    if form.is_valid():
+       ^^^^^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 197, in is_valid
+    return self.is_bound and not self.errors
+                                 ^^^^^^^^^^^
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 192, in errors
+    self.full_clean()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 325, in full_clean
+    self._clean_fields()
+  File "/Users/kws/anaconda3/envs/atlas311/lib/python3.11/site-packages/django/forms/forms.py", line 335, in _clean_fields
+    value = getattr(self, "clean_%s" % name)()
+            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "/Users/kws/Documents/code/gitdev/psat-server-web/psat_server_web/atlas/atlas/views.py", line 233, in clean_new_password1
+    old_password = self.cleaned_data['old_password']
+                   ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
+KeyError: 'old_password'
+atlas.views DEBUG 2025-05-14 11:07:17,604 views self.cleaned_data: {'new_password1': 'lksdjfkljsdfj'}
+atlas.views DEBUG 2025-05-14 11:07:32,941 views self.cleaned_data: {'new_password1': 'kks'}
+atlas.views DEBUG 2025-05-14 11:07:45,993 views self.cleaned_data: {'new_password1': 'lksdjkfj'}
+atlas.views DEBUG 2025-05-14 11:07:59,407 views self.cleaned_data: {'old_password': 'rube123', 'new_password1': 'lsjldfjskdj'}
+atlas.views DEBUG 2025-05-14 11:08:21,757 views self.cleaned_data: {'new_password1': 'skks'}
+atlas.views DEBUG 2025-05-14 11:08:43,290 views self.cleaned_data: {'old_password': 'rube123', 'new_password1': 'lksdkjfkd'}
+atlas.views DEBUG 2025-05-14 11:09:14,855 views self.cleaned_data: {'new_password1': 'rube'}
+atlas.views DEBUG 2025-05-14 11:10:01,511 views self.cleaned_data: {'old_password': 'rube123', 'new_password1': 'rube'}
+atlas.views DEBUG 2025-05-14 11:11:20,295 views self.cleaned_data: {'new_password1': 'rube'}
+atlas.views DEBUG 2025-05-14 11:12:32,362 views self.cleaned_data: {'old_password': 'rube123', 'new_password1': 'rube'}
+accounts.utils DEBUG 2025-05-14 11:27:29,209 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 11:27:29,209 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 11:27:29,247 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 11:27:29,248 utils User profile: UserProfile object (1)
+accounts.utils DEBUG 2025-05-14 11:27:41,679 utils Checking if user rube needs to change password.
+accounts.utils DEBUG 2025-05-14 11:27:41,682 utils User profile: UserProfile object (1)
+atlas.views DEBUG 2025-05-14 11:27:41,693 views User can edit observations: True

{psat_server_web-0.5.10 → psat_server_web-0.6.1}/psat_server_web/atlas/atlas/settings.py

@@ -121,7 +121,7 @@ LOGGING = {
     # Implement the stderr logger as the default logger.
     "loggers": {
         "": {
-            "handlers": ["stderr"],
+            "handlers": ["stderr","file"],
             "level": DJANGO_LOG_LEVEL,
             "propagate": True,
         },
@@ -225,6 +225,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.staticfiles',
+    'django_registration',
     'atlas',
     'accounts',
     'django_tables2',
@@ -232,5 +233,20 @@ INSTALLED_APPS = [
     'rest_framework.authtoken',
 ]
 
+REST_FRAMEWORK = {
+    'DEFAULT_THROTTLE_CLASSES': [
+        'atlasapi.throttling.UserAdminRateThrottle',    # Allow admin users unlimited rate, otherwise use the default rate 
+    ],
+    'DEFAULT_THROTTLE_RATES': {
+        'anon': '10/hour',       # The only anonymous endpoint is the token refresh endpoint
+        'user': '100/hour',      # Limit regular authenticated users to 100 requests per hour
+        'admin': '100000/hour',  # Allow admin users (basically) unlimited rate
+    }
+}
+
 # Token expiry time in days, default 1 day (24*60*60 seconds)
-TOKEN_EXPIRY = int(os.environ.get("API_TOKEN_EXPIRY") or 86400) # seconds
+TOKEN_EXPIRY = int(os.environ.get("API_TOKEN_EXPIRY") or 86400) # seconds
+
+# Variables for the django_registration app
+ACCOUNT_ACTIVATION_DAYS = int(os.environ.get("ACCOUNT_ACTIVATION_DAYS") or 7)
+REGISTRATION_OPEN = True

{psat_server_web-0.5.10 → psat_server_web-0.6.1}/psat_server_web/atlas/atlas/urls.py

@@ -2,6 +2,7 @@
 from django.urls import re_path as url
 from django.urls import path, include
 from django.contrib import admin
+from django.contrib.auth import views as auth_views
 from atlas import views
 from django.conf import settings
 from django.conf.urls.static import static
@@ -14,13 +15,18 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path('', include('atlasapi.urls')),
     # 2016-02-26 KWS Add the authentication URLs
-    url(r'^accounts/login/', views.login, name="login"),
-    url(r'^accounts/logout/', views.logout, name="logout"),
+    url(r'^accounts/login/', views.loginView, name="login"),
+    # url(r'^accounts/register/', views.register_user, name="register"),
+    url(r'^accounts/logout/', views.logoutView, name="logout"),
     url(r'^accounts/auth/', views.authView, name="auth"),
     url(r'^accounts/loggedin/', views.loggedin, name="loggedin"),
     url(r'^accounts/invalid/', views.invalidLogin, name="invalid"),
+    url(r'^accounts/change_password/$', views.AtlasPasswordChangeView.as_view(), name="change_password"),
+    url(r'^accounts/password_change_done/$', auth_views.PasswordChangeDoneView.as_view(template_name="password_change_done.html"), name="password_change_done"),
+    path("accounts/", include("django_registration.backends.activation.urls")),
 
     url(r'^$', views.homepage, name='home'),
+    url(r'^privacy/$', views.privacy_policy, name='privacy_policy'),
 
     # 2019-09-28 KWS New error page.
     url(r'^error/$', views.errorpage, name='error'),