2
0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 11:01:09 +00:00

Add IPv6 support

Python defaults to IPv4-only, but IPv6 is cooler
This commit is contained in:
Jarrod Johnson 2014-05-19 15:41:38 -04:00
parent 51442e0180
commit 950ca5e4c9
2 changed files with 3 additions and 3 deletions

View File

@ -121,10 +121,10 @@ class Command(object):
ssl_version=ssl.PROTOCOL_TLSv1)
if knownhosts:
certdata = self.connection.getpeercert(binary_form=True)
fingerprint = 'sha512$' + hashlib.sha512(certdata).hexdigest()
hostid = '@'.join((port,server))
khf = dbm.open(os.path.join(clientcfgdir, "knownhosts"), 'c', 384)
if hostid in khf:
fingerprint = 'sha512$' + hashlib.sha512(certdata).hexdigest()
if fingerprint == khf[hostid]:
return
else:

View File

@ -194,14 +194,14 @@ def process_request(connection, request, cfm, authdata, authname, skipauth):
def _tlshandler():
plainsocket = socket.socket()
plainsocket = socket.socket(AF_INET6)
plainsocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
plainsocket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
srv = ssl.wrap_socket(plainsocket, keyfile="/etc/confluent/privkey.pem",
certfile="/etc/confluent/srvcert.pem",
ssl_version=ssl.PROTOCOL_TLSv1,
server_side=True)
srv.bind(('0.0.0.0', 13001))
srv.bind(('::', 13001, 0, 0))
srv.listen(5)
authname = None
while (1): # TODO: exithook