tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add section for internal configuration

Browse Source
This commit is contained in:
Unrud 2018-08-18 12:56:38 +02:00
parent 59f7104dce
commit 4282ea46e4
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicale/__init__.py
View File

@ -93,7 +93,7 @@ DAV_HEADERS = "1, 2, 3, calendar-access, addressbook, extended-mkcol"
class Application: class Application:
"""WSGI application managing collections.""" """WSGI application managing collections."""
def __init__(self, configuration, internal_server=False): def __init__(self, configuration):
"""Initialize application.""" """Initialize application."""
super().__init__() super().__init__()
self.configuration = configuration self.configuration = configuration
@ -102,7 +102,6 @@ class Application:
self.Rights = rights.load(configuration) self.Rights = rights.load(configuration)
self.Web = web.load(configuration) self.Web = web.load(configuration)
self.encoding = configuration.get("encoding", "request") self.encoding = configuration.get("encoding", "request")
self.internal_server = internal_server
def headers_log(self, environ): def headers_log(self, environ):
"""Sanitize headers for logging.""" """Sanitize headers for logging."""
@ -333,9 +332,10 @@ class Application:
logger.warning("Access to principal path %r denied by " logger.warning("Access to principal path %r denied by "
"rights backend", principal_path) "rights backend", principal_path)
if self.configuration.getboolean("internal", "internal_server"):
# Verify content length # Verify content length
content_length = int(environ.get("CONTENT_LENGTH") or 0) content_length = int(environ.get("CONTENT_LENGTH") or 0)
if self.internal_server and content_length: if content_length:
max_content_length = self.configuration.getint( max_content_length = self.configuration.getint(
"server", "max_content_length") "server", "max_content_length")
if max_content_length and content_length > max_content_length: if max_content_length and content_length > max_content_length:

10
radicale/config.py
View File

@ -187,6 +187,12 @@ INITIAL_CONFIG = OrderedDict([
"value": "True", "value": "True",
"help": "mask passwords in logs", "help": "mask passwords in logs",
"type": bool})]))]) "type": bool})]))])
# Default configuration for "internal" settings
INTERNAL_CONFIG = OrderedDict([
("internal_server", {
"value": "False",
"help": "the internal server is used",
"type": bool})])
def load(paths=(), extra_config=None, ignore_missing_paths=True): def load(paths=(), extra_config=None, ignore_missing_paths=True):
@ -234,4 +240,8 @@ def load(paths=(), extra_config=None, ignore_missing_paths=True):
"Invalid %s value for option %r in section %r in config: " "Invalid %s value for option %r in section %r in config: "
"%r" % (type_.__name__, option, section, "%r" % (type_.__name__, option, section,
config.get(section, option))) from e config.get(section, option))) from e
# Add internal configuration
config.add_section("internal")
for key, data in INTERNAL_CONFIG.items():
config.set("internal", key, data["value"])
return config return config

3
radicale/server.py
View File

@ -192,6 +192,7 @@ class RequestHandler(wsgiref.simple_server.WSGIRequestHandler):
def serve(configuration): def serve(configuration):
"""Serve radicale from configuration.""" """Serve radicale from configuration."""
logger.info("Starting Radicale") logger.info("Starting Radicale")
configuration["internal"]["internal_server"] = "True"
# Create collection servers # Create collection servers
servers = {} servers = {}
@ -232,7 +233,7 @@ def serve(configuration):
except ValueError as e: except ValueError as e:
raise RuntimeError( raise RuntimeError(
"Failed to parse address %r: %s" % (host, e)) from e "Failed to parse address %r: %s" % (host, e)) from e
application = Application(configuration, internal_server=True) application = Application(configuration)
try: try:
server = wsgiref.simple_server.make_server( server = wsgiref.simple_server.make_server(
address, port, application, server_class, RequestHandler) address, port, application, server_class, RequestHandler)