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

the web browser interface for DAV has now got zot

Browse Source
This commit is contained in:
friendica 2014-01-05 14:12:53 -08:00
parent daa7ee1275
commit 85ed9404f9
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mod/cloud.php
View File

@ -79,6 +79,7 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED) if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)
&& (hash('whirlpool',$record['account_salt'] . $password) === $record['account_password'])) { && (hash('whirlpool',$record['account_salt'] . $password) === $record['account_password'])) {
logger('(DAV) RedBasicAuth: password verified for ' . $username); logger('(DAV) RedBasicAuth: password verified for ' . $username);
$this->currentUser = $r[0]['channel_address'];
$this->channel_name = $r[0]['channel_address']; $this->channel_name = $r[0]['channel_address'];
$this->channel_id = $r[0]['channel_id']; $this->channel_id = $r[0]['channel_id'];
$this->channel_hash = $this->observer = $r[0]['channel_hash']; $this->channel_hash = $this->observer = $r[0]['channel_hash'];
@ -90,6 +91,12 @@ class RedBasicAuth extends Sabre\DAV\Auth\Backend\AbstractBasic {
logger('(DAV) RedBasicAuth: password failed for ' . $username); logger('(DAV) RedBasicAuth: password failed for ' . $username);
return false; return false;
} }
function setCurrentUser($name) {
$this->currentUser = $name;
}
} }
@ -102,6 +109,20 @@ function cloud_init(&$a) {
$auth = new RedBasicAuth(); $auth = new RedBasicAuth();
$ob_hash = get_observer_hash();
if($ob_hash) {
if(local_user()) {
$channel = $a->get_channel();
$auth->setCurrentUser($channel['channel_address']);
$auth->channel_name = $channel['channel_address'];
$auth->channel_id = $channel['channel_id'];
$auth->channel_hash = $channel['channel_hash'];
}
$auth->observer = $ob_hash;
}
$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');
@ -110,7 +131,8 @@ function cloud_init(&$a) {
$server->addPlugin($lockPlugin); $server->addPlugin($lockPlugin);
$auth->Authenticate($server,'Red Matrix'); if(! $auth->observer)
$auth->Authenticate($server,'Red Matrix');
$browser = new DAV\Browser\Plugin(); $browser = new DAV\Browser\Plugin();
$server->addPlugin($browser); $server->addPlugin($browser);

2
version.inc
View File

@ -1 +1 @@
2014-01-03.546 2014-01-05.548