Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed a IPv6 restriction in portal, based on input from user 'jayvee' in chat.

Browse source
This commit is contained in:
Griatch 2013-12-11 13:56:16 +01:00
parent f1e156a299
commit 7c90c3234c
2 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/server/portal/portal.py
View file

@ -175,11 +175,8 @@ if TELNET_ENABLED:
from src.server.portal import telnet from src.server.portal import telnet
for interface in TELNET_INTERFACES: for interface in TELNET_INTERFACES:
if ":" in interface:
print " iPv6 interfaces not yet supported"
continue
ifacestr = "" ifacestr = ""
if interface != '0.0.0.0' or len(TELNET_INTERFACES) > 1: if interface not in ('0.0.0.0', '::') or len(TELNET_INTERFACES) > 1:
ifacestr = "-%s" % interface ifacestr = "-%s" % interface
for port in TELNET_PORTS: for port in TELNET_PORTS:
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
@ -199,11 +196,8 @@ if SSL_ENABLED:
from src.server.portal import ssl from src.server.portal import ssl
for interface in SSL_INTERFACES: for interface in SSL_INTERFACES:
if ":" in interface:
print " iPv6 interfaces not yet supported"
continue
ifacestr = "" ifacestr = ""
if interface != '0.0.0.0' or len(SSL_INTERFACES) > 1: if interface not in ('0.0.0.0', '::') or len(SSL_INTERFACES) > 1:
ifacestr = "-%s" % interface ifacestr = "-%s" % interface
for port in SSL_PORTS: for port in SSL_PORTS:
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
@ -228,11 +222,8 @@ if SSH_ENABLED:
from src.server.portal import ssh from src.server.portal import ssh
for interface in SSH_INTERFACES: for interface in SSH_INTERFACES:
if ":" in interface:
print " iPv6 interfaces not yet supported"
continue
ifacestr = "" ifacestr = ""
if interface != '0.0.0.0' or len(SSH_INTERFACES) > 1: if interface not in ('0.0.0.0', '::') or len(SSH_INTERFACES) > 1:
ifacestr = "-%s" % interface ifacestr = "-%s" % interface
for port in SSH_PORTS: for port in SSH_PORTS:
pstring = "%s:%s" % (ifacestr, port) pstring = "%s:%s" % (ifacestr, port)
@ -250,11 +241,8 @@ if WEBSERVER_ENABLED:
# Start a reverse proxy to relay data to the Server-side webserver # Start a reverse proxy to relay data to the Server-side webserver
for interface in WEBSERVER_INTERFACES: for interface in WEBSERVER_INTERFACES:
if ":" in interface:
print " iPv6 interfaces not yet supported"
continue
ifacestr = "" ifacestr = ""
if interface != '0.0.0.0' or len(WEBSERVER_INTERFACES) > 1: if interface not in ('0.0.0.0', '::') or len(WEBSERVER_INTERFACES) > 1:
ifacestr = "-%s" % interface ifacestr = "-%s" % interface
for proxyport, serverport in WEBSERVER_PORTS: for proxyport, serverport in WEBSERVER_PORTS:
pstring = "%s:%s<->%s" % (ifacestr, proxyport, serverport) pstring = "%s:%s<->%s" % (ifacestr, proxyport, serverport)

8
src/settings_default.py
View file

@ -26,7 +26,7 @@ TELNET_ENABLED = True
# A list of ports the Evennia telnet server listens on # A list of ports the Evennia telnet server listens on
# Can be one or many. # Can be one or many.
TELNET_PORTS = [4000] TELNET_PORTS = [4000]
# Interface addresses to listen to. If 0.0.0.0, listen to all. # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
TELNET_INTERFACES = ['0.0.0.0'] TELNET_INTERFACES = ['0.0.0.0']
# OOB (out-of-band) telnet communication allows Evennia to communicate # OOB (out-of-band) telnet communication allows Evennia to communicate
# special commands and data with enabled Telnet clients. This is used # special commands and data with enabled Telnet clients. This is used
@ -50,7 +50,7 @@ ALLOWED_HOSTS = ["*"]
# the internal ports the proxy uses to forward data to the Server-side # the internal ports the proxy uses to forward data to the Server-side
# webserver (these should not be publicly open) # webserver (these should not be publicly open)
WEBSERVER_PORTS = [(8000, 5001)] WEBSERVER_PORTS = [(8000, 5001)]
# Interface addresses to listen to. If 0.0.0.0, listen to all. # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
WEBSERVER_INTERFACES = ['0.0.0.0'] WEBSERVER_INTERFACES = ['0.0.0.0']
# IP addresses that may talk to the server in a reverse proxy configuration, # IP addresses that may talk to the server in a reverse proxy configuration,
# like NginX. # like NginX.
@ -66,13 +66,13 @@ WEBCLIENT_ENABLED = True
SSH_ENABLED = False SSH_ENABLED = False
# Ports to use for SSH # Ports to use for SSH
SSH_PORTS = [8022] SSH_PORTS = [8022]
# Interface addresses to listen to. If 0.0.0.0, listen to all. # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
SSH_INTERFACES = ['0.0.0.0'] SSH_INTERFACES = ['0.0.0.0']
# Actiave SSL protocol (SecureSocketLibrary) # Actiave SSL protocol (SecureSocketLibrary)
SSL_ENABLED = False SSL_ENABLED = False
# Ports to use for SSL # Ports to use for SSL
SSL_PORTS = [4001] SSL_PORTS = [4001]
# Interface addresses to listen to. If 0.0.0.0, listen to all. # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
SSL_INTERFACES = ['0.0.0.0'] SSL_INTERFACES = ['0.0.0.0']
# The path that contains this settings.py file (no trailing slash). # The path that contains this settings.py file (no trailing slash).
BASE_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))