From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 7 Nov 2025 11:14:55 +0000 (-0500) Subject: chore: Clean up unused variables X-Git-Tag: rec-5.4.0-alpha1~125^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7572cf5a7c50622d8d9c396d2eb05bedb50b878a;p=thirdparty%2Fpdns.git chore: Clean up unused variables - Change get_rust_struct_fields_from_definition to use `indent` All callers were maintaining it, get_rust_struct_from_definition had updated it but left it unused... - Fix type annotations - Remove dead code for `response` - Remove dead code for `url` - Remove dead code for `wire` - Remove unused timing - Remove unused variable `data` - Remove unused variable `dropped` - Remove unused variable `fileContent` - Remove unused variable `message` - Remove unused variable `method` - Remove unused variable `name` - Remove unused variable `numberOfQueries` - Remove unused variable `output` - Remove unused variable `pbMessageType` - Remove unused variable `rcode` - Remove unused variable `secondSerial` - Remove unused variable `total` Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py index 04529c4a70..6d430d7aaa 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py +++ b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py @@ -203,11 +203,10 @@ def get_converted_serde_type(rust_type): return f'dnsdistsettings::{rust_type}' -def get_rust_struct_fields_from_definition(name, keys, default_functions, indent_spaces, special_serde_object=False): +def get_rust_struct_fields_from_definition(name, keys, default_functions, indent, special_serde_object=False): if not 'parameters' in keys: return '' output = '' - indent = ' '*indent_spaces for parameter in keys['parameters']: parameter_name = get_rust_field_name(parameter['name']) if not 'rename' in parameter else parameter['rename'] rust_type = parameter['type'] @@ -252,7 +251,7 @@ def get_rust_struct_from_definition(name, keys, default_functions, indent_spaces ''' indent_spaces += 4 indent = ' '*indent_spaces - output += get_rust_struct_fields_from_definition(name, keys, default_functions, indent_spaces, special_serde_object=special_serde_object) + output += get_rust_struct_fields_from_definition(name, keys, default_functions, indent, special_serde_object=special_serde_object) output += ' }\n' if special_serde_object or not 'skip-serde' in keys or not keys['skip-serde']: default_functions.append(write_rust_default_trait_impl(f'{obj_name}Configuration{name_suffix}', special_serde_object)) @@ -401,7 +400,7 @@ def generate_actions_config(output, def_dir, response, default_functions): action_buffer += f'{indent}#[serde(default, skip_serializing_if = "crate::is_default")]\n' action_buffer += f'{indent}name: String,\n' - action_buffer += get_rust_struct_fields_from_definition(struct_name, action, default_functions, 8) + action_buffer += get_rust_struct_fields_from_definition(struct_name, action, default_functions, indent) action_buffer += ' }\n\n' @@ -428,7 +427,7 @@ def generate_selectors_config(output, def_dir, default_functions): selector_buffer += f'{indent}#[serde(default, skip_serializing_if = "crate::is_default")]\n' selector_buffer += f'{indent}name: String,\n' - selector_buffer += get_rust_struct_fields_from_definition(struct_name, selector, default_functions, 8) + selector_buffer += get_rust_struct_fields_from_definition(struct_name, selector, default_functions, indent) selector_buffer += ' }\n\n' diff --git a/regression-tests.dnsdist/dnsdisttests.py b/regression-tests.dnsdist/dnsdisttests.py index 4f521c0b6e..36ab4c51ba 100644 --- a/regression-tests.dnsdist/dnsdisttests.py +++ b/regression-tests.dnsdist/dnsdisttests.py @@ -969,17 +969,15 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase): def generateNewCertificateAndKey(filePrefix): # generate and sign a new cert cmd = ['openssl', 'req', '-new', '-newkey', 'rsa:2048', '-nodes', '-keyout', filePrefix + '.key', '-out', filePrefix + '.csr', '-config', 'configServer.conf'] - output = None try: process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) - output = process.communicate(input='') + process.communicate(input='') except subprocess.CalledProcessError as exc: raise AssertionError('openssl req failed (%d): %s' % (exc.returncode, exc.output)) cmd = ['openssl', 'x509', '-req', '-days', '1', '-CA', 'ca.pem', '-CAkey', 'ca.key', '-CAcreateserial', '-in', filePrefix + '.csr', '-out', filePrefix + '.pem', '-extfile', 'configServer.conf', '-extensions', 'v3_req'] - output = None try: process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) - output = process.communicate(input='') + process.communicate(input='') except subprocess.CalledProcessError as exc: raise AssertionError('openssl x509 failed (%d): %s' % (exc.returncode, exc.output)) @@ -989,10 +987,9 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase): outFile.write(inFile.read()) cmd = ['openssl', 'pkcs12', '-export', '-passout', 'pass:passw0rd', '-clcerts', '-in', filePrefix + '.pem', '-CAfile', 'ca.pem', '-inkey', filePrefix + '.key', '-out', filePrefix + '.p12'] - output = None try: process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) - output = process.communicate(input='') + process.communicate(input='') except subprocess.CalledProcessError as exc: raise AssertionError('openssl pkcs12 failed (%d): %s' % (exc.returncode, exc.output)) diff --git a/regression-tests.dnsdist/doh3client.py b/regression-tests.dnsdist/doh3client.py index e2e2bc107a..15e6d79479 100644 --- a/regression-tests.dnsdist/doh3client.py +++ b/regression-tests.dnsdist/doh3client.py @@ -9,7 +9,7 @@ import time import async_timeout from collections import deque -from typing import BinaryIO, Callable, Deque, Dict, List, Optional, Union, cast +from typing import BinaryIO, Callable, Deque, Dict, List, Optional, Tuple, Union, cast from urllib.parse import urlparse import aioquic @@ -157,9 +157,8 @@ async def perform_http_request( include: bool, output_dir: Optional[str], additional_headers: Optional[Dict] = None, -) -> None: +) -> Tuple[str, Dict[str, str]]: # perform request - start = time.time() if data is not None: headers = copy.deepcopy(additional_headers) if additional_headers else {} headers["content-length"] = str(len(data)) @@ -169,11 +168,8 @@ async def perform_http_request( data=data, headers=headers, ) - method = "POST" else: http_events = await client.get(url, headers=additional_headers) - method = "GET" - elapsed = time.time() - start result = bytes() headers = {} @@ -197,7 +193,7 @@ async def async_h3_query( post: bool, create_protocol=HttpClient, additional_headers: Optional[Dict] = None, -) -> None: +) -> Union[Tuple[str, Dict[str, str]], Tuple[asyncio.TimeoutError, Dict[str, str]]]: url = baseurl if not post: diff --git a/regression-tests.dnsdist/quictests.py b/regression-tests.dnsdist/quictests.py index b4ec180722..9d4b6ee82a 100644 --- a/regression-tests.dnsdist/quictests.py +++ b/regression-tests.dnsdist/quictests.py @@ -65,7 +65,6 @@ class QUICTests(object): """ name = 'drop.doq.tests.powerdns.com.' query = dns.message.make_query(name, 'A', 'IN') - dropped = False try: (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False) self.assertTrue(False) @@ -111,7 +110,6 @@ class QUICTests(object): """ name = 'no-backend.doq.tests.powerdns.com.' query = dns.message.make_query(name, 'A', 'IN', use_edns=False) - dropped = False try: (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False) self.assertTrue(False) diff --git a/regression-tests.dnsdist/test_API.py b/regression-tests.dnsdist/test_API.py index 9afc1f4f5f..b07f6f8ee4 100644 --- a/regression-tests.dnsdist/test_API.py +++ b/regression-tests.dnsdist/test_API.py @@ -485,7 +485,6 @@ class TestAPIWritable(APITestsBase): configFile = self._APIWriteDir + '/' + 'acl.conf' self.assertTrue(os.path.isfile(configFile)) - fileContent = None with open(configFile, 'rt') as f: header = f.readline() body = f.readline() diff --git a/regression-tests.dnsdist/test_Advanced.py b/regression-tests.dnsdist/test_Advanced.py index babf7399b3..570a7f49a0 100644 --- a/regression-tests.dnsdist/test_Advanced.py +++ b/regression-tests.dnsdist/test_Advanced.py @@ -537,7 +537,6 @@ class TestAdvancedDropEmptyQueries(DNSDistTest): """ Advanced: Drop empty queries """ - name = 'drop-empty-queries.advanced.tests.powerdns.com.' query = dns.message.Message() for method in ("sendUDPQuery", "sendTCPQuery"): diff --git a/regression-tests.dnsdist/test_Basics.py b/regression-tests.dnsdist/test_Basics.py index 6292ab75b0..45b5863655 100644 --- a/regression-tests.dnsdist/test_Basics.py +++ b/regression-tests.dnsdist/test_Basics.py @@ -426,7 +426,6 @@ class TestBasics(DNSDistTest): """ Basic: NotImp on empty queries """ - name = 'notimp-empty-queries.basic.tests.powerdns.com.' query = dns.message.Message() response = dns.message.make_response(query) diff --git a/regression-tests.dnsdist/test_DNSCrypt.py b/regression-tests.dnsdist/test_DNSCrypt.py index 05f96d94e4..e8e74168b8 100644 --- a/regression-tests.dnsdist/test_DNSCrypt.py +++ b/regression-tests.dnsdist/test_DNSCrypt.py @@ -427,7 +427,6 @@ class TestDNSCryptAutomaticRotation(DNSCryptTest): client.refreshResolverCertificates() cert = client.getResolverCertificate() self.assertTrue(cert) - secondSerial = cert.serial self.assertGreater(cert.serial, serials[client]) name = 'automatic-rotation.dnscrypt.tests.powerdns.com.' diff --git a/regression-tests.dnsdist/test_DOH.py b/regression-tests.dnsdist/test_DOH.py index a7429bf005..d7bfc10276 100644 --- a/regression-tests.dnsdist/test_DOH.py +++ b/regression-tests.dnsdist/test_DOH.py @@ -248,7 +248,6 @@ class DOHTests(object): """ DOH: Empty GET query """ - name = 'empty-get.doh.tests.powerdns.com.' url = self._dohBaseURL conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0) conn.setopt(pycurl.URL, url) @@ -256,7 +255,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 400) @@ -266,7 +265,6 @@ class DOHTests(object): """ if self._dohLibrary == 'h2o': raise unittest.SkipTest('h2o tries to parse the qname early, so this check will fail') - name = 'zero-qdcount.doh.tests.powerdns.com.' query = dns.message.Message() query.id = 0 query.flags &= ~dns.flags.RD @@ -280,7 +278,6 @@ class DOHTests(object): """ DOH: Short path in GET query """ - name = 'short-path-get.doh.tests.powerdns.com.' url = self._dohBaseURL + '/AA' conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0) conn.setopt(pycurl.URL, url) @@ -288,7 +285,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 404) @@ -307,7 +304,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 400) @@ -317,7 +314,6 @@ class DOHTests(object): """ name = 'invalid-b64-get.doh.tests.powerdns.com.' query = dns.message.make_query(name, 'A', 'IN', use_edns=False) - wire = query.to_wire() url = self._dohBaseURL + '?dns=' + '_-~~~~-_' conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0) conn.setopt(pycurl.URL, url) @@ -325,7 +321,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 400) @@ -345,7 +341,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 400) @@ -367,7 +363,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) conn.setopt(pycurl.CUSTOMREQUEST, 'PATCH') - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 400) @@ -526,7 +522,7 @@ class DOHTests(object): conn.setopt(pycurl.SSL_VERIFYPEER, 1) conn.setopt(pycurl.SSL_VERIFYHOST, 2) conn.setopt(pycurl.CAINFO, self._caCert) - data = conn.perform_rb() + conn.perform_rb() rcode = conn.getinfo(pycurl.RESPONSE_CODE) self.assertEqual(rcode, 403) @@ -1653,7 +1649,6 @@ class DOHFrontendLimits(object): """ DoH Frontend Limits: Maximum number of conns per DoH frontend """ - name = 'maxconnsperfrontend.doh.tests.powerdns.com.' query = b"GET / HTTP/1.0\r\n\r\n" conns = [] @@ -1869,8 +1864,8 @@ class DOHLimits(object): failed = 0 for conn in conns: try: - data = conn.perform_rb() - rcode = conn.getinfo(pycurl.RESPONSE_CODE) + conn.perform_rb() + conn.getinfo(pycurl.RESPONSE_CODE) count = count + 1 except: failed = failed + 1 @@ -1913,7 +1908,6 @@ class DOHXFR(object): name = 'xfr.doh.tests.powerdns.com.' for xfrType in [dns.rdatatype.AXFR, dns.rdatatype.IXFR]: query = dns.message.make_query(name, xfrType, 'IN') - url = self.getDOHGetURL(self._dohBaseURL, query) expectedResponse = dns.message.make_response(query) expectedResponse.set_rcode(dns.rcode.NOTIMP) diff --git a/regression-tests.dnsdist/test_DOQ.py b/regression-tests.dnsdist/test_DOQ.py index 7d7aacc681..c8d05a7133 100644 --- a/regression-tests.dnsdist/test_DOQ.py +++ b/regression-tests.dnsdist/test_DOQ.py @@ -34,7 +34,7 @@ class TestDOQBogus(DNSDistTest): expectedQuery.id = 0 try: - message = quic_bogus_query(query, '127.0.0.1', 2.0, self._doqServerPort, verify=self._caCert, server_hostname=self._serverName) + quic_bogus_query(query, '127.0.0.1', 2.0, self._doqServerPort, verify=self._caCert, server_hostname=self._serverName) self.assertFalse(True) except doqclient.StreamResetError as e : self.assertEqual(e.error, 2); diff --git a/regression-tests.dnsdist/test_Protobuf.py b/regression-tests.dnsdist/test_Protobuf.py index 4629fcd968..e790e48072 100644 --- a/regression-tests.dnsdist/test_Protobuf.py +++ b/regression-tests.dnsdist/test_Protobuf.py @@ -1215,7 +1215,6 @@ class TestProtobufAXFR(DNSDistProtobufTest): while not self._protobufQueue.empty(): msg = self.getFirstProtobufMessage() count = count + 1 - pbMessageType = dnsmessage_pb2.PBDNSMessage.TCP self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.TCP, responses[count-1]) expected = responses[count-1].answer[0] diff --git a/regression-tests.dnsdist/test_ProxyProtocol.py b/regression-tests.dnsdist/test_ProxyProtocol.py index a039709f2f..1b96ab8a3d 100644 --- a/regression-tests.dnsdist/test_ProxyProtocol.py +++ b/regression-tests.dnsdist/test_ProxyProtocol.py @@ -754,8 +754,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest): toProxyQueue.put(response, True, 2.0) - wire = query.to_wire() - reverseProxyPort = pickAvailablePort() reverseProxy = threading.Thread(name='Mock Proxy Protocol Reverse Proxy', target=MockTCPReverseProxyAddingProxyProtocol, args=[reverseProxyPort, self._dohServerPPOutsidePort]) reverseProxy.start() @@ -804,8 +802,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest): toProxyQueue.put(response, True, 2.0) - wire = query.to_wire() - reverseProxyPort = pickAvailablePort() tlsContext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) tlsContext.load_cert_chain(self._serverCert, self._serverKey) @@ -857,8 +853,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest): toProxyQueue.put(response, True, 2.0) - wire = query.to_wire() - reverseProxyPort = pickAvailablePort() reverseProxy = threading.Thread(name='Mock Proxy Protocol Reverse Proxy', target=MockTCPReverseProxyAddingProxyProtocol, args=[reverseProxyPort, self._dotServerPPOutsidePort]) reverseProxy.start() @@ -907,8 +901,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest): toProxyQueue.put(response, True, 2.0) - wire = query.to_wire() - reverseProxyPort = pickAvailablePort() tlsContext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) tlsContext.load_cert_chain(self._serverCert, self._serverKey) @@ -1066,7 +1058,6 @@ class TestProxyProtocolIncomingValuesViaLua(DNSDistTest): query = dns.message.make_query(name, 'A', 'IN') # dnsdist set RA = RD for spoofed responses query.flags &= ~dns.flags.RD - response = dns.message.make_response(query) expectedResponse = dns.message.make_response(query) rrset = dns.rrset.from_text(name, diff --git a/regression-tests.dnsdist/test_Routing.py b/regression-tests.dnsdist/test_Routing.py index 8e143e3b10..46f250f170 100644 --- a/regression-tests.dnsdist/test_Routing.py +++ b/regression-tests.dnsdist/test_Routing.py @@ -313,7 +313,6 @@ class TestRoutingRoundRobinLBAllDown(DNSDistTest): """ Routing: Round Robin with all servers down """ - numberOfQueries = 10 name = 'alldown.rr.routing.tests.powerdns.com.' query = dns.message.make_query(name, 'A', 'IN') response = dns.message.make_response(query) @@ -486,7 +485,6 @@ class TestRoutingOrder(DNSDistTest): self.assertEqual(query, receivedQuery) self.assertEqual(response, receivedResponse) - total = 0 if 'UDP Responder' in self._responsesCounter: self.assertEqual(self._responsesCounter['UDP Responder'], 0) self.assertEqual(self._responsesCounter['UDP Responder 2'], numberOfQueries) diff --git a/regression-tests.dnsdist/test_TCPKeepAlive.py b/regression-tests.dnsdist/test_TCPKeepAlive.py index d456852786..853478b30b 100644 --- a/regression-tests.dnsdist/test_TCPKeepAlive.py +++ b/regression-tests.dnsdist/test_TCPKeepAlive.py @@ -227,7 +227,6 @@ class TestTCPKeepAlive(DNSDistTest): numQueriesPerConn = 4 conns = [] - start = time.time() for idx in range(numConns): conns.append(self.openTCPConnection()) diff --git a/regression-tests.dnsdist/test_TCPLimits.py b/regression-tests.dnsdist/test_TCPLimits.py index 7ecdcf6f9a..974a4f1081 100644 --- a/regression-tests.dnsdist/test_TCPLimits.py +++ b/regression-tests.dnsdist/test_TCPLimits.py @@ -109,7 +109,6 @@ class TestTCPLimits(DNSDistTest): """ TCP Limits: Maximum duration """ - name = 'duration.tcp.tests.powerdns.com.' start = time.time() conn = self.openTCPConnection()