contrib/apache,caddy: extend URI for no-auth

This commit is contained in:
Peter Bieringer
2026-03-22 21:28:55 +01:00
parent 45a6990352
commit 62a8189917
2 changed files with 13 additions and 13 deletions

View File

@@ -50,8 +50,8 @@
RewriteCond %{REQUEST_METHOD} GET RewriteCond %{REQUEST_METHOD} GET
RewriteRule ^/radicale/$ /radicale/.web/ [R,L] RewriteRule ^/radicale/$ /radicale/.web/ [R,L]
<LocationMatch "^/radicale/\.web.*> <LocationMatch "^/radicale/\.(web|token).*>
# Internal WebUI does not need authentication at all # Internal WebUI or Token does not need authentication at all
RequestHeader set X-Script-Name /radicale RequestHeader set X-Script-Name /radicale
RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s" RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s"
@@ -69,7 +69,7 @@
</IfDefine> </IfDefine>
</LocationMatch> </LocationMatch>
<LocationMatch "^/radicale(?!/\.web)"> <LocationMatch "^/radicale(?!/\.(web|token))">
RequestHeader set X-Script-Name /radicale RequestHeader set X-Script-Name /radicale
RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s" RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s"
@@ -133,8 +133,8 @@
WSGIScriptAlias /radicale /usr/share/radicale/radicale.wsgi WSGIScriptAlias /radicale /usr/share/radicale/radicale.wsgi
# Internal WebUI does not need authentication at all # Internal WebUI or Token does not need authentication at all
<LocationMatch "^/radicale/\.web.*> <LocationMatch "^/radicale/\.(web|token).*>
RequestHeader set X-Script-Name /radicale RequestHeader set X-Script-Name /radicale
Require local Require local
@@ -143,7 +143,7 @@
</IfDefine> </IfDefine>
</LocationMatch> </LocationMatch>
<LocationMatch "^/radicale(?!/\.web)"> <LocationMatch "^/radicale(?!/\.(web|token))">
RequestHeader set X-Script-Name /radicale RequestHeader set X-Script-Name /radicale
<IfDefine !RADICALE_SERVER_USER_AUTHENTICATION> <IfDefine !RADICALE_SERVER_USER_AUTHENTICATION>
@@ -221,7 +221,7 @@ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
RewriteCond %{REQUEST_METHOD} GET RewriteCond %{REQUEST_METHOD} GET
RewriteRule ^/$ /.web/ [R,L] RewriteRule ^/$ /.web/ [R,L]
<LocationMatch "^/\.web.*> <LocationMatch "^/\.(web|token).*>
RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s" RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s"
RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME} RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
@@ -237,7 +237,7 @@ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</IfDefine> </IfDefine>
</LocationMatch> </LocationMatch>
<LocationMatch "^(?!/\.web)"> <LocationMatch "^(?!/\.(web|token))">
RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s" RequestHeader set X-Forwarded-Port "%{SERVER_PORT}s"
RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME} RequestHeader set X-Forwarded-Proto expr=%{REQUEST_SCHEME}
@@ -292,7 +292,7 @@ CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
WSGIScriptAlias / /usr/share/radicale/radicale.wsgi WSGIScriptAlias / /usr/share/radicale/radicale.wsgi
<LocationMatch "^/(?!/\.web)"> <LocationMatch "^/(?!/\.(web|token))">
<IfDefine !RADICALE_SERVER_USER_AUTHENTICATION> <IfDefine !RADICALE_SERVER_USER_AUTHENTICATION>
## User authentication handled by "radicale" ## User authentication handled by "radicale"
Require local Require local

View File

@@ -11,13 +11,13 @@ caldav.example.com {
redir @get-root /.web/ redir @get-root /.web/
# Do not auth on /.web/* # Do not auth on /.web/* or /.token/*
@not-webui { @not-auth {
not path /.web/* not path /.web/* /.token/*
} }
# disable this in case authentication is handled by Radicale # disable this in case authentication is handled by Radicale
basic_auth @not-webui { basic_auth @not-auth {
USER HASH USER HASH
} }