From 98735fe4a94535e5b50a35b098f5d8dda2ea0045 Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Fri, 31 Mar 2017 16:33:04 +0200 Subject: [PATCH] Header for whoisd, commented some lines with % --- bin/whoisd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/whoisd b/bin/whoisd index c5d8974..7f9f65b 100755 --- a/bin/whoisd +++ b/bin/whoisd @@ -20,8 +20,15 @@ log = logging.getLogger("whoisd") __VERSION__ = '0.1' class WhoisHandler(socketserver.BaseRequestHandler): + header = "% This is the DARKNET database query service.\n" \ + "% The objects should be in something like RPLS format.\n" \ + "%\n" \ + "% The DARKNET database is subject to terms and conditions.\n" \ + "% Mostly these are \"be nice\" and \"don't knowingly break things\".\n" \ + "\n" + def handle(self): - self.request.sendall(b"Welcome!\n\n") + self.request.sendall(self.header.encode()) line = self.request.recv(1024) line = line.split(b"\n", 2)[0].strip() print("Request object is %s" % line) @@ -30,16 +37,16 @@ class WhoisHandler(socketserver.BaseRequestHandler): objs = findInDatabase(line.decode()) if len(objs) > 0: - self.request.sendall(("%d result%s\n" % (len(objs), "" if len(objs)==1 else "s")).encode()) + self.request.sendall(("%% %d result%s\n" % (len(objs), "" if len(objs)==1 else "s")).encode()) for obj in objs: self.sendObject(obj) else: - self.request.sendall(b"NOT FOUND\n\n") + self.request.sendall(b"%% NOT FOUND\n\n") def sendObject(self, obj): result = [ "", - "Object %s (%s)" % (obj, obj.getClassName()), + "%% Object %s (%s)" % (obj, obj.getClassName()), "" ]