matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Encode settings YAML before hashing

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-07-06 17:14:44 -04:00
parent 4c212f6ea4
commit bb5324ef50
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/smart_settings/classes.py
View File

@@ -17,7 +17,9 @@ except ImportError:
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
from django.utils.functional import Promise from django.utils.functional import Promise
from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.encoding import (
force_bytes, force_text, python_2_unicode_compatible
)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -141,7 +143,7 @@ class Setting(object):
@classmethod @classmethod
def get_hash(cls): def get_hash(cls):
return force_text( return force_text(
hashlib.sha256(cls.dump_data()).hexdigest() hashlib.sha256(force_bytes(cls.dump_data())).hexdigest()
) )
@classmethod @classmethod

18
mayan/apps/smart_settings/tests/test_classes.py
View File

@@ -11,12 +11,13 @@ from mayan.apps.common.settings import setting_paginate_by
from mayan.apps.common.tests import BaseTestCase from mayan.apps.common.tests import BaseTestCase
from mayan.apps.storage.utils import fs_cleanup from mayan.apps.storage.utils import fs_cleanup
from ..classes import Setting from ..classes import Namespace, Setting
from .literals import ENVIRONMENT_TEST_NAME, ENVIRONMENT_TEST_VALUE from .literals import ENVIRONMENT_TEST_NAME, ENVIRONMENT_TEST_VALUE
from .mixins import SmartSettingTestMixin
class ClassesTestCase(BaseTestCase): class ClassesTestCase(SmartSettingTestMixin, BaseTestCase):
def test_environment_variable(self): def test_environment_variable(self):
os.environ[ os.environ[
'MAYAN_{}'.format(ENVIRONMENT_TEST_NAME) 'MAYAN_{}'.format(ENVIRONMENT_TEST_NAME)
@@ -39,3 +40,16 @@ class ClassesTestCase(BaseTestCase):
with path_config_backup.open(mode='r') as file_object: with path_config_backup.open(mode='r') as file_object:
self.assertFalse('!!python/' in file_object.read()) self.assertFalse('!!python/' in file_object.read())
def test_setting_check_changed(self):
self._create_test_settings_namespace()
test_setting = self.test_settings_namespace.add_setting(
global_name='SMART_SETTINGS_TEST_SETTING',
default='test value'
)
# Initialize hash cache
Setting.check_changed()
self.assertFalse(Setting.check_changed())
test_setting.value = 'test value edited'
self.assertTrue(Setting.check_changed())