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

httpserver: Add support for WSGI apps #1521

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

httpserver: Add support for WSGI apps #1521

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffb2e84
httpserver: Add support for WSGI apps
progval Oct 31, 2022
e1b2d8f
Set SERVER_NAME and SERVER_PORT
progval Nov 1, 2022
7486ae2
Fix crash on /pluginname path
progval Nov 1, 2022
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
64 changes: 48 additions & 16 deletions src/httpserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
import os
import cgi
import socket
import sys
from threading import Thread
from wsgiref.handlers import BaseHandler, SimpleHandler
from wsgiref.simple_server import WSGIRequestHandler

import supybot.log as log
import supybot.conf as conf
Expand Down Expand Up @@ -181,6 +184,20 @@ def do_X(self, callbackMethod, *args, **kwargs):
except KeyError:
callback = Supy404()

if not isinstance(callback, SupyHTTPServerCallback):
# WSGI-based callback
environ = WSGIRequestHandler.get_environ(self)
environ.update({
'PATH_INFO': '/' + (environ['PATH_INFO'].split('/', 2) + [''])[2]
})
SimpleHandler(
stdin=self.rfile, stdout=self.wfile, stderr=sys.stderr, environ=environ,
multithread=False
).run(callback)
return

# BaseHTTPRequestHandler-based callback

# Some shortcuts
for name in ('send_response', 'send_header', 'end_headers', 'rfile',
'wfile', 'headers'):
Expand All @@ -189,26 +206,30 @@ def do_X(self, callbackMethod, *args, **kwargs):
path = self.path
if not callback.fullpath:
path = '/' + path.split('/', 2)[-1]

if callback == 'doPost':
if 'Content-Type' not in self.headers:
self.headers['Content-Type'] = 'application/x-www-form-urlencoded'
if self.headers['Content-Type'] == 'application/x-www-form-urlencoded':
form = cgi.FieldStorage(
fp=self.rfile,
headers=self.headers,
environ={'REQUEST_METHOD':'POST',
'CONTENT_TYPE':self.headers['Content-Type'],
})
else:
content_length = int(self.headers.get('Content-Length', '0'))
form = self.rfile.read(content_length)
kwargs['form'] = form

getattr(callback, callbackMethod)(self, path,
*args, **kwargs)

def do_GET(self):
self.do_X('doGet')

def do_POST(self):
if 'Content-Type' not in self.headers:
self.headers['Content-Type'] = 'application/x-www-form-urlencoded'
if self.headers['Content-Type'] == 'application/x-www-form-urlencoded':
form = cgi.FieldStorage(
fp=self.rfile,
headers=self.headers,
environ={'REQUEST_METHOD':'POST',
'CONTENT_TYPE':self.headers['Content-Type'],
})
else:
content_length = int(self.headers.get('Content-Length', '0'))
form = self.rfile.read(content_length)
self.do_X('doPost', form=form)
self.do_X('doPost')

def do_HEAD(self):
self.do_X('doHead')
Expand Down Expand Up @@ -312,7 +333,7 @@ def doGetOrHead(self, handler, path, write_content):
plugins = [
(name, cb)
for (name, cb) in handler.server.callbacks.items()
if cb.public]
if getattr(cb, 'public', True)]
if plugins == []:
plugins = _('No plugins available.')
else:
Expand Down Expand Up @@ -425,7 +446,15 @@ def __init__(self, address, protocol, callback):
self.address_family = socket.AF_INET6
else:
raise AssertionError(protocol)

HTTPServer.__init__(self, address, callback)

host, port = self.server_address[:2]
self.base_environ = {
'SERVER_NAME': socket.getfqdn(host),
'SERVER_PORT': str(port),
}

self.callbacks = DEFAULT_CALLBACKS.copy()

def server_bind(self):
Expand All @@ -441,17 +470,20 @@ def hook(self, subdir, callback):
'reloaded the plugin and it didn\'t properly unhook. '
'Forced unhook.') % subdir)
self.callbacks[subdir] = callback
callback.doHook(self, subdir)
if hasattr(callback, 'doHook'):
callback.doHook(self, subdir)
def unhook(self, subdir):
callback = self.callbacks.pop(subdir, None)
if callback:
if callback and hasattr(callback, 'doUnhook'):
callback.doUnhook(self)
return callback

def __str__(self):
return 'server at %s %i' % self.server_address[0:2]

class TestSupyHTTPServer(RealSupyHTTPServer):
base_environ = {}

def __init__(self, *args, **kwargs):
self.callbacks = {}
self.server_address = ("0.0.0.0", 0)
Expand Down