summaryrefslogtreecommitdiffstats
path: root/test/functional/util
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/util')
-rwxr-xr-xtest/functional/util/dummy_avast.py12
-rwxr-xr-xtest/functional/util/dummy_clam.py12
-rwxr-xr-xtest/functional/util/dummy_fprot.py15
-rwxr-xr-xtest/functional/util/dummy_http.py33
-rwxr-xr-xtest/functional/util/dummy_https.py38
-rwxr-xr-xtest/functional/util/dummy_p0f.py24
-rwxr-xr-xtest/functional/util/dummy_ssl.py56
-rwxr-xr-xtest/functional/util/dummy_udp.py7
8 files changed, 90 insertions, 107 deletions
diff --git a/test/functional/util/dummy_avast.py b/test/functional/util/dummy_avast.py
index 55945d8dc..a4a6c62a2 100755
--- a/test/functional/util/dummy_avast.py
+++ b/test/functional/util/dummy_avast.py
@@ -1,15 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
PID = "/tmp/dummy_avast.pid"
import os
-import sys
import socket
+import socketserver
+import sys
+
import dummy_killer
-try:
- import SocketServer as socketserver
-except:
- import socketserver
class MyTCPHandler(socketserver.BaseRequestHandler):
@@ -50,6 +48,6 @@ if __name__ == "__main__":
try:
server.handle_request()
except socket.error:
- print "Socket closed"
+ print("Socket closed")
server.server_close()
diff --git a/test/functional/util/dummy_clam.py b/test/functional/util/dummy_clam.py
index d25a63525..1b614f58b 100755
--- a/test/functional/util/dummy_clam.py
+++ b/test/functional/util/dummy_clam.py
@@ -1,15 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
PID = "/tmp/dummy_clamav.pid"
import os
-import sys
import socket
+import socketserver
+import sys
+
import dummy_killer
-try:
- import SocketServer as socketserver
-except:
- import socketserver
class MyTCPHandler(socketserver.BaseRequestHandler):
@@ -47,6 +45,6 @@ if __name__ == "__main__":
try:
server.handle_request()
except socket.error:
- print "Socket closed"
+ print("Socket closed")
server.server_close()
diff --git a/test/functional/util/dummy_fprot.py b/test/functional/util/dummy_fprot.py
index e6dc58bdd..31ae2c487 100755
--- a/test/functional/util/dummy_fprot.py
+++ b/test/functional/util/dummy_fprot.py
@@ -1,15 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
import os
-import sys
import signal
import socket
-import dummy_killer
-
+import socketserver
+import sys
-try:
- import SocketServer as socketserver
-except:
- import socketserver
+import dummy_killer
PID = "/tmp/dummy_fprot.pid"
@@ -53,5 +50,5 @@ if __name__ == "__main__":
try:
server.handle_request()
except socket.error:
- print "Socket closed"
+ print("Socket closed")
server.server_close()
diff --git a/test/functional/util/dummy_http.py b/test/functional/util/dummy_http.py
index 614fced29..c05ee2d02 100755
--- a/test/functional/util/dummy_http.py
+++ b/test/functional/util/dummy_http.py
@@ -1,14 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-import BaseHTTPServer
-import SocketServer
-import SimpleHTTPServer
-import dummy_killer
-
-import time
+import http.server
import os
-import sys
import socket
+import socketserver
+import sys
+import time
+
+import dummy_killer
PORT = 18080
HOST_NAME = '127.0.0.1'
@@ -16,10 +15,10 @@ HOST_NAME = '127.0.0.1'
PID = "/tmp/dummy_http.pid"
-class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class MyHandler(http.server.BaseHTTPRequestHandler):
def setup(self):
- BaseHTTPServer.BaseHTTPRequestHandler.setup(self)
+ http.server.BaseHTTPRequestHandler.setup(self)
self.protocol_version = "HTTP/1.1" # allow connection: keep-alive
def do_HEAD(self):
@@ -29,7 +28,7 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.log_message("to be closed: " + self.close_connection)
def do_GET(self):
- response = "hello world"
+ response = b"hello world"
"""Respond to a GET request."""
if self.path == "/empty":
@@ -60,7 +59,7 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
def do_POST(self):
- response = "hello post"
+ response = b"hello post"
"""Respond to a GET request."""
if self.path == "/empty":
self.finish()
@@ -82,12 +81,12 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.wfile.write(response)
-class ThreadingSimpleServer(SocketServer.ThreadingMixIn,
- BaseHTTPServer.HTTPServer):
+class ThreadingSimpleServer(socketserver.ThreadingMixIn,
+ http.server.HTTPServer):
def __init__(self):
self.allow_reuse_address = True
self.timeout = 1
- BaseHTTPServer.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler)
+ http.server.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler)
def run(self):
dummy_killer.write_pid(PID)
@@ -96,9 +95,9 @@ class ThreadingSimpleServer(SocketServer.ThreadingMixIn,
sys.stdout.flush()
server.handle_request()
except KeyboardInterrupt:
- print "Interrupt"
+ print("Interrupt")
except socket.error:
- print "Socket closed"
+ print("Socket closed")
def stop(self):
self.keep_running = False
diff --git a/test/functional/util/dummy_https.py b/test/functional/util/dummy_https.py
index 43c5d9122..1e6753423 100755
--- a/test/functional/util/dummy_https.py
+++ b/test/functional/util/dummy_https.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-import BaseHTTPServer
-import SocketServer
-import SimpleHTTPServer
-import dummy_killer
-import ssl
-
-import time
+import http.server
+import http.server
import os
-import sys
import socket
+import socketserver
+import ssl
+import sys
+import time
+
+import dummy_killer
PORT = 18081
HOST_NAME = '127.0.0.1'
@@ -17,10 +17,10 @@ HOST_NAME = '127.0.0.1'
PID = "/tmp/dummy_https.pid"
-class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class MyHandler(http.server.BaseHTTPRequestHandler):
def setup(self):
- BaseHTTPServer.BaseHTTPRequestHandler.setup(self)
+ http.server.BaseHTTPRequestHandler.setup(self)
self.protocol_version = "HTTP/1.1" # allow connection: keep-alive
def do_HEAD(self):
@@ -30,7 +30,7 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.log_message("to be closed: " + self.close_connection)
def do_GET(self):
- response = "hello world"
+ response = b"hello world"
"""Respond to a GET request."""
if self.path == "/empty":
@@ -64,11 +64,11 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
"""Respond to a POST request."""
content_length = int(self.headers['Content-Length'])
- response = 'hello post'
+ response = b'hello post'
if content_length > 0:
body = self.rfile.read(content_length)
- response = "hello post: " + str(len(body))
+ response = b"hello post: " + bytes(len(body))
if self.path == "/empty":
self.finish()
@@ -90,13 +90,13 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.wfile.write(response)
-class ThreadingSimpleServer(SocketServer.ThreadingMixIn,
- BaseHTTPServer.HTTPServer):
+class ThreadingSimpleServer(socketserver.ThreadingMixIn,
+ http.server.HTTPServer):
def __init__(self, certfile,
keyfile,):
self.allow_reuse_address = True
self.timeout = 10
- BaseHTTPServer.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler)
+ http.server.HTTPServer.__init__(self, (HOST_NAME, PORT), MyHandler)
self.socket = ssl.wrap_socket (self.socket,
keyfile=keyfile,
certfile=certfile, server_side=True)
@@ -108,9 +108,9 @@ class ThreadingSimpleServer(SocketServer.ThreadingMixIn,
sys.stdout.flush()
server.handle_request()
except KeyboardInterrupt:
- print "Interrupt"
+ print("Interrupt")
except socket.error:
- print "Socket closed"
+ print("Socket closed")
def stop(self):
self.keep_running = False
diff --git a/test/functional/util/dummy_p0f.py b/test/functional/util/dummy_p0f.py
index d780bdb0d..2bcd183d4 100755
--- a/test/functional/util/dummy_p0f.py
+++ b/test/functional/util/dummy_p0f.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
PID = "/tmp/dummy_p0f.pid"
@@ -6,11 +6,9 @@ import os
import sys
import struct
import socket
+import socketserver
+
import dummy_killer
-try:
- import SocketServer as socketserver
-except:
- import socketserver
class MyStreamHandler(socketserver.BaseRequestHandler):
@@ -22,8 +20,8 @@ class MyStreamHandler(socketserver.BaseRequestHandler):
}
OS = {
- 'windows' : ('Windows', '7 or 8'),
- 'linux' : ('Linux', '3.11 and newer')
+ 'windows' : (b'Windows', b'7 or 8'),
+ 'linux' : (b'Linux', b'3.11 and newer')
}
self.data = self.request.recv(21).strip()
@@ -47,10 +45,10 @@ class MyStreamHandler(socketserver.BaseRequestHandler):
0, # os_match_q
OS[self.server.p0f_os][0], # os_name
OS[self.server.p0f_os][1], # os_flavor
- '', # http_name
- '', # http_flavor
- 'Ethernet or modem', # link_type
- '' # language
+ b'', # http_name
+ b'', # http_flavor
+ b'Ethernet or modem', # link_type
+ b'' # language
)
self.request.sendall(response)
@@ -61,7 +59,7 @@ def cleanup(SOCK):
try:
os.unlink(SOCK)
except OSError:
- print "Could not unlink socket: " + SOCK
+ print("Could not unlink socket: " + SOCK)
if __name__ == "__main__":
SOCK = '/tmp/p0f.sock'
@@ -92,7 +90,7 @@ if __name__ == "__main__":
try:
server.handle_request()
except socket.error:
- print "Socket closed"
+ print("Socket closed")
server.server_close()
cleanup(SOCK)
diff --git a/test/functional/util/dummy_ssl.py b/test/functional/util/dummy_ssl.py
index 725f8052a..44b178293 100755
--- a/test/functional/util/dummy_ssl.py
+++ b/test/functional/util/dummy_ssl.py
@@ -1,64 +1,58 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-import SocketServer
-import dummy_killer
-
-import time
import os
-import sys
import socket
import ssl
+import sys
+import time
+
+import dummy_killer
+import socketserver
PORT = 14433
HOST_NAME = '127.0.0.1'
PID = "/tmp/dummy_ssl.pid"
-class SSLTCPHandler(SocketServer.BaseRequestHandler):
+class SSLTCPHandler(socketserver.StreamRequestHandler):
def handle(self):
time.sleep(0.5)
data = self.request.recv(6000000)
while data:
- print "{} wrote:".format(self.client_address[0])
- print data
+ print("{} wrote:".format(self.client_address[0]))
+ print(data)
time.sleep(0.1)
- self.request.sendall('hello\n')
+ self.request.sendall(b'hello\n')
time.sleep(0.1)
data = self.request.recv(6000000)
-class SSL_TCP_Server(SocketServer.TCPServer):
+class SSL_TCP_Server(socketserver.ThreadingMixIn, socketserver.TCPServer):
def __init__(self,
server_address,
RequestHandlerClass,
certfile,
keyfile,
- ssl_version=ssl.PROTOCOL_TLSv1,
bind_and_activate=True):
self.allow_reuse_address = True
- SocketServer.TCPServer.__init__(self, server_address,
- RequestHandlerClass, bind_and_activate)
- self.certfile = certfile
- self.keyfile = keyfile
- self.ssl_version = ssl_version
- #self.timeout = 1
-
- def get_request(self):
- newsocket, fromaddr = self.socket.accept()
- connstream = ssl.wrap_socket(newsocket,
- server_side=True,
- certfile = self.certfile,
- keyfile = self.keyfile,
- ssl_version = self.ssl_version)
- return connstream, fromaddr
+ super().__init__(server_address, RequestHandlerClass, False)
+ self.timeout = 1
+ ctx = ssl.create_default_context()
+ ctx.load_cert_chain(certfile=certfile)
+ ctx.check_hostname = False
+ ctx.verify_mode = ssl.CERT_NONE
+ self.socket = ctx.wrap_socket(self.socket, server_side=True)
+ if (bind_and_activate):
+ self.server_bind()
+ self.server_activate()
def run(self):
dummy_killer.write_pid(PID)
try:
self.serve_forever()
except KeyboardInterrupt:
- print "Interrupt"
+ print("Interrupt")
except socket.error as e:
- print "Socket closed {}".format(e)
+ print("Socket closed {}".format(e))
finally:
self.server_close()
@@ -66,9 +60,7 @@ class SSL_TCP_Server(SocketServer.TCPServer):
self.keep_running = False
self.server_close()
-class SSL_ThreadingTCPServer(SocketServer.ThreadingMixIn, SSL_TCP_Server): pass
-
if __name__ == '__main__':
- server = SSL_ThreadingTCPServer((HOST_NAME, PORT), SSLTCPHandler, sys.argv[1], sys.argv[1])
+ server = SSL_TCP_Server((HOST_NAME, PORT), SSLTCPHandler, sys.argv[1], sys.argv[1])
dummy_killer.setup_killer(server, server.stop)
server.run()
diff --git a/test/functional/util/dummy_udp.py b/test/functional/util/dummy_udp.py
index 02ee6dce8..f05d6d680 100755
--- a/test/functional/util/dummy_udp.py
+++ b/test/functional/util/dummy_udp.py
@@ -1,7 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import socket
import sys
+
import dummy_killer
UDP_IP = "127.0.0.1"
@@ -21,5 +22,5 @@ if __name__ == "__main__":
while True:
data, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
- print "received message:", data
- sock.sendto(data, addr) \ No newline at end of file
+ print("received message:", data)
+ sock.sendto(data, addr)
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 06:48:10 +0000