requests: refactor to enable coverage (#7692)

The fuzzer got stuck in `accept` when running in coverage mode. This
causes coverage builds to timeout. This fixes it locally for me.
This commit is contained in:
DavidKorczynski 2022-05-10 14:20:54 +01:00 committed by GitHub
parent c414a63bc8
commit 2f117cad04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions

View File

@ -34,40 +34,43 @@ def SetFuzzedInput(input_bytes):
class ServerThread(threading.Thread): class ServerThread(threading.Thread):
def __init__(self): def __init__(self):
self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.s.bind(("127.0.0.1", 8001))
self.s.listen(1)
threading.Thread.__init__(self) threading.Thread.__init__(self)
def run(self): def run(self):
global fuzzed_input global fuzzed_input
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) conn, addr = self.s.accept()
s.bind(("127.0.0.1", 8001)) conn.recv(1024)
s.listen(1) conn.send(fuzzed_input)
while 1: time.sleep(0.005)
conn, addr = s.accept() conn.close()
conn.recv(1024) self.s.shutdown(1)
conn.send(fuzzed_input) self.s.close()
time.sleep(0.005) time.sleep(0.01)
conn.close()
def TestOneInput(input_bytes): def TestOneInput(input_bytes):
t1 = ServerThread()
# Launch threads
t1.start()
SetFuzzedInput(input_bytes) SetFuzzedInput(input_bytes)
try: try:
r = requests.get('http://127.0.0.1:8001/', timeout=0.01) r = requests.get('http://127.0.0.1:8001/', timeout=2.0)
r.status_code r.status_code
r.headers r.headers
r.text r.text
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
pass pass
t1.join()
def main(): def main():
atheris.instrument_all()
atheris.Setup(sys.argv, TestOneInput, enable_python_coverage=True) atheris.Setup(sys.argv, TestOneInput, enable_python_coverage=True)
t1 = ServerThread()
# Launch threads
t1.start()
atheris.Fuzz() atheris.Fuzz()
# Wait for threads to finish
t1.join()
if __name__ == "__main__": if __name__ == "__main__":