Improved login errors,
Added user disable option, Fix groups selection in tasks, Improved Auto updater, Fixed sorting of scan reports, Some pro feature
This commit is contained in:
parent
c39721de96
commit
30d60a72ad
12 changed files with 115 additions and 38 deletions
|
|
@ -6,7 +6,6 @@
|
|||
# Author: Tomi.Mickelsson@iki.fi modified by sepehr.ha@gmail.com
|
||||
|
||||
import re
|
||||
from shutil import ExecError
|
||||
from flask import session
|
||||
from passlib.context import CryptContext
|
||||
import json
|
||||
|
|
@ -25,7 +24,6 @@ def build_session(user_obj, is_permanent=True):
|
|||
|
||||
assert user_obj
|
||||
assert user_obj.id
|
||||
log.error(session)
|
||||
# make sure session is empty
|
||||
session.clear()
|
||||
session['userid'] = user_obj.id
|
||||
|
|
|
|||
|
|
@ -107,6 +107,11 @@ def devs2(groupid):
|
|||
.order_by(Devices.name))
|
||||
def get_devs_of_groups(group_ids):
|
||||
try:
|
||||
group_ids=[group.id for group in group_ids]
|
||||
if 1 in group_ids:
|
||||
return list(Devices
|
||||
.select()
|
||||
.order_by(Devices.name))
|
||||
return list(Devices
|
||||
.select()
|
||||
.join(DevGroupRel, on=DevGroupRel.device_id)
|
||||
|
|
|
|||
|
|
@ -92,9 +92,10 @@ def get_task_devices(task,return_devs=True):
|
|||
try:
|
||||
group_ids.append(mem.group_id)
|
||||
except DoesNotExist as err:
|
||||
log.error(err)
|
||||
pass
|
||||
if return_devs:
|
||||
devs=get_devs_of_groups(group_ids)
|
||||
devs=get_devs_of_groups(group_ids)
|
||||
else:
|
||||
devs=group_ids
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1106,13 +1106,17 @@ def sizeof_fmt(num, suffix="B"):
|
|||
num /= 1024.0
|
||||
return f"{num:.1f}Yi{suffix}"
|
||||
|
||||
def get_local_users(opts):
|
||||
def get_local_users(opts,router=False,full=False):
|
||||
try:
|
||||
router=RouterOSCheckResource(opts)
|
||||
if not router:
|
||||
router=RouterOSCheckResource(opts)
|
||||
call = router.api.path(
|
||||
"/user"
|
||||
)
|
||||
results=[a['name'] for a in tuple(call)]
|
||||
if not full:
|
||||
results=[a['name'] for a in tuple(call)]
|
||||
else:
|
||||
results=tuple(call)
|
||||
return results
|
||||
except Exception as e:
|
||||
log.error(e)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue