Skip to content

Home Information - Your home, your data, organized.

Python

Finished console locking feature.

Anthony Cassandra783336aeb373
diff --git a/src/hi/apps/config/app_settings.py b/src/hi/apps/config/app_settings.py
index 01069f40..c7ea74d9 100644
--- a/src/hi/apps/config/app_settings.py
+++ b/src/hi/apps/config/app_settings.py
@@ -1,7 +1,7 @@
from dataclasses import dataclass
import logging
from types import ModuleType
-from typing import Dict, List
+from typing import Dict, List, Type
from hi.apps.common.utils import get_humanized_name
from hi.apps.config.setting_enums import SettingEnum, SettingDefinition
@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
@dataclass
class AppSettingDefinitions:
- setting_enum : SettingEnum
+ setting_enum_class : Type[ SettingEnum ]
setting_definition_map : Dict[ str, SettingDefinition ] # Key is setting key
def __len__(self):
@@ -66,23 +66,23 @@ class AppSettings:
and attr is not SettingEnum ):
logger.debug(f'Found Setting subclass for {attr_name}')
app_setting_definitions = self._get_app_setting_definitions(
- setting_enum = attr,
+ setting_enum_class = attr,
)
if len(app_setting_definitions) > 0:
app_setting_definitions_list.append( app_setting_definitions )
continue
return app_setting_definitions_list
- def _get_app_setting_definitions( self, setting_enum : SettingEnum ) -> AppSettingDefinitions:
+ def _get_app_setting_definitions( self, setting_enum_class : type[SettingEnum] ) -> AppSettingDefinitions:
setting_definition_map = dict()
- for setting_name, setting_member in setting_enum.__members__.items():
- logger.debug( f'Adding setting: {setting_member.key}' )
- setting_definition_map[setting_member.key] = setting_member.definition
+ for setting_name, setting_enum_member in setting_enum_class.__members__.items():
+ logger.debug( f'Adding setting: {setting_enum_member.key}' )
+ setting_definition_map[setting_enum_member.key] = setting_enum_member.definition
continue
return AppSettingDefinitions(
- setting_enum = setting_enum,
+ setting_enum_class = setting_enum_class,
setting_definition_map = setting_definition_map,
)
diff --git a/src/hi/apps/config/settings_manager.py b/src/hi/apps/config/settings_manager.py
index 23e47d55..950ba7e2 100644
--- a/src/hi/apps/config/settings_manager.py
+++ b/src/hi/apps/config/settings_manager.py
@@ -69,29 +69,14 @@ class SettingsManager( Singleton ):
return self._attribute_value_map.get( setting_enum.key )
def set_setting_value( self, setting_enum : SettingEnum, value : str ):
-
- module_name = setting_enum.__class__.__module__
- subsystem_key = '.'.join( module_name.split('.')[:-1] )
-
- print( f'\n\nMODULE = direct={setting_enum.__module__}, indirect={module_name}, name={app_name}\n' )
-
-
-
-
-
- raise NotImplementedError()
-
-
-
try:
db_attribute = SubsystemAttribute.objects.get(
- subsystem = subsystem,
- setting_key = setting_key,
- name = setting_definition.label,
+ setting_key = setting_enum.key,
)
db_attribute.value = value
db_attribute.save()
- self._attribute_value_map[setting_enum.key] = value
+ self._attribute_value_map[setting_enum.key] = value # Just to avoid complete reload of settings
+
except SubsystemAttribute.DoesNotExist:
raise KeyError( f'No setting "{setting_enum.name}" found.' )
return
diff --git a/src/hi/apps/console/middleware.py b/src/hi/apps/console/middleware.py
index 7e4bce83..349bd794 100644
--- a/src/hi/apps/console/middleware.py
+++ b/src/hi/apps/console/middleware.py
@@ -6,7 +6,10 @@ from .views import ConsoleUnlockView
class ConsoleLockMiddleware:
- EXCLUDED_PATHS = [ reverse('console_unlock'), reverse('api_status' ) ]
+ EXCLUDED_PATHS = [
+ reverse('console_unlock'),
+ reverse('api_status' ),
+ ]
def __init__(self, get_response):
self.get_response = get_response
diff --git a/src/hi/apps/console/views.py b/src/hi/apps/console/views.py
index 94db60f5..1219fa82 100644
--- a/src/hi/apps/console/views.py
+++ b/src/hi/apps/console/views.py
@@ -17,7 +17,6 @@ class ConsoleLockView( View ):
lock_password = SettingsManager().get_setting_value( ConsoleSetting.CONSOLE_LOCK_PASSWORD )
if not lock_password:
return SetLockPasswordView().get( request, *args, **kwargs )
-
request.session[ConsoleConstants.CONSOLE_LOCKED_SESSION_VAR] = True
return ConsoleUnlockView().get( request, *args, **kwargs )
@@ -49,14 +48,17 @@ class ConsoleUnlockView( HiModalView ):
def post(self, request, *args, **kwargs):
- # N.B. Simplified security for now. Just meant to be used when
- # visitors in the house to prevent snooping. Beef up security here
- # if/when needed.
+ # N.B. Simplified security of console locking for now. Just meant
+ # to be used when visitors in the house to prevent snooping. Beef
+ # up security here if/when needed, but eventual login requirements
+ # and its session will be the main auth method.
+
input_password = request.POST.get('password')
if not input_password:
raise BadRequest( 'No password provided.' )
lock_password = SettingsManager().get_setting_value( ConsoleSetting.CONSOLE_LOCK_PASSWORD )
+
if lock_password and ( input_password != lock_password ):
raise BadRequest( 'Invalid password.' )
@@ -66,4 +68,4 @@ class ConsoleUnlockView( HiModalView ):
# exceptional case.
request.session[ConsoleConstants.CONSOLE_LOCKED_SESSION_VAR] = False
- return JsonResponse( {'message': 'Console unlocked.'} )
+ return self.refresh_response( request= request )
diff --git a/src/hi/hi_async_view.py b/src/hi/hi_async_view.py
index adcc12c0..2262acb4 100644
--- a/src/hi/hi_async_view.py
+++ b/src/hi/hi_async_view.py
@@ -109,6 +109,8 @@ class HiModalView( View ):
raise NotImplementedError('Subclasses must override this method.')
def modal_response( self, request, context = None, status = 200 ):
+ if context is None:
+ context = dict()
modal_response = antinode.modal_from_template(
request = request,
template_name = self.get_template_name(),