Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dnsdist: Fix handling of proxy protocol payload outside of TLS for DoT #14636

Merged
merged 1 commit into from
Sep 10, 2024
Merged

dnsdist: Fix handling of proxy protocol payload outside of TLS for DoT #14636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pdns/dnsdistdist/dnsdist-nghttp2-in.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,6 @@ void IncomingHTTP2Connection::handleIO()
}
}
else {
d_currentPos = 0;
d_proxyProtocolNeed = 0;
d_buffer.clear();
d_state = State::waitingForQuery;
handleConnectionReady();
}
Expand Down
8 changes: 5 additions & 3 deletions pdns/dnsdistdist/dnsdist-tcp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,9 @@ IncomingTCPConnectionState::ProxyProtocolResult IncomingTCPConnectionState::hand
d_proxyProtocolValues = make_unique<std::vector<ProxyProtocolValue>>(std::move(proxyProtocolValues));
}

d_currentPos = 0;
d_proxyProtocolNeed = 0;
d_buffer.clear();
return ProxyProtocolResult::Done;
}
}
Expand Down Expand Up @@ -1084,15 +1087,14 @@ void IncomingTCPConnectionState::handleIO()
if (!d_lastIOBlocked && d_state == State::readingProxyProtocolHeader) {
auto status = handleProxyProtocolPayload();
if (status == ProxyProtocolResult::Done) {
d_buffer.resize(sizeof(uint16_t));

if (isProxyPayloadOutsideTLS()) {
d_state = State::doingHandshake;
iostate = handleHandshake(now);
}
else {
d_state = State::readingQuerySize;
d_buffer.resize(sizeof(uint16_t));
d_currentPos = 0;
d_proxyProtocolNeed = 0;
}
}
else if (status == ProxyProtocolResult::Error) {
Expand Down
119 changes: 111 additions & 8 deletions regression-tests.dnsdist/test_ProxyProtocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ class TestProxyProtocol(ProxyProtocolTest):
addAction("values-action.proxy.tests.powerdns.com.", SetProxyProtocolValuesAction({ ["1"]="dnsdist", ["255"]="proxy-protocol"}))
"""
_config_params = ['_proxyResponderPort']
_verboseMode = True

def testProxyUDP(self):
"""
Expand Down Expand Up @@ -379,6 +378,8 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
_config_template = """
addDOHLocal("127.0.0.1:%d", "%s", "%s", {"/"}, {library='nghttp2', proxyProtocolOutsideTLS=true})
addDOHLocal("127.0.0.1:%d", "%s", "%s", {"/"}, {library='nghttp2', proxyProtocolOutsideTLS=false})
addTLSLocal("127.0.0.1:%d", "%s", "%s", {proxyProtocolOutsideTLS=true})
addTLSLocal("127.0.0.1:%d", "%s", "%s", {proxyProtocolOutsideTLS=false})
setProxyProtocolACL( { "127.0.0.1/32" } )
newServer{address="127.0.0.1:%d", useProxyProtocol=true, proxyProtocolAdvertiseTLS=true}

Expand Down Expand Up @@ -421,7 +422,9 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
_caCert = 'ca.pem'
_dohServerPPOutsidePort = pickAvailablePort()
_dohServerPPInsidePort = pickAvailablePort()
_config_params = ['_dohServerPPOutsidePort', '_serverCert', '_serverKey', '_dohServerPPInsidePort', '_serverCert', '_serverKey', '_proxyResponderPort']
_dotServerPPOutsidePort = pickAvailablePort()
_dotServerPPInsidePort = pickAvailablePort()
_config_params = ['_dohServerPPOutsidePort', '_serverCert', '_serverKey', '_dohServerPPInsidePort', '_serverCert', '_serverKey', '_dotServerPPOutsidePort', '_serverCert', '_serverKey', '_dotServerPPInsidePort', '_serverCert', '_serverKey', '_proxyResponderPort']

def testNoHeader(self):
"""
Expand Down Expand Up @@ -666,7 +669,7 @@ def testProxyDoHSeveralQueriesOverConnectionPPOutside(self):
conn = self.openDOHConnection(reverseProxyPort, self._caCert, timeout=2.0)

reverseProxyBaseURL = ("https://%s:%d/" % (self._serverName, reverseProxyPort))
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, useQueue=True, conn=conn)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, conn=conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
Expand All @@ -682,7 +685,7 @@ def testProxyDoHSeveralQueriesOverConnectionPPOutside(self):
for idx in range(5):
receivedResponse = None
toProxyQueue.put(response, True, 2.0)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, useQueue=True, conn=conn)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, conn=conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
Expand Down Expand Up @@ -719,7 +722,7 @@ def testProxyDoHSeveralQueriesOverConnectionPPInside(self):
conn = self.openDOHConnection(reverseProxyPort, self._caCert, timeout=2.0)

reverseProxyBaseURL = ("https://%s:%d/" % (self._serverName, reverseProxyPort))
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, useQueue=True, conn=conn)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, conn=conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
Expand All @@ -735,7 +738,7 @@ def testProxyDoHSeveralQueriesOverConnectionPPInside(self):
for idx in range(5):
receivedResponse = None
toProxyQueue.put(response, True, 2.0)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, useQueue=True, conn=conn)
(receivedQuery, receivedResponse) = self.sendDOHQuery(reverseProxyPort, self._serverName, reverseProxyBaseURL, query, response=response, caFile=self._caCert, conn=conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
Expand All @@ -748,6 +751,108 @@ def testProxyDoHSeveralQueriesOverConnectionPPInside(self):
self.assertEqual(receivedResponse, response)
self.checkMessageProxyProtocol(receivedProxyPayload, '127.0.0.1', '127.0.0.1', True, [ [0, b'foo'], [1, b'dnsdist'], [ 2, b'foo'], [3, b'proxy'], [32, ''], [ 42, b'bar'], [255, b'proxy-protocol'] ], v6=False, sourcePort=None, destinationPort=reverseProxyPort)

def testProxyDoTSeveralQueriesOverConnectionPPOutside(self):
"""
Incoming Proxy Protocol: Several queries over the same connection (DoT, PP outside TLS)
"""
name = 'several-queries.dot-outside.proxy-protocol-incoming.tests.powerdns.com.'
query = dns.message.make_query(name, 'A', 'IN')
response = dns.message.make_response(query)

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()
time.sleep(1)

receivedResponse = None
conn = self.openTLSConnection(reverseProxyPort, self._serverName, self._caCert, timeout=2.0)
self.sendTCPQueryOverConnection(conn, query, response=response)
receivedResponse = self.recvTCPResponseOverConnection(conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
self.assertTrue(receivedResponse)

receivedQuery = dns.message.from_wire(receivedDNSData)
receivedQuery.id = query.id
receivedResponse.id = response.id
self.assertEqual(receivedQuery, query)
self.assertEqual(receivedResponse, response)
self.checkMessageProxyProtocol(receivedProxyPayload, '127.0.0.1', '127.0.0.1', True, [ [0, b'foo'], [1, b'dnsdist'], [ 2, b'foo'], [3, b'proxy'], [32, ''], [42, b'bar'], [255, b'proxy-protocol'] ], v6=False, sourcePort=None, destinationPort=reverseProxyPort)

for idx in range(5):
receivedResponse = None
toProxyQueue.put(response, True, 2.0)
self.sendTCPQueryOverConnection(conn, query, response=response)
receivedResponse = self.recvTCPResponseOverConnection(conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
self.assertTrue(receivedResponse)

receivedQuery = dns.message.from_wire(receivedDNSData)
receivedQuery.id = query.id
receivedResponse.id = response.id
self.assertEqual(receivedQuery, query)
self.assertEqual(receivedResponse, response)
self.checkMessageProxyProtocol(receivedProxyPayload, '127.0.0.1', '127.0.0.1', True, [ [0, b'foo'], [1, b'dnsdist'], [ 2, b'foo'], [3, b'proxy'], [32, ''], [42, b'bar'], [255, b'proxy-protocol'] ], v6=False, sourcePort=None, destinationPort=reverseProxyPort)

def testProxyDoTSeveralQueriesOverConnectionPPInside(self):
"""
Incoming Proxy Protocol: Several queries over the same connection (DoT, PP inside TLS)
"""
name = 'several-queries.dot-inside.proxy-protocol-incoming.tests.powerdns.com.'
query = dns.message.make_query(name, 'A', 'IN')
response = dns.message.make_response(query)

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)
tlsContext.set_alpn_protocols(['dot'])
reverseProxy = threading.Thread(name='Mock Proxy Protocol Reverse Proxy', target=MockTCPReverseProxyAddingProxyProtocol, args=[reverseProxyPort, self._dotServerPPInsidePort, tlsContext, self._caCert, self._serverName])
reverseProxy.start()

receivedResponse = None
time.sleep(1)
conn = self.openTLSConnection(reverseProxyPort, self._serverName, self._caCert, timeout=2.0)

self.sendTCPQueryOverConnection(conn, query, response=response)
receivedResponse = self.recvTCPResponseOverConnection(conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
self.assertTrue(receivedResponse)

receivedQuery = dns.message.from_wire(receivedDNSData)
receivedQuery.id = query.id
receivedResponse.id = response.id
self.assertEqual(receivedQuery, query)
self.assertEqual(receivedResponse, response)

for idx in range(5):
receivedResponse = None
toProxyQueue.put(response, True, 2.0)
self.sendTCPQueryOverConnection(conn, query, response=response)
receivedResponse = self.recvTCPResponseOverConnection(conn)
(receivedProxyPayload, receivedDNSData) = fromProxyQueue.get(True, 2.0)
self.assertTrue(receivedProxyPayload)
self.assertTrue(receivedDNSData)
self.assertTrue(receivedResponse)

receivedQuery = dns.message.from_wire(receivedDNSData)
receivedQuery.id = query.id
receivedResponse.id = response.id
self.assertEqual(receivedQuery, query)
self.assertEqual(receivedResponse, response)

@classmethod
def tearDownClass(cls):
cls._sock.close()
Expand All @@ -768,7 +873,6 @@ class TestProxyProtocolNotExpected(DNSDistTest):
"""
# NORMAL responder, does not expect a proxy protocol payload!
_config_params = ['_testServerPort']
_verboseMode = True

def testNoHeader(self):
"""
Expand Down Expand Up @@ -910,7 +1014,6 @@ class TestDOHWithOutgoingProxyProtocol(DNSDistDOHTest):
setACL( { "::1/128", "127.0.0.0/8" } )
"""
_config_params = ['_proxyResponderPort', '_dohWithNGHTTP2ServerPort', '_serverCert', '_serverKey', '_dohWithH2OServerPort', '_serverCert', '_serverKey']
_verboseMode = True

def testTruncation(self):
"""
Expand Down
Loading