bump to support python 3

Author: RamadhanAmizudin

README.md

@@ -4,9 +4,7 @@ An ICAP Server with yara scanner for URL and content.
 
 ## Requirement
 * Squid Proxy 3.5
-* Python 2.7
-* [Yara-Python](https://github.com/VirusTotal/yara-python)
-* [ConfigParser](https://docs.python.org/2/library/configparser.html)
+* Python 3
 
 ## Squid Configuration
 ```
@@ -21,6 +19,7 @@ adaptation_access service_resp allow all
 ## Running
 ```
 $ git clone https://github.com/RamadhanAmizudin/python-icap-yara
+$ pip install -r requirements.txt
 $ python server.py
 ```
 
@@ -75,7 +74,7 @@ License
 =======
 The MIT License (MIT)
 
-Copyright (c) 2017 Ahmad Ramadhan Amizudin
+Copyright (c) 2021 Ahmad Ramadhan Amizudin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

icapserver.py

@@ -18,8 +18,8 @@
 import socket
 import string
 import logging
-import urlparse
-import SocketServer
+import urllib.parse
+import socketserver
 
 __version__ = "1.2"
 
@@ -46,14 +46,14 @@ def __init__(self, code=500, message=None):
 		msg = 'Code: %d Message: %s' % (code, message)
 		LOG.error(msg)
 
-class ICAPServer(SocketServer.TCPServer):
+class ICAPServer(socketserver.TCPServer):
 	""" 
 	ICAP Server
 	This is a simple TCPServer, that allows address reuse.
 	"""
 	allow_reuse_address = 1
 
-class BaseICAPRequestHandler(SocketServer.StreamRequestHandler):
+class BaseICAPRequestHandler(socketserver.StreamRequestHandler):
 	""" 
 	ICAP request handler base class.
 	You have to subclass it and provide methods for each service
@@ -756,7 +756,7 @@ def example_RESPMOD(self):
 	icap_server = ServerClass(server_address, HandlerClass)
 
 	sa = icap_server.socket.getsockname()
-	print "Serving ICAP on", sa[0], "port", sa[1]
+	print("Serving ICAP on", sa[0], "port", sa[1])
 	icap_server.serve_forever()
 
 

requirements.txt

@@ -0,0 +1 @@
+yara==1.7.7

server.py

@@ -3,17 +3,17 @@
 import os, datetime, string, sys
 import time, threading
 import logging, logging.handlers
-import socket, SocketServer
+import socket, socketserver
 from yarascanner import *
 from icapserver import *
 
 def dump(obj):
     for attr in dir(obj):
-        print "obj.%s = %s" % (attr, getattr(obj, attr))
+        print("obj.%s = %s") % (attr, getattr(obj, attr))
 
 yara = YaraScanner()
 
-class ThreadingSimpleServer(SocketServer.ThreadingMixIn, ICAPServer):
+class ThreadingSimpleServer(socketserver.ThreadingMixIn, ICAPServer):
     pass
 
 class YaraICAPHandler(BaseICAPRequestHandler):
@@ -52,10 +52,10 @@ def yara_RESPMOD(self):
         yara.Scan(content, self.enc_req, self.enc_req_headers, self.enc_res_headers, self.headers['x-client-ip'])
 
 try:
-    print 'Use Control-C to exit'
+    print('Use Control-C to exit')
     server = ThreadingSimpleServer(('127.0.0.1', 1344), YaraICAPHandler)
     server.serve_forever()
 except KeyboardInterrupt:
     server.shutdown()
     server.server_close()
-    print "Finished"
+    print("Finished")