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

Merge branch 'apache_auth' of git://github.com/jaesivsm/Radicale into jaesivsm-apache_auth

Browse Source 
Conflicts:
	radicale/__init__.py
This commit is contained in:
Guillaume Ayoub 2014-02-05 13:09:37 +01:00
commit 2ad8b57305
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config
View File

@ -3,7 +3,7 @@
# Config file for Radicale - A simple calendar server # Config file for Radicale - A simple calendar server
# #
# Place it into /etc/radicale/config (global) # Place it into /etc/radicale/config (global)
# or ~/.config/radicale/config (user) # or ~/.config/radicale/config (user)
# #
# The current values are the default ones # The current values are the default ones
@ -47,7 +47,7 @@ stock = utf-8
[auth] [auth]
# Authentication method # Authentication method
# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | custom # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | remote_user | custom
type = None type = None
# custom auth handler # custom auth handler
@ -69,7 +69,7 @@ ldap_attribute = uid
# placed as X in a query of the form (&(...)X) # placed as X in a query of the form (&(...)X)
# example: (objectCategory=Person)(objectClass=User)(memberOf=cn=calenderusers,ou=users,dc=example,dc=org) # example: (objectCategory=Person)(objectClass=User)(memberOf=cn=calenderusers,ou=users,dc=example,dc=org)
# leave empty if no additional filter is needed # leave empty if no additional filter is needed
ldap_filter = ldap_filter =
# LDAP dn for initial login, used if LDAP server does not allow anonymous searches # LDAP dn for initial login, used if LDAP server does not allow anonymous searches
# Leave empty if searches are anonymous # Leave empty if searches are anonymous
ldap_binddn = ldap_binddn =

31
radicale/auth/remote_user.py Normal file
View File

@ -0,0 +1,31 @@
# -*- coding: utf-8 -*-
#
# This file is part of Radicale Server - Calendar Server
# Copyright © 2012 Ehsanul Hoque
# Copyright © 2013 Guillaume Ayoub
#
# This library is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Radicale. If not, see <http://www.gnu.org/licenses/>.
"""
Trusting the HTTP server auth mechanism.
"""
from .. import log
def is_authenticated(user, password):
"""Check if ``user`` is defined and assuming it's valid."""
log.LOGGER.debug("Got user %r from HTTP server." % user)
return user is not None