diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index feb45fbea..6e6d9d2db 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -946,6 +946,7 @@ + diff --git a/loginSystem/models.py b/loginSystem/models.py index a4de5652e..b320efce8 100755 --- a/loginSystem/models.py +++ b/loginSystem/models.py @@ -90,6 +90,8 @@ class Administrator(models.Model): initWebsitesLimit = models.IntegerField(default=0) acl = models.ForeignKey(ACL, default=1, on_delete=models.PROTECT) + twoFA = models.IntegerField(default=0) + secretKey = models.CharField(max_length=50, default='None') diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 570854792..5f105e288 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -533,6 +533,11 @@ $cfg['Servers'][$i]['SignonURL'] = 'phpmyadminsignin.php'; except: pass + try: + cursor.execute("ALTER TABLE loginSystem_administrator ADD secretKey varchar(50) DEFAULT 'ACTIVE'") + except: + pass + try: cursor.execute('alter table databases_databases drop index dbUser;') except: @@ -548,6 +553,11 @@ $cfg['Servers'][$i]['SignonURL'] = 'phpmyadminsignin.php'; except: pass + try: + cursor.execute('ALTER TABLE loginSystem_administrator ADD twoFA integer DEFAULT 0') + except: + pass + try: cursor.execute('ALTER TABLE loginSystem_administrator ADD api integer') except: