Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
69d3601
Proper work on Publishing
tcitworld Jul 6, 2016
5824c24
Make little corrections
tcitworld Jul 6, 2016
981c38f
Remove unnecessary implementation
tcitworld Jul 6, 2016
1652a74
Fix publish-url property & getPublishStatus() fct
tcitworld Jul 6, 2016
4a0e6e2
Remove unnecessary line
tcitworld Jul 7, 2016
f89961d
Fix annotations
tcitworld Jul 7, 2016
72f35f8
Use ressource ID instead of name
tcitworld Jul 7, 2016
7e5a82b
Use urlgenerator to generate an absolute url
tcitworld Jul 7, 2016
bd0aae8
No need to call database twice
tcitworld Jul 7, 2016
8da2100
Start work on returning CalDAV published calendars
tcitworld Jul 7, 2016
90ab6e4
Add new root collection public-calendars which holds all public calen…
DeepDiver1975 Jul 8, 2016
e7085aa
Allow not-authenticated access to specific urls
DeepDiver1975 Jul 8, 2016
00dc157
Fix requests for browser plugin as well as for the public calendar ro…
DeepDiver1975 Jul 11, 2016
994001c
Dirty hack to disable dav plugins on public calendar urls
tcitworld Jul 11, 2016
aca3053
Fix DB call for MySQL databases
tcitworld Jul 12, 2016
2df69ec
correct get published status and minor fixes
tcitworld Jul 12, 2016
f09c46d
Fix some tests
tcitworld Jul 12, 2016
aadb56d
Fix wrong way to get publish status
tcitworld Jul 18, 2016
e783d01
Allow public access to the principals/system/public
DeepDiver1975 Jul 19, 2016
d0ec6b9
Disable OPTIONS handling - done by sabre
DeepDiver1975 Jul 19, 2016
77216e7
a few tests
tcitworld Jul 20, 2016
de5e212
fix plugin test
tcitworld Jul 20, 2016
ebf2377
fix unpublishing test
tcitworld Jul 20, 2016
3921385
fix things (indentation, tests, comments, backend custom implementation
tcitworld Jul 31, 2016
762726d
fix indent once and for all
tcitworld Aug 1, 2016
1899116
move getPublicCalendar inside the caldav backend
tcitworld Aug 1, 2016
dd248ca
fix some bracket positions
tcitworld Aug 1, 2016
691b3ab
Add publicuri to oc_dav_shares table and start working with it
tcitworld Aug 1, 2016
9af2a9f
test serializer
tcitworld Aug 1, 2016
8433c3c
fix getChild()
tcitworld Aug 3, 2016
a4fe596
add space between calendarname and owner name
tcitworld Aug 11, 2016
f16ea48
add can-be-published property
tcitworld Aug 12, 2016
f0421e1
add missing tests
tcitworld Aug 14, 2016
6378dbc
fix can-be-published
tcitworld Aug 14, 2016
ad0eeaa
use AllowedSharingModes for can-be-published & can-be-shared
tcitworld Aug 15, 2016
3e9a346
add calendarserver-sharing to the list of advertised features
tcitworld Aug 16, 2016
ff67cbc
Add test for PublicCalendarRoot
tcitworld Aug 18, 2016
2fff203
Add missing constructor argument
LukasReschke Aug 30, 2016
4659e3a
Add new constructor args
LukasReschke Aug 30, 2016
d884370
Use true random string as uri for public calendars - as a result we c…
DeepDiver1975 Sep 3, 2016
8360222
fix public calendars
tcitworld Sep 14, 2016
17d5dfd
add in same request
tcitworld Sep 15, 2016
9c75b00
fix tests
tcitworld Sep 15, 2016
dcc2311
fix annotations & copyright headers
tcitworld Sep 23, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow public access to the principals/system/public
  • Loading branch information
DeepDiver1975 authored and LukasReschke committed Sep 26, 2016
commit e783d01da7b5209a4d3bfdb255573b4fc7fbe73c
7 changes: 4 additions & 3 deletions apps/dav/lib/DAV/PublicAuth.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class PublicAuth implements BackendInterface {
*/
public function __construct() {
$this->publicURLs = [
'public-calendars'
'public-calendars',
'principals/system/public'
];
}

Expand Down Expand Up @@ -82,7 +83,7 @@ function challenge(RequestInterface $request, ResponseInterface $response) {

/**
* @param RequestInterface $request
* @return array
* @return bool
*/
private function isRequestPublic(RequestInterface $request) {
$params = $request->getQueryParameters();
Expand All @@ -93,6 +94,6 @@ private function isRequestPublic(RequestInterface $request) {
$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
return strpos($url, $publicUrl, 0) === 0;
});
return $matchingUrls;
return !empty($matchingUrls);
}
}