You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2021/03/31 12:01:27 UTC
[incubator-ponymail-foal] 03/14: use audit log plugin for writing
log entries
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit aa8e9daede3da9e99e35e76970b9c5525bd3615e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Wed Mar 31 12:16:45 2021 +0200
use audit log plugin for writing log entries
---
server/endpoints/mgmt.py | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/server/endpoints/mgmt.py b/server/endpoints/mgmt.py
index b93e869..f13dd0f 100644
--- a/server/endpoints/mgmt.py
+++ b/server/endpoints/mgmt.py
@@ -21,6 +21,7 @@ import plugins.server
import plugins.session
import plugins.mbox
import plugins.defuzzer
+import plugins.auditlog
import typing
import aiohttp.web
import time
@@ -49,18 +50,7 @@ async def process(
index=session.database.dbs.mbox, body=email, id=email["id"],
)
lid = email.get("list_raw")
- await session.database.index(
- index=session.database.dbs.auditlog,
- body={
- "date": time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(time.time())),
- "action": "delete",
- "remote": session.remote,
- "author": f"{session.credentials.uid}@{session.credentials.oauth_provider}",
- "target": doc,
- "lid": lid,
- "log": f"Removed email {doc} from {lid} archives",
- },
- )
+ await plugins.auditlog.add_entry(session, action="delete", target=doc, lid=lid, log=f"Removed email {doc} from {lid} archives")
delcount += 1
return aiohttp.web.Response(headers={}, status=200, text=f"Removed {delcount} emails from archives.")
# Editing an email in place
@@ -106,18 +96,9 @@ async def process(
index=session.database.dbs.source, body=source, id=email["id"],
)
- await session.database.index(
- index=session.database.dbs.auditlog,
- body={
- "date": time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(time.time())),
- "action": "edit",
- "remote": session.remote,
- "author": f"{session.credentials.uid}@{session.credentials.oauth_provider}",
- "target": doc,
- "lid": origin_lid,
- "log": f"Edited email {doc} from {origin_lid} archives ({origin_lid} -> {lid})",
- },
- )
+ await plugins.auditlog.add_entry(session, action="edit", target=doc, lid=lid,
+ log= f"Edited email {doc} from {origin_lid} archives ({origin_lid} -> {lid})")
+
return aiohttp.web.Response(headers={}, status=200, text=f"Email successfully saved")
return aiohttp.web.Response(headers={}, status=404, text=f"Email not found!")