tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
885 Commits 2 Branches 0 Tags 3 MiB
248fc7e9e3
Commit Graph

633 Commits

Author SHA1 Message Date
Guillaume Ayoub
f112a9b390 Merge pull request #305 from untitaker/database-props 
Don't discard PROPPATCH on empty collections.
 2015-08-28 11:26:10 +02:00
Markus Unterwaditzer
57b1ccdea5 Fix crash on empty values 2015-08-21 20:11:44 +02:00
Markus Unterwaditzer
213cb40480 Don't discard PROPPATCH on empty collections. 2015-08-21 20:08:56 +02:00
Markus Unterwaditzer
d300949fe8 Improve errorhandling in multifilesystem 
If the collection doesn't exist yet, OSError(2, 'No such file or
directory') is raised.

https://travis-ci.org/untitaker/vdirsyncer/jobs/42540595
 2015-08-21 16:17:00 +02:00
Guillaume Ayoub
ce9fd74d98 Merge pull request #260 from deronnax/not_found_instead_of_gone 
change GET response from GONE to NOT FOUND when item is not found
 2015-08-21 15:34:59 +02:00
Stephen Paul Weber
2de4f53fc3 Use PAM service 
This allows authentication types to be customised for radicale.
 2015-08-11 16:46:46 -05:00
Guillaume Ayoub
b4438d25f7 Cosmetics in htpasswd 2015-07-29 14:00:49 +02:00
Jan-Philip Gehrcke
3abbdcf671 htpasswd.py: add optional MD5-APR1 and BCRYPT support via passlib. 
- Update docstring for optional MD5-APR1/BCRYPT support via passlib.
- Support the "md5" and "bcrypt" htpasswd_encryption config values.
- Conditionally import the required passlib components if either
  "md5" or "bcrypt" is requested in the configuration file.
- Test bcrypt backend availability upon import.
- First define verification functions, then conditionally import
  external dependencies.
- Consolidate: use context manager for reading credential file.
- Consolidate: save one call to strip() while parsing.
- Consolidate: break long lines, clarify comments and docstrings.
- Consolidate: use verification function mapping for improving maintainability.
 2015-07-29 13:12:18 +02:00
Guillaume Ayoub
22a356bd06 Merge branch 'master' of github.com:Kozea/radicale 2015-07-24 16:01:38 +02:00
Guillaume Ayoub
8604593512 Fix many tests and database storage 2015-07-24 16:01:03 +02:00
Hadley Rich
54d71355d1 Change xmlutils propfind to return readonly calendars 2015-06-04 11:23:01 +12:00
Liam
ba5d38d09b Fix typo 2015-05-15 13:47:44 +01:00
Matthew Monaco
bf96d4a1fa Use path for git commit message 
The hard-coded message isn't very helpful, and that info is shown by the
author when looking at single line logs.
 2015-05-04 13:33:52 -06:00
Guillaume Ayoub
ced7e76ba0 Small style fixes 2015-05-01 10:31:25 +02:00
Guillaume Ayoub
675f9d1f87 Merge pull request #255 from jspricke/fix_FutureWarning 
Fix FutureWarning, explicitly test prop_element for None
 2015-05-01 10:22:38 +02:00
Guillaume Ayoub
4cbabd2840 Merge pull request #259 from untitaker/issue258 
Fully fix #258
 2015-04-29 19:13:25 +02:00
Guillaume Ayoub
c249e080af Merge pull request #273 from untitaker/issue117 
Fix another instance of #117
 2015-04-29 19:09:38 +02:00
Guillaume Ayoub
a0fc07a894 Allow content-types with ';' in charset, fix #279 2015-04-29 19:08:20 +02:00
Guillaume Ayoub
e69bec1272 Don't rely on case-sensitive imports, fix #282 
We should burn PEP 235, bicameral scripts, encodings, Python2/3 compatibility,
Windows, MacOS X, filenames, unicode (including composite characters), and the
whole world. And LF/CR too, of course.

Let's recreate a language relying on only two characters. Anyone interested?
 2015-04-29 18:55:56 +02:00
Markus Unterwaditzer
baa958c81f Fix compatibility for PAM auth 
PR #280 invoked `pam.authenticate().authenticate()` for older versions
of python-pam. Also, this version avoids monkeypatching the PAM module.
 2015-04-25 11:14:04 +02:00
Jeremy Archer
dd01087520 Add compatibility patch for .authenticate(). 
Current version of python-pam (https://pypi.python.org/pypi/python-pam/1.8.1) have changed the API slightly; this patch fixes these bugs.
 2015-04-19 22:41:58 -05:00
Markus Unterwaditzer
78e203a2b9 Fix another instance of #117 2015-03-22 12:25:54 +01:00
deronnax
5b8333c2b0 change GET response from GONE to NOT FOUND when item is not found 2015-02-09 11:03:06 +01:00
Markus Unterwaditzer
1126f318af Fully fix #258 
If I do REPORT requests, the following line would raise a KeyError:

    items = [collection.items[name]]

Wrapping it with a try-except block obviously fixes that issue.

At least for REPORT requests, Radicale now also returns proper HTTP
status codes when items or just its properties couldn't be found.
 2015-02-08 17:52:55 +01:00
Guillaume Ayoub
a7700f9805 Don't crash when getting unknown events (fix #258) 2015-02-08 17:11:29 +01:00
Guillaume Ayoub
2c4b335fad Clean the ical API 2015-02-07 17:26:20 +01:00
Guillaume Ayoub
46628b7a19 Add missing blank line 2015-02-07 16:06:41 +01:00
Guillaume Ayoub
99575d69ca Clean some ical methods 2015-02-07 15:39:57 +01:00
deronnax
fbbbaae646 indexed items storage 
Conflicts:
	radicale/storage/filesystem.py
 2015-02-07 14:23:51 +01:00
deronnax
240125aca7 don't pick timezones when asking for contacts 2015-02-07 14:11:43 +01:00
deronnax
0456d166cc simpler and faster unfold function 2015-02-07 14:11:18 +01:00
Jochen Sprickerhof
c43b473c4a Fix FutureWarning, explicitly test prop_element for None 2015-01-23 14:41:41 +01:00
Guillaume Ayoub
727b686089 Merge branch 'master' of github.com:Kozea/radicale 2015-01-12 18:43:07 +01:00
Guillaume Ayoub
7135367640 Version 0.10 2015-01-12 18:40:42 +01:00
Guillaume Ayoub
7772d11565 Merge pull request #202 from muggenhor/less-verbose-imap-ssl-warn 
IMAP: don't spam the logs about non-SSL connections to localhost
 2015-01-12 18:30:43 +01:00
Guillaume Ayoub
abb1de883b Allow PUT requests to change the whole calendar (see #250) 2015-01-05 15:45:24 +01:00
Guillaume Ayoub
6e715912f6 Handle headers other than PRODID and VERSION (fix #250) 2015-01-05 12:32:22 +01:00
Guillaume Ayoub
f2fc02501c Merge pull request #226 from meyerd/master 
Only iterate props in REPORT request if they are there
 2014-12-14 16:50:22 +01:00
Felix Lange
20b1a29149 fix color support 
5f2245c35f introduced an additional alias for the
http://apple.com/ns/ical namespace. this can cause problems.
 2014-11-11 21:26:29 +01:00
Marc Kleine-Budde
13c61bf936 auth/htpasswd: add support for salted sha1 passwords 
This patch adds support for salted sha1 passwords.
 2014-11-09 01:00:23 +01:00
Guillaume Ayoub
ea97c014b7 Don't crash because of missing SIGHUP on Windows 
Fix #229.
 2014-11-03 11:21:12 +01:00
Dominik
b561d1428b only iterate props in REPORT request if they are there 2014-10-25 20:28:50 +02:00
Guillaume Ayoub
c932ba230e Fix Python 3 compatibility 2014-10-22 16:28:08 +02:00
Guillaume Ayoub
33bee79f73 Merge pull request #191 from bouttier/reload-logger-config 
Reload logger config on SIGHUP
 2014-10-22 14:17:23 +02:00
Guillaume Ayoub
1c4c41ad0e Merge pull request #211 from vuntz/delete-multifilesystem 
Remove props file when deleting a collection with multifilesystem
 2014-10-22 14:15:02 +02:00
Guillaume Ayoub
1f9c568720 Don't recreate the regular expression for each request 2014-10-22 11:32:25 +02:00
Guillaume Ayoub
2cf34a0d67 Cosmetic changes 2014-10-21 13:13:16 +02:00
Guillaume Ayoub
4e59d734a1 Merge pull request #225 from deronnax/well-known 
Support "well known" URLs
 2014-10-21 13:03:18 +02:00
deronnax
8ec00f08df throw 401 in case of failed variable substition for .well-known url 2014-10-21 12:30:14 +02:00
deronnax
f846f107e6 now with regex 2014-10-21 11:57:42 +02:00
deronnax
b863e8390e add ".well-known" addresses feature (closes #126) 2014-10-20 18:51:43 +02:00
Guillaume Ayoub
124cf3f51a Merge pull request #224 from deronnax/decode_content_later 
decode http resquest content later
 2014-10-20 17:34:29 +02:00
deronnax
c180b4ace3 decode http resquest content later 2014-10-20 17:32:10 +02:00
Guillaume Ayoub
788b775c32 Merge pull request #198 from untitaker/discovery 
Return user basepath for current-user-principal
 2014-10-17 16:53:45 +02:00
Vincent Untz
71c243035e Remove props file when deleting a collection with multifilesystem 2014-09-18 14:21:10 +02:00
Vincent Untz
873872d541 Do not autocreate .props files for multifilesystem backend 
This is required as we do not want .props files to be created for nodes,
otherwise they'll stop being considered as nodes, which will break
discovery of calendars.

This fixes https://github.com/Kozea/Radicale/issues/208
 2014-09-15 17:42:33 +02:00
Guillaume Ayoub
a6884492a2 Version 0.9 2014-08-13 13:12:19 +02:00
Markus Unterwaditzer
4859436ba8 Return user basepath for current-user-principal 
Fix #196

The way to do collection discovery described in
http://stackoverflow.com/a/11673483 doesn't work well with Radicale:

1. current-user-principal returns /user/calendar.ics/

2. PROPFINDs asking for calendar-home-set will return the URL that was
   used in the request, which is still /user/calendar.ics/

3. The final PROPFIND with Depth: 1 is supposed to list all collections,
   but because the request is done with a collection URL, Radicale returns
   the items for the "calendar.ics" collection which might or might not
   exist.
 2014-08-09 23:01:13 +02:00
Giel van Schijndel
a040c666ca IMAP: don't spam the logs about non-SSL connections to localhost 
When using IMAP as auth module every single request causes a warning to
be logged just because we're not encrypting traffic sent to another
process on the *same* machine.

This change recognizes that while some people might consider this
undesirable, others might have made this a conscious choice and *don't*
wish to be spammed for it. As such now only a single warning is logged
(the first time in the server's lifetime that a user logs in).

Signed-off-by: Giel van Schijndel <me@mortis.eu>
 2014-08-09 22:39:16 +02:00
Guillaume Ayoub
2b4485f6ae Allow requests on root folder for authenticated users 2014-08-07 15:06:48 +02:00
Guillaume Ayoub
77ad16f2a9 Fix the PID number stored on filesystem 2014-08-07 12:31:51 +02:00
Guillaume Ayoub
9ad9c466e2 Add an option allowing requests without base_prefix 
Related to #147, patch proposed by jheidemann
 2014-08-06 11:51:11 +02:00
Guillaume Ayoub
0822f99650 Allow full URLs in href tags for REPORT requests 
Fixes #192
 2014-08-05 15:42:39 +02:00
Élie Bouttier
ab04e38dc8 Reload logger config on SIGHUP 
Particularly useful for logrotate.
 2014-07-28 12:15:08 -07:00
Guillaume Ayoub
a5c5f2494f New version 2014-07-28 13:03:06 +02:00
Guillaume Ayoub
a65f96fe41 Fix syntax error 2014-07-28 11:28:12 +02:00
Guillaume Ayoub
35a0047b38 Merge pull request #182 from dnnr/serialize-sorted 
Sort items before serializing to minimize diff
 2014-07-28 11:21:48 +02:00
Guillaume Ayoub
f92f9f5e7d Merge pull request #175 from Ede123/master 
Return "401 unauthorized" on unauthorized DELETE requests (fixes #125)
 2014-07-28 11:20:45 +02:00
Guillaume Ayoub
bbe7588156 Merge pull request #189 from deronnax/revert#00674fe 
revert of 00674fe
 2014-07-28 10:49:29 +02:00
Guillaume Ayoub
cdad148bd0 else if → elif 2014-07-28 10:24:43 +02:00
Mathieu Dupuy
4643112511 deplace pid file creation in child process 2014-07-25 15:52:04 +02:00
Mathieu Dupuy
a94984b653 revert of 00674fe 2014-07-25 15:41:56 +02:00
Daniel Danner
1769a68719 Sort items before serializing to minimize diff 2014-07-09 17:41:57 +02:00
Ede123
c9bd2d0135 Signed-off-by: Ede123 <Eduard.Braun2@gmx.de> 2014-06-21 15:34:22 +02:00
Guillaume Ayoub
6854cd0ee3 Use warning instead of warn for logging (fix #170) 2014-06-15 10:19:34 +02:00
Guillaume Ayoub
c5f19bb05b Merge pull request #160 from red-hood/master 
Allow tilde expansion for htpasswd file
 2014-06-15 10:07:54 +02:00
Markus Unterwaditzer
030436327a Fix #143 
Since all iCalendar objects have VCALENDAR inside them, that tag is
absolutely meaningless (in this context).
 2014-06-04 22:55:35 +02:00
Christian Roeder
8673717838 Allow tilde expansion for htpasswd file 
Call os.path.expanduser on the location given by the config parameter.
This will allow to use settings like
  htpasswd_filename = ~/.config/radicale/users
 2014-05-14 01:42:19 +02:00
Guillaume Ayoub
6021f16866 Fix owner_* methods (fix #151) 2014-05-06 15:15:58 +02:00
Guillaume Ayoub
1ab07d84e6 Add some documentation about the "user" key in the "regex" rights module 2014-04-16 18:56:57 +02:00
Guillaume Ayoub
799dbfe612 Fix "authenticated" method 2014-04-16 17:05:20 +02:00
Guillaume Ayoub
3e893a3420 Merge pull request #142 from mike-perdide/authenticated_feature 
Adding a new "authenticated" ACL type.
 2014-04-15 16:48:19 +02:00
Julien Miotte
aabebb5578 Adding a new "authenticated" ACL type. 
When set, all authenticated users will have rw permissions on all
collections, but no anonymous user will be able to read or write any
collection.
 2014-04-09 00:02:39 +02:00
Julien Miotte
963e21212b Renaming the regex.py methods args for coherence. 2014-04-09 00:02:09 +02:00
Julien Miotte
6677dbcdc9 Moving the debug log at the proper place. 
If we don't do this, we might get the following in the logs:

  2014-04-08 20:00:59,354 - DEBUG: Section 'r' matches
  2014-04-08 20:00:59,354 - DEBUG: Section 'r' does not match

which is a bit confusing.
 2014-04-09 00:02:03 +02:00
Markus Kaiserswerth
0dee34b3a8 Add SSL ciphers argument only if supported, fixes Python 2.6 compat 2014-03-19 14:04:25 +01:00
Guillaume Ayoub
45f8e76643 Revert "Follow the depth in REPORT requests" 
This reverts commit 9556508b2a.
 2014-03-05 19:26:42 +01:00
Guillaume Ayoub
9556508b2a Follow the depth in REPORT requests 2014-03-04 01:37:14 +01:00
Guillaume Ayoub
066dffd614 Cut line 2014-03-04 01:08:56 +01:00
Guillaume Ayoub
3bd5b8f0fc Let's try to release 0.9 beta 1 2014-02-24 23:26:40 +01:00
Guillaume Ayoub
f9ce1d0e6d Remove the backend/type split for rights in configuration 2014-02-05 14:11:40 +01:00
Guillaume Ayoub
2ad8b57305 Merge branch 'apache_auth' of git://github.com/jaesivsm/Radicale into jaesivsm-apache_auth 
Conflicts:
	radicale/__init__.py
 2014-02-05 13:09:37 +01:00
Guillaume Ayoub
701df2d201 Use environ.get instead of try/except 2014-02-05 13:01:49 +01:00
Guillaume Ayoub
f7c7746643 Merge pull request #99 from horazont/fix-preauth 
Fix issues if authentication is done by web server
 2014-02-05 12:59:45 +01:00
Christoph Polcin
3aa992e518 Find collections if necessary 2014-01-19 20:11:47 +01:00
Christoph Polcin
90d82d044c Fix access to collections 
under certain conditions it was possible to pass the final access control
if-clause. the master branch granted access if:

    if ((read_allowed_items or write_allowed_items)
        and (not user or auth.is_authenticated(user, password))) or
        function == self.options or not items:

the easy-connect branch from pull request #95 adds:
    (is_authenticated and function == self.propfind) or

the last `or not items` condition levers out the previous authentication and
access control. that isn't that big secuity issue because in this case there
are no collection and items at all. but "bad" and anonymous users could gather
data and information which not destined for them.

this commit fixes and simplifies the if-clause.
 2014-01-19 20:04:37 +01:00
Christoph Polcin
387e1fee76 Fix calendar/addressbook-home-set in PROPFIND response 2014-01-19 19:35:53 +01:00
Christoph Polcin
d09b16c5ad Fix principal-collection-set in PROPFIND response 2014-01-19 19:35:53 +01:00
Christoph Polcin
83db27303f Respond to all authenticated PROPFIND requests 2014-01-19 19:35:46 +01:00
François Schmidts
b9ff564c1f not only apache uses REMOTE_USER 
removing the apache mention to make the config more "webserver agnostic"
 2014-01-15 23:01:36 +01:00
François Schmidts
18ea7e4942 removing the user and password getting from main __call__ function 2014-01-15 22:40:33 +01:00
François Schmidts
34163c5020 making radicale support authenticated user from apache 2014-01-15 09:50:22 +01:00
Jonas Wielicki
d9df9a36e1 Fix issues if authentication is done by web server 
This patch fixes `user` always being None if the authentication is
offloaded to the webserver, as it is suggested in the documentation.

For normal access, this is not a problem, but it becomes a problem if a
client wants to get the current-user-principal, for which the user name
is required.
 2014-01-14 20:46:47 +01:00
Christoph Polcin
2ddec14535 Fix principal URLs in PROPFIND response 2014-01-05 21:22:53 +01:00
Sergey Fursov
1d0418594d Allow attach custom rights backend, small fix in default config file 2013-12-29 15:13:35 +04:00
Sergey Fursov
3b0328ca1e Allow attach custom storage backend 2013-12-28 14:15:35 +04:00
Sergey Fursov
a91a7790c5 Allow attach custom auth handler 2013-12-28 13:31:32 +04:00
Sergey Fursov
dca10fa14e Different rights management backends 
Initially only one backend - regular expressions based
 2013-12-25 03:44:24 +04:00
Guillaume Ayoub
0e566e4c97 Merge branch 'apple' 2013-12-24 11:22:57 +01:00
Guillaume Ayoub
a7be59b9f7 Merge pull request #92 from cristen/master 
Fix wrong syntax in config file and fix #58
 2013-12-24 02:21:43 -08:00
Jean-Marc Martins
7ac971e022 Fix wrong syntax in config file and fix #58 2013-12-23 16:45:15 +01:00
Guillaume Ayoub
fae2b30ec4 Merge branch 'master' of git://github.com/cristen/Radicale into cristen-master 
Conflicts:
	radicale/storage/database.py
	schema.sql
 2013-12-17 14:42:20 +01:00
Jean-Marc Martins
56581a998a Fix database Fix bug #77 HELL YEAH ! 2013-12-17 14:35:55 +01:00
Jean-Marc Martins
f377bd1356 Fix ssl protocol 2013-12-13 15:17:30 +01:00
Jean-Marc Martins
d765544edd Add ssl protocol and ciphers in config 2013-12-13 14:31:09 +01:00
Guillaume Ayoub
0c2c9c3a7e Store collection's parent in database (bug #77) 2013-10-31 16:07:37 +01:00
Guillaume Ayoub
a920518a26 Return an int for __hash__ 2013-10-31 14:05:15 +01:00
Guillaume Ayoub
ce8e86af63 Allow read-only access to .well-known/ca(l|rd)av (related to #32) 2013-10-31 13:57:37 +01:00
Guillaume Ayoub
92b3cf41bc Simple try/except import trick 2013-10-29 14:09:46 +01:00
Guillaume Ayoub
830774824e Merge pull request #75 from davidaurelio/master 
Fix python 3 problems with default rights
 2013-10-29 03:16:09 -07:00
Guillaume Ayoub
337d2719be Cosmetics 2013-10-29 09:30:51 +01:00
9m66p93w
6bc745fe45 Replace built-in hash function with hashlib. 
The built-in hash function returns inconsistent values in Python 3.
 2013-10-27 22:55:01 -04:00
David Aurelio
fb784c28c4 Fix python 3 problem: 'str' does not support the buffer interface 2013-10-27 22:36:56 +01:00
Guillaume Ayoub
fe1cd1d44d Use collection URL instead of main folder as user's main URL (see #32) 2013-10-24 15:31:49 +02:00
Guillaume Ayoub
a617c4db26 Fix authentication with Python 3 (see #70) 2013-10-18 14:06:57 +02:00
Guillaume Ayoub
659757f173 Style fixes 2013-10-01 13:04:24 +02:00
Štěpán Henek
7c03089601 Bugfix: auth PAM check for membership in primary and supplementary groups 2013-09-27 21:14:27 +02:00
Štěpán Henek
ee687bea18 Bugfix: auth PAM doesn't throw an exception when authenticating without username and password 2013-09-27 20:44:41 +02:00
Guillaume Ayoub
07f7e46b3e Small fixes 2013-09-25 13:04:14 +02:00
Jean-Marc Martins
a631c8c761 Fix compatibility between python2 and 3 2013-09-19 14:40:03 +02:00
Jean-Marc Martins
6c40f5e24a Merge branch 'authentication' of github.com:cristen/Radicale into authentication 2013-09-13 17:41:21 +02:00
Jean-Marc Martins
fe28b040bd Adds the committer in the config + python3 support 2013-09-13 17:26:03 +02:00
Jean-Marc Martins
e2512b12fb Fixed partially anonymous authentication 2013-09-13 15:05:02 +02:00
Jean-Marc Martins
58faf725b0 Fixed authentication for anonymous users 2013-09-12 17:39:20 +02:00
Guillaume Ayoub
43785e48a9 Get configuration keys at runtime, not when module is imported (fixes #64) 2013-09-12 13:48:49 +02:00
Guillaume Ayoub
15d8a8eb84 Remove useless primary key from line table 2013-09-07 09:50:13 +02:00
Guillaume Ayoub
0e5ef007f1 Use table attribute instead of string in database order by (probably fixes #59) 2013-09-06 22:09:16 +02:00
Guillaume Ayoub
7266c8018f Merge pull request #61 from cristen/tests 
Tests
 2013-09-06 07:13:17 -07:00
Guillaume Ayoub
ff535b62b0 Remove useless config keys 2013-09-06 16:00:12 +02:00
Jean-Marc Martins
ce59d9ea87 Added functionnal tests 2013-09-05 15:13:31 +02:00
Guillaume Ayoub
dbb866a750 Don't create the repository for each change 2013-08-30 19:00:10 +02:00
Jean-Marc Martins
97a19405c4 Adds git support to Radicale (Fix #30) 2013-08-30 17:23:04 +02:00
Jean-Marc Martins
6e98b1b3e8 Adds multifilesystem storage backend (See #30) 2013-08-29 16:55:36 +02:00
Jean-Marc Martins
484933d4b6 Merge branch 'master' of github.com:Kozea/Radicale 2013-08-28 10:48:15 +02:00
Ossi Salmi
8c3cf6bccd Fix built-in owner_only right 2013-08-28 00:56:45 +03:00
Guillaume Ayoub
423feaec2a Get a random color for calendars with no color 2013-08-27 17:06:16 +02:00
Guillaume Ayoub
00b498677d Merge pull request #48 from jspricke/color 
Add color support
 2013-08-27 08:02:38 -07:00
Jean-Marc Martins
056dec5819 Decode urls in XML (fix #26) 2013-08-27 16:43:36 +02:00
Guillaume Ayoub
f09b070e40 Fix stupid bug in logs 2013-08-27 15:19:15 +02:00
Guillaume Ayoub
c0c652b3f8 Add documentation and example for rights management 2013-08-27 11:05:54 +02:00