6e85c54a2e
Keep Isso modular, not monolithic. Make it easy to integrate a web interface or add XMPP notifications. This refactorization includes minor bugfixes and changes: * CORS middleware did not work properly due to wrong unit tests * more type checks on JSON input * new detection for origin and public url, closes #28 * new activation and delete url (no redirect for old urls, but you can convert the old urls: copy hash after `/activate/` (or delete) and open `/id/<id of comment>/activate/<hash>` * move crypto.py to utils/ With this commit, SMTP is no longer automatically configured: add `notify = smtp` to the `[general]` section to use SMTP.
73 lines
2.2 KiB
Python
73 lines
2.2 KiB
Python
# -*- encoding: utf-8 -*-
|
|
|
|
try:
|
|
from urllib import quote
|
|
except ImportError:
|
|
from urllib.parse import quote
|
|
|
|
from werkzeug.datastructures import Headers
|
|
|
|
|
|
def host(environ):
|
|
"""
|
|
Reconstruct host from environment. A modified version
|
|
of http://www.python.org/dev/peps/pep-0333/#url-reconstruction
|
|
"""
|
|
|
|
url = environ['wsgi.url_scheme']+'://'
|
|
|
|
if environ.get('HTTP_HOST'):
|
|
url += environ['HTTP_HOST']
|
|
else:
|
|
url += environ['SERVER_NAME']
|
|
|
|
if environ['wsgi.url_scheme'] == 'https':
|
|
if environ['SERVER_PORT'] != '443':
|
|
url += ':' + environ['SERVER_PORT']
|
|
else:
|
|
if environ['SERVER_PORT'] != '80':
|
|
url += ':' + environ['SERVER_PORT']
|
|
|
|
return url + quote(environ.get('SCRIPT_NAME', ''))
|
|
|
|
|
|
class SubURI(object):
|
|
|
|
def __init__(self, app):
|
|
self.app = app
|
|
|
|
def __call__(self, environ, start_response):
|
|
|
|
script_name = environ.get('HTTP_X_SCRIPT_NAME')
|
|
if script_name:
|
|
environ['SCRIPT_NAME'] = script_name
|
|
path_info = environ['PATH_INFO']
|
|
if path_info.startswith(script_name):
|
|
environ['PATH_INFO'] = path_info[len(script_name):]
|
|
|
|
return self.app(environ, start_response)
|
|
|
|
|
|
class CORSMiddleware(object):
|
|
|
|
def __init__(self, app, origin):
|
|
self.app = app
|
|
self.origin = origin
|
|
|
|
def __call__(self, environ, start_response):
|
|
|
|
def add_cors_headers(status, headers, exc_info=None):
|
|
headers = Headers(headers)
|
|
headers.add("Access-Control-Allow-Origin", self.origin(environ))
|
|
headers.add("Access-Control-Allow-Headers", "Origin, Content-Type")
|
|
headers.add("Access-Control-Allow-Credentials", "true")
|
|
headers.add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE")
|
|
headers.add("Access-Control-Expose-Headers", "X-Set-Cookie")
|
|
return start_response(status, headers.to_list(), exc_info)
|
|
|
|
if environ.get("REQUEST_METHOD") == "OPTIONS":
|
|
add_cors_headers("200 Ok", [("Content-Type", "text/plain")])
|
|
return ['200 Ok']
|
|
|
|
return self.app(environ, add_cors_headers)
|