Skip to content

Commit

Permalink
added new admin page and reworked logging in the process
Browse files Browse the repository at this point in the history
  • Loading branch information
@lzuba
lzuba committed Aug 22, 2023
1 parent 8c039ea commit 2618e33
Show file tree
Hide file tree
Showing 11 changed files with 419 additions and 134 deletions.
110 changes: 62 additions & 48 deletions app/Controller.py
View file

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion app/config-dev.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,15 @@ confidential-port = 0
host = vault

[LOGGING]
level = DEBUG
level = 10
logfolder = /var/log/mlaps/
loglineretention = 60

# CRITICAL = 50
# FATAL = CRITICAL
# ERROR = 40
# WARNING = 30
# WARN = WARNING
# INFO = 20
# DEBUG = 10
# NOTSET = 0
2 changes: 2 additions & 0 deletions app/config-sample.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ host = vault

[LOGGING]
level = INFO
logfolder = /var/log/mlaps/
loglineretention = 50
79 changes: 36 additions & 43 deletions app/dbClient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
class dbClient:
dbClient = orm.Database()

def __init__(self, logger, username, password, host, database, isdev):
def __init__(self, username, password, host, database, isdev):
self.devmode = isdev
self.logger = logger
self.dbClient.bind(
provider="mysql", host=host, user=username, passwd=password, db=database
)
Expand Down Expand Up @@ -60,40 +59,34 @@ class Checkin(dbClient.Entity):
##### Vault Methods #####

@orm.db_session
def readHSMSecret(self):
try:
return self.__convertQueryToDict(
self.Auth_secret.select().order_by(lambda c: orm.desc(c.id)).limit(1)
)[0]
except Exception as e:
self.logger.error(e)
return None
def readHSMSecret(self) -> Auth_secret:
return self.Auth_secret.select().order_by(lambda c: orm.desc(c.id)).limit(1)[:][0]

@orm.db_session
def updateHsmSecret(self, entry):
try:
newSecret = self.Auth_secret(role_id=entry[0], secret_id=entry[1])
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

##### Read Methods #####

@orm.db_session
def readMachine(self, uid):
try:
return self.Machine.get(id=uid)
except Exception as e:
self.logger.error(e)
return self.Machine.get(uid)
except orm.ObjectNotFound as e:
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
def readPassword(self, uid: uuid.UUID) -> Password:
try:
return self.Password.get(id=uid)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -108,7 +101,7 @@ def getLatestSuccessfulPassword(self, mid: uuid.UUID):
else:
return None
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return None

@orm.db_session
Expand All @@ -117,7 +110,7 @@ def getMachineList(self):
allMachines = self.Machine.select().where(lambda m: m.disabled == False)
return self.__convertQueryToDict(allMachines)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -129,7 +122,7 @@ def getAccessLog(self):
allAccess = self.AccessLog.select()
return self.__convertQueryToDict(allAccess)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -139,7 +132,7 @@ def getMachinesPasswords(self, mid: uuid.UUID):
try:
return self.Password.select(lambda c: c.machine_id.id == mid).order_by(lambda d: orm.desc(d.password_received))
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -149,7 +142,7 @@ def getMachinesCheckins(self, mid: uuid.UUID):
try:
return self.Checkin.select(lambda c: c.mid.id == mid).order_by(lambda d: orm.desc(d.checkin_time))
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -159,7 +152,7 @@ def getMachinesByHostname(self, hostname: str):
try:
return self.Machine.select(lambda c: c.hostname == hostname)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -169,25 +162,25 @@ def getMachinesBySerialnumber(self, serialnumber: str):
try:
return self.Machine.select(lambda c: c.serialnumber == serialnumber)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
"""
@orm.db_session
def getMachinesPosDuplicates(self, mid: uuid.UUID):
try:
self.logger.debug(mid)
logging.getLogger('mlaps').debug(mid)
machine = self.readMachine(mid)
posDuplList = list()
posDuplList.extend(self.getMachinesByHostname(machine.hostname)[:])
posDuplList.extend(self.getMachinesBySerialnumber(machine.serialnumber)[:])
self.logger.debug(posDuplList)
logging.getLogger('mlaps').debug(posDuplList)
#exclude own machine from result, since it had to be in both queries
#also exclude already disabled machines
return set([posDupl for posDupl in posDuplList if not posDupl.id == machine.id and not posDupl.disabled])
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

"""
Expand All @@ -198,7 +191,7 @@ def getNonDisabledNonEnrolledMachines(self):
try:
return self.Machine.select().where(lambda m: m.disabled is False and m.enroll_success is False)
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -214,7 +207,7 @@ def checkPasswordValidityString(self, uid):
if password:
return self.checkPasswordValidity(password)
else:
self.logger.warn(f"Unable to find password for given UUID {uid}")
logging.getLogger('mlaps').warning(f"Unable to find password for given UUID {uid}")
return False

@orm.db_session
Expand Down Expand Up @@ -247,7 +240,7 @@ def updateMachineInfo(self, uid, serialnumber, hostname):
orm.commit()
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -258,7 +251,7 @@ def disableMachine(self, uid):
orm.commit()
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -269,15 +262,15 @@ def checkPasswordStatus(self, pw):
pw.status = 'Expired'
orm.commit()
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)

@orm.db_session
def updatePasswordStatus(self, pw):
try:
pw.status = 'Seen'
orm.commit()
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)

@orm.db_session
def updatePasswordSecStage(self, res : str, mid):
Expand All @@ -286,14 +279,14 @@ def updatePasswordSecStage(self, res : str, mid):
)
if pw:
pw = pw.limit(1)[0]
if not res: self.logger.warn(f"Machine {mid} has reported failed password change with result {res}")
if not res: logging.getLogger('mlaps').warning(f"Machine {mid} has reported failed password change with result {res}")
try:
pw.password_set = True if not res.startswith("Failed to") else False
orm.commit()
self.maintainLastFiveSuccessfulPasswords(mid)
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
self.maintainLastFiveSuccessfulPasswords(mid)
return False
else:
Expand All @@ -313,7 +306,7 @@ def expirePasswordDelayed(self, password, minutes=0, hours=0, days=0):
orm.commit()
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

##### Create Methods #####
Expand All @@ -328,7 +321,7 @@ def createCheckin(self, uid):
newCheckin = self.Checkin(uuid=uid, mid=mid, checkin_time=cTime)
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -353,7 +346,7 @@ def createPassword(self, machine_id, password):
)
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False

@orm.db_session
Expand All @@ -369,7 +362,7 @@ def createMachine(self, uid, serial, hostname):
)
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False


Expand All @@ -384,7 +377,7 @@ def createAccessEntry(self, admin_name, mid, pwid):
)
return True
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False


Expand All @@ -399,10 +392,10 @@ def removeMachine(self, uid):
orm.commit()
return True
else:
self.logger.warn(f"Failed to delete machine with id {uid}")
logging.getLogger('mlaps').warning(f"Failed to delete machine with id {uid}")
return False
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return False


Expand Down Expand Up @@ -451,7 +444,7 @@ def maintainLastFiveSuccessfulPasswords(self, mid):
lambda c: orm.desc(c.password_received)
)
if len(pws) <= n:
self.logger.info(f"Machine {mid} has less or equal to {n} passwords saved, returning all")
logging.getLogger('mlaps').info(f"Machine {mid} has less or equal to {n} passwords saved, returning all")
return pws
vcount = 0
wantedPws = []
Expand All @@ -468,7 +461,7 @@ def maintainLastFiveSuccessfulPasswords(self, mid):
if len(wantedPws) == 0:
pw.delete()
rmcount += 1
self.logger.debug(f"Removed {rmcount} password from machine {mid}")
logging.getLogger('mlaps').debug(f"Removed {rmcount} password from machine {mid}")
except Exception as e:
self.logger.error(e)
logging.getLogger('mlaps').error(e)
return None
Loading

0 comments on commit 2618e33

Please sign in to comment.