mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-16 17:12:53 +00:00
Compare commits
31 Commits
origin/dev
...
v4.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
482319fadf | ||
|
|
2ca4002624 | ||
|
|
053d640e4c | ||
|
|
f3acc28ded | ||
|
|
25987545db | ||
|
|
6720ecc6e0 | ||
|
|
0b3a7bb020 | ||
|
|
56373e362b | ||
|
|
02fc045370 | ||
|
|
e4ac73896f | ||
|
|
1518f792d6 | ||
|
|
67277dd622 | ||
|
|
82e7f020ea | ||
|
|
f20b9e01ab | ||
|
|
8cf8a3701b | ||
|
|
7ba24293d1 | ||
|
|
f10114c9ed | ||
|
|
cf31cbfb07 | ||
|
|
0edad24d5d | ||
|
|
1f1c1a9157 | ||
|
|
6c9d271ae1 | ||
|
|
6ff852e225 | ||
|
|
baa75dc735 | ||
|
|
8a9f0436b8 | ||
|
|
a9620a3cbe | ||
|
|
769e7dc8a0 | ||
|
|
2a70449411 | ||
|
|
8df720f19e | ||
|
|
dabbb45f6e | ||
|
|
ce24c1c3fd | ||
|
|
3c54c82ce9 |
@@ -10,7 +10,8 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
from rest_framework.utils.encoders import JSONEncoder
|
from rest_framework.utils.encoders import JSONEncoder
|
||||||
|
|
||||||
from common.db.models import JMSBaseModel
|
from common.db.models import JMSBaseModel
|
||||||
from common.utils import signer, get_logger
|
from common.utils import get_logger
|
||||||
|
from common.db.utils import Encryptor
|
||||||
from .signals import setting_changed
|
from .signals import setting_changed
|
||||||
|
|
||||||
logger = get_logger(__name__)
|
logger = get_logger(__name__)
|
||||||
@@ -53,7 +54,7 @@ class Setting(models.Model):
|
|||||||
try:
|
try:
|
||||||
value = self.value
|
value = self.value
|
||||||
if self.encrypted:
|
if self.encrypted:
|
||||||
value = signer.unsign(value)
|
value = Encryptor(value).decrypt()
|
||||||
if not value:
|
if not value:
|
||||||
return None
|
return None
|
||||||
value = json.loads(value)
|
value = json.loads(value)
|
||||||
@@ -66,7 +67,7 @@ class Setting(models.Model):
|
|||||||
try:
|
try:
|
||||||
v = json.dumps(item, cls=JSONEncoder)
|
v = json.dumps(item, cls=JSONEncoder)
|
||||||
if self.encrypted:
|
if self.encrypted:
|
||||||
v = signer.sign(v)
|
v = Encryptor(v).encrypt()
|
||||||
self.value = v
|
self.value = v
|
||||||
except json.JSONDecodeError as e:
|
except json.JSONDecodeError as e:
|
||||||
raise ValueError("Json dump error: {}".format(str(e)))
|
raise ValueError("Json dump error: {}".format(str(e)))
|
||||||
|
|||||||
Reference in New Issue
Block a user