harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't prompt guests for a password if they're accessing an embedded public file.

Browse Source
This commit is contained in:
friendica 2014-01-26 02:58:03 -08:00
parent b5c6db1205
commit f90b3b60cb
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/security.php
View File

@ -61,7 +61,7 @@ function change_channel($change_channel) {
intval(PAGE_REMOVED) intval(PAGE_REMOVED)
); );
if($r) { if($r) {
$hash = $r[0]['channel_hash']; $hash = $r[0]['channel_hash'];
$_SESSION['uid'] = intval($r[0]['channel_id']); $_SESSION['uid'] = intval($r[0]['channel_id']);
get_app()->set_channel($r[0]); get_app()->set_channel($r[0]);

24
mod/cloud.php
View File

@ -74,7 +74,6 @@ function cloud_init(&$a) {
$_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = str_replace(array('?f=','&f='),array('',''),$_SERVER['REQUEST_URI']);
$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']); $_SERVER['REQUEST_URI'] = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$_SERVER['REQUEST_URI']);
$rootDirectory = new RedDirectory('/',$auth); $rootDirectory = new RedDirectory('/',$auth);
$server = new DAV\Server($rootDirectory); $server = new DAV\Server($rootDirectory);
$lockBackend = new DAV\Locks\Backend\File('store/[data]/locks'); $lockBackend = new DAV\Locks\Backend\File('store/[data]/locks');
@ -82,8 +81,29 @@ function cloud_init(&$a) {
$server->addPlugin($lockPlugin); $server->addPlugin($lockPlugin);
// The next section of code allows us to bypass prompting for http-auth if a FILE is being accessed anonymously and permissions
// allow this. This way one can create hotlinks to public media files in their cloud and anonymous viewers won't get asked to login.
// If a DIRECTORY is accessed or there are permission issues accessing the file and we aren't previously authenticated via zot,
// prompt for HTTP-auth. This will be the default case for mounting a DAV directory.
if(! $auth->observer) { // FIXME - we may require one more hack here; to allow an unauthenticated guest to view your file collection (e.g. a DIRECTORY) from
// the web browser interface without prompting for password, but still requiring one for unauthenticated folks using DAV. We may be
// able to do this with a special $_GET request var and a cookie.
$isapublic_file = false;
if((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) {
try {
$x = RedFileData('/' . $a->cmd,$auth);
if($x instanceof RedFile)
$isapublic_file = true;
}
catch ( Exception $e ) {
$isapublic_file = false;
}
}
if((! $auth->observer) && (! $isapublic_file)) {
try { try {
$auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++')); $auth->Authenticate($server, t('Red Matrix - Guests: Username: {your email address}, Password: +++'));
} }

2
version.inc
View File

@ -1 +1 @@
2014-01-25.568 2014-01-26.569