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

Cosmetic changes

Browse Source
This commit is contained in:
Guillaume Ayoub 2014-10-21 13:13:16 +02:00
parent 4e59d734a1
commit 2cf34a0d67
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
radicale/__init__.py
View File

@ -56,7 +56,6 @@ VERSION = "0.9"
# Standard "not allowed" response that is returned when an authenticated user # Standard "not allowed" response that is returned when an authenticated user
# tries to access information they don't have rights to # tries to access information they don't have rights to
NOT_ALLOWED = (client.FORBIDDEN, {}, None) NOT_ALLOWED = (client.FORBIDDEN, {}, None)
WELLKNOWNRE = re.compile(r'/.well-known/(carddav|caldav)/?')
class HTTPServer(wsgiref.simple_server.WSGIServer, object): class HTTPServer(wsgiref.simple_server.WSGIServer, object):
@ -100,9 +99,8 @@ class HTTPSServer(HTTPServer):
server_side=True, server_side=True,
certfile=config.get("server", "certificate"), certfile=config.get("server", "certificate"),
keyfile=config.get("server", "key"), keyfile=config.get("server", "key"),
ssl_version=getattr(ssl, config.get("server", "protocol"), ssl_version=getattr(
ssl.PROTOCOL_SSLv23) ssl, config.get("server", "protocol"), ssl.PROTOCOL_SSLv23))
)
# add ciphers argument only if supported (Python 2.7+) # add ciphers argument only if supported (Python 2.7+)
if sys.version_info >= (2, 7): if sys.version_info >= (2, 7):
ssl_kwargs["ciphers"] = config.get("server", "ciphers") or None ssl_kwargs["ciphers"] = config.get("server", "ciphers") or None
@ -279,22 +277,24 @@ class Application(object):
user = environ.get("REMOTE_USER") user = environ.get("REMOTE_USER")
password = None password = None
wkfragment = WELLKNOWNRE.match(path) well_known = re.compile(r"/.well-known/(carddav|caldav)/?").match(path)
if wkfragment: if well_known:
if not user: del user redirect = config.get("well-known", well_known.group(1))
redirect = config.get("well-known", wkfragment.group(1))
try: try:
redirect = redirect % locals() redirect = redirect % ({"user": user} if user else {})
status = client.SEE_OTHER
log.LOGGER.info("/.well-known/ redirection to: %s" % redirect)
headers = {"Location": redirect.encode('utf8')}
except KeyError: except KeyError:
status = client.UNAUTHORIZED status = client.UNAUTHORIZED
headers = { headers = {
"WWW-Authenticate": "WWW-Authenticate":
"Basic realm=\"%s\"" % config.get("server", "realm")} "Basic realm=\"%s\"" % config.get("server", "realm")}
log.LOGGER.info("refused /.well-known/ redirection to anonymous user") log.LOGGER.info(
status = "%i %s" % (status, client.responses.get(status, "Unknown")) "Refused /.well-known/ redirection to anonymous user")
else:
status = client.SEE_OTHER
log.LOGGER.info("/.well-known/ redirection to: %s" % redirect)
headers = {"Location": redirect.encode("utf8")}
status = "%i %s" % (
status, client.responses.get(status, "Unknown"))
start_response(status, headers.items()) start_response(status, headers.items())
return [] return []