Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-22 23:54:35 -04:00
Code Issues Projects Releases Packages Wiki Activity

Split out setting up the manhole to a separate file

Browse source
This commit is contained in:
Mark Haines 2016-04-22 17:08:02 +01:00
parent 62607d5452
commit 5905f36f05
2 changed files with 57 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
synapse/app/homeserver.py
View file

@ -32,13 +32,6 @@ from synapse.storage.prepare_database import UpgradeDatabaseException, prepare_d
from synapse.server import HomeServer
from twisted.conch.manhole import ColoredManhole
from twisted.conch.insults import insults
from twisted.conch import manhole_ssh
from twisted.cred import checkers, portal
from twisted.internet import reactor, task, defer
from twisted.application import service
from twisted.web.resource import Resource, EncodingResourceWrapper
@ -64,6 +57,7 @@ from synapse.federation.transport.server import TransportLayerServer
from synapse.util.rlimit import change_resource_limit
from synapse.util.versionstring import get_version_string
from synapse.util.httpresourcetree import create_resource_tree
from synapse.util.manhole import listen_manhole
from synapse.http.site import SynapseSite
@ -209,25 +203,12 @@ class SynapseHomeServer(HomeServer):
if listener["type"] == "http":
self._listener_http(config, listener)
elif listener["type"] == "manhole":
checker = checkers.InMemoryUsernamePasswordDatabaseDontUse(
matrix="rabbithole"
)
rlm = manhole_ssh.TerminalRealm()
rlm.chainedProtocolFactory = lambda: insults.ServerProtocol(
ColoredManhole,
{
"__name__": "__console__",
"hs": self,
}
)
f = manhole_ssh.ConchFactory(portal.Portal(rlm, [checker]))
reactor.listenTCP(
listener["port"],
f,
interface=listener.get("bind_address", '127.0.0.1')
listen_manhole(
bind_address=listener.get("bind_address", '127.0.0.1'),
bind_port=listener["port"],
username="matrix",
password="rabbithole",
globals={"hs": self},
)
else:
logger.warn("Unrecognized listener type: %s", listener["type"])