Cleaned out SSL debug data. Tested with tinyfugue version 5 beta 8, using /connect -x flag to connect with SSL support.
This commit is contained in:
parent
2dbae4d8a9
commit
a3e198e857
1 changed files with 6 additions and 25 deletions
|
|
@ -11,7 +11,12 @@ try:
|
||||||
import OpenSSL
|
import OpenSSL
|
||||||
from twisted.internet import ssl as twisted_ssl
|
from twisted.internet import ssl as twisted_ssl
|
||||||
except ImportError as err:
|
except ImportError as err:
|
||||||
raise ImportError("SSL_ENABLED requires PyOpenSSL.")
|
errstr = """
|
||||||
|
{err}
|
||||||
|
SSL requires the PyOpenSSL library:
|
||||||
|
pip install pyopenssl
|
||||||
|
"""
|
||||||
|
raise ImportError(errstr.format(err=err))
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from evennia.server.portal.telnet import TelnetProtocol
|
from evennia.server.portal.telnet import TelnetProtocol
|
||||||
|
|
@ -49,30 +54,6 @@ class SSLProtocol(TelnetProtocol):
|
||||||
super(TelnetProtocol, self).__init__(*args, **kwargs)
|
super(TelnetProtocol, self).__init__(*args, **kwargs)
|
||||||
self.protocol_name = "ssl"
|
self.protocol_name = "ssl"
|
||||||
|
|
||||||
def connectionMade(self):
|
|
||||||
print ("SSL connectionMade")
|
|
||||||
#self.iaw_mode = False
|
|
||||||
#self.no_lb_mode = False
|
|
||||||
#client_address = self.transport.client
|
|
||||||
#client_address = client_address[0] if client_address else None
|
|
||||||
#self.init_session(self.protocol_name, client_address, self.factory.sessionhandler)
|
|
||||||
#self.sessionhandler.connect(self)
|
|
||||||
|
|
||||||
super(SSLProtocol, self).connectionMade()
|
|
||||||
|
|
||||||
def connectionLost(self, reason):
|
|
||||||
print ("SSL connectionLost")
|
|
||||||
super(SSLProtocol, self).connectionLost(reason)
|
|
||||||
|
|
||||||
def dataReceived(self, data):
|
|
||||||
print("SSL dataReceived:", data)
|
|
||||||
super(SSLProtocol, self).dataReceived(data)
|
|
||||||
|
|
||||||
def send_text(self, *args, **kwargs):
|
|
||||||
print("SSL send_text:", args, kwargs)
|
|
||||||
super(SSLProtocol, self).send_text(*args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
def verify_SSL_key_and_cert(keyfile, certfile):
|
def verify_SSL_key_and_cert(keyfile, certfile):
|
||||||
"""
|
"""
|
||||||
This function looks for RSA key and certificate in the current
|
This function looks for RSA key and certificate in the current
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue