From a485408fb308594b2a550a8eacf0327ec2008f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Fri, 6 Feb 2015 15:56:00 +0100
Subject: [PATCH] Fixed req_id format Fixed Recon id in catmap Fixed isoformat
calling on None Shortened validation error message Fixed rejecting of Test
messages
---
warden3/warden_client/warden_client.py | 2 +-
warden3/warden_server/catmap_mysql.json | 2 +-
warden3/warden_server/warden_server.py | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/warden3/warden_client/warden_client.py b/warden3/warden_client/warden_client.py
index 6a807fc..d01d347 100644
--- a/warden3/warden_client/warden_client.py
+++ b/warden3/warden_client/warden_client.py
@@ -102,7 +102,7 @@ class Error(Exception):
if self.method is not None:
out.append(" in %s" % self.method)
if self.req_id is not None:
- out.append("(%8x)" % self.req_id)
+ out.append("(%08x)" % self.req_id)
if self.message is not None:
out.append(": %s" % self.message)
if self.excval is not None:
diff --git a/warden3/warden_server/catmap_mysql.json b/warden3/warden_server/catmap_mysql.json
index d995202..6ff0fc1 100644
--- a/warden3/warden_server/catmap_mysql.json
+++ b/warden3/warden_server/catmap_mysql.json
@@ -12,7 +12,7 @@
"Malware.Spyware" : 204,
"Malware.Dialer" : 205,
"Malware.Rootkit" : 206,
- "Recon.Scanning" : 3,
+ "Recon" : 300,
"Recon.Scanning" : 301,
"Recon.Sniffing" : 302,
"Recon.SocialEngineering" : 303,
diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index a392756..5cff2b0 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -134,7 +134,7 @@ class LogRequestFilter(logging.Filter):
def filter(self, record):
if self.req.env:
- record.req_preamble = "%8x/%s: " % (self.req.req_id or 0, self.req.path)
+ record.req_preamble = "%08x/%s: " % (self.req.req_id or 0, self.req.path)
else:
record.req_preamble = ""
return True
@@ -176,7 +176,7 @@ class Client(namedtuple("ClientTuple",
"%s(id=%i, registered=%s, requestor=\"%s\", hostname=\"%s\", "
"service=\"%s\", note=\"%s\", identity=\"%s\", secret=%s, "
"read=%i, debug=%i, write=%i, test=%i)") % (
- type(self).__name__, self.id, self.registered.isoformat(),
+ type(self).__name__, self.id, self.registered,
self.requestor, self.hostname, self.service, self.note,
self.identity, "..." if self.secret is not None else "None",
self.read, self.debug, self.write, self.test)
@@ -371,11 +371,10 @@ class JSONSchemaValidator(NoValidator):
res = []
for error in sorted(self.validator.iter_errors(event), key=sortkey):
res.append(
- "Validation error: key \"%s\", value \"%s\", expected - %s, error message - %s\n" % (
+ "Validation error: key \"%s\", value \"%s\", expected - %s" % (
u"/".join(str(v) for v in error.path),
error.instance,
- error.schema.get('description', 'no additional info'),
- error.message))
+ error.schema.get('description', 'no additional info')))
return res
@@ -844,6 +843,7 @@ class WardenHandler(ObjectReq):
if self.req.client.test and not 'Test' in event.get('Category', []):
errs[i] = ["You're allowed to send only messages, containing \"Test\" among categories."]
+ continue
db_errs = self.db.store_event(self.req.client, event)
if db_errs:
--
GitLab