webdav storage backend

diff --git a/apps/files_remote/appinfo/app.php b/apps/files_remote/appinfo/app.php
index f94e813ea5fa752cad493bbda06d5b1aaa0efb88..25473d87feed8de4b2675e20743d46a715d5c368 100644 (file)
--- a/apps/files_remote/appinfo/app.php
+++ b/apps/files_remote/appinfo/app.php
@@ -7,3 +7,4 @@
  */
 
 OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_remote/lib/ftp.php';
+OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_remote/lib/webdav.php';

diff --git a/apps/files_remote/lib/webdav.php b/apps/files_remote/lib/webdav.php
new file mode 100644 (file)
index 0000000..7a2da5c
--- /dev/null
+++ b/apps/files_remote/lib/webdav.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_FileStorage_DAV extends OC_Filestorage_Common{
+       private $password;
+       private $user;
+       private $host;
+       private $secure;
+       private $root;
+       /**
+        * @var Sabre_DAV_Client
+        */
+       private $client;
+
+       private static $tempFiles=array();
+       
+       public function __construct($params){
+               $this->host=$params['host'];
+               $this->user=$params['user'];
+               $this->password=$params['password'];
+               $this->secure=isset($params['secure'])?(bool)$params['secure']:false;
+               $this->root=isset($params['root'])?$params['root']:'/';
+               if(substr($this->root,0,1)!='/'){
+                       $this->root='/'.$this->root;
+               }
+               if(substr($this->root,-1,1)!='/'){
+                       $this->root.='/';
+               }
+               
+               $settings = array(
+                       'baseUri' => $this->createBaseUri(),
+                       'userName' => $this->user,
+                       'password' => $this->password,
+               );
+               $this->client = new Sabre_DAV_Client($settings);
+
+               //create the root folder if necesary
+               $this->mkdir('');
+       }
+
+       private function createBaseUri(){
+               $baseUri='http';
+               if($this->secure){
+                       $baseUri.'s';
+               }
+               $baseUri.='://'.$this->host.$this->root;
+               return $baseUri;
+       }
+
+       public function mkdir($path){
+               $path=$this->cleanPath($path);
+               return $this->simpleResponse('MKCOL',$path,null,201);
+       }
+
+       public function rmdir($path){
+               $path=$this->cleanPath($path);
+               return $this->simpleResponse('DELETE',$path,null,204);
+       }
+
+       public function opendir($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array(),1);
+                       $stripLength=strlen($this->root)+strlen($path);
+                       $id=md5('webdav'.$this->root.$path);
+                       OC_FakeDirStream::$dirs[$id]=array();
+                       foreach($response as $file=>$data){
+                               //strip root and path
+                               $file=trim(substr($file,$stripLength));
+                               $file=trim($file,'/');
+                               if($file){
+                                       OC_FakeDirStream::$dirs[$id][]=$file;
+                               }
+                       }
+                       return opendir('fakedir://'.$id);
+               }catch(Exception $e){
+                       return false;
+               }
+       }
+
+       public function filetype($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array('{DAV:}resourcetype'));
+                       $responseType=$response["{DAV:}resourcetype"]->resourceType;
+                       return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
+               }catch(Exception $e){
+                       return false;
+               }
+       }
+
+       public function is_readable($path){
+               return true;//not properly supported
+       }
+
+       public function is_writable($path){
+               return true;//not properly supported
+       }
+
+       public function file_exists($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array('{DAV:}resourcetype'));
+                       return true;//no 404 exception
+               }catch(Exception $e){
+                       return false;
+               }
+       }
+
+       public function unlink($path){
+               return $this->simpleResponse('DELETE',$path,null,204);
+       }
+
+       public function fopen($path,$mode){
+               $path=$this->cleanPath($path);
+               switch($mode){
+                       case 'r':
+                       case 'rb':
+                               //straight up curl instead of sabredav here, sabredav put's the entire get result in memory
+                               $curl = curl_init();
+                               $fp = fopen('php://temp', 'r+');
+                               curl_setopt($curl,CURLOPT_USERPWD,$this->user.':'.$this->password);
+                               curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path);
+                               curl_setopt($curl, CURLOPT_FILE, $fp);
+
+                               curl_exec ($curl);
+                               curl_close ($curl);
+                               rewind($fp);
+                               return $fp;
+                       case 'w':
+                       case 'wb':
+                       case 'a':
+                       case 'ab':
+                       case 'r+':
+                       case 'w+':
+                       case 'wb+':
+                       case 'a+':
+                       case 'x':
+                       case 'x+':
+                       case 'c':
+                       case 'c+':
+                               //emulate these
+                               if(strrpos($path,'.')!==false){
+                                       $ext=substr($path,strrpos($path,'.'));
+                               }else{
+                                       $ext='';
+                               }
+                               $tmpFile=OC_Helper::tmpFile($ext);
+                               OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
+                               if($this->file_exists($path)){
+                                       $this->getFile($path,$tmpFile);
+                               }
+                               self::$tempFiles[$tmpFile]=$path;
+                               return fopen('close://'.$tmpFile,$mode);
+               }
+       }
+
+       public function writeBack($tmpFile){
+               if(isset(self::$tempFiles[$tmpFile])){
+                       $this->uploadFile($tmpFile,self::$tempFiles[$tmpFile]);
+                       unlink($tmpFile);
+               }
+       }
+
+       public function free_space($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array('{DAV:}quota-available-bytes'));
+                       if(isset($response['{DAV:}quota-available-bytes'])){
+                               return (int)$response['{DAV:}quota-available-bytes'];
+                       }else{
+                               return 0;
+                       }
+               }catch(Exception $e){
+                       return 0;
+               }
+       }
+
+       public function touch($path,$mtime=null){
+               if(is_null($mtime)){
+                       $mtime=time();
+               }
+               $path=$this->cleanPath($path);
+               $this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime,));
+       }
+
+       public function getFile($path,$target){
+               $source=$this->fopen($path,'r');
+               file_put_contents($target,$source);
+       }
+
+       public function uploadFile($path,$target){
+               $source=fopen($path,'r');
+
+               $curl = curl_init();
+               curl_setopt($curl,CURLOPT_USERPWD,$this->user.':'.$this->password);
+               curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$target);
+               curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
+               curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
+               curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
+               curl_setopt($curl, CURLOPT_PUT, true);
+               curl_exec ($curl);
+               curl_close ($curl);
+       }
+
+       public function rename($path1,$path2){
+               $path1=$this->cleanPath($path1);
+               $path2=$this->root.$this->cleanPath($path2);
+               try{
+                       $response=$this->client->request('MOVE',$path1,null,array('Destination'=>$path2));
+                       return true;
+               }catch(Exception $e){
+                       echo $e;
+                       echo 'fail';
+                       var_dump($response);
+                       return false;
+               }
+       }
+
+       public function copy($path1,$path2){
+               $path1=$this->cleanPath($path1);
+               $path2=$this->root.$this->cleanPath($path2);
+               try{
+                       $response=$this->client->request('COPY',$path1,null,array('Destination'=>$path2));
+                       return true;
+               }catch(Exception $e){
+                       echo $e;
+                       echo 'fail';
+                       var_dump($response);
+                       return false;
+               }
+       }
+
+       public function stat($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength'));
+                       if(isset($response['{DAV:}getlastmodified']) and isset($response['{DAV:}getcontentlength'])){
+                               return array(
+                                       'mtime'=>strtotime($response['{DAV:}getlastmodified']),
+                                       'size'=>(int)$response['{DAV:}getcontentlength'],
+                                       'ctime'=>-1,
+                               );
+                       }else{
+                               return array();
+                       }
+               }catch(Exception $e){
+                       return array();
+               }
+       }
+
+       public function getMimeType($path){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype'));
+                       $responseType=$response["{DAV:}resourcetype"]->resourceType;
+                       $type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
+                       if($type=='dir'){
+                               return 'httpd/unix-directory';
+                       }elseif(isset($response['{DAV:}getcontenttype'])){
+                               return $response['{DAV:}getcontenttype'];
+                       }else{
+                               return false;
+                       }
+               }catch(Exception $e){
+                       return false;
+               }
+       }
+
+       private function cleanPath($path){
+               if(substr($path,0,1)=='/'){
+                       return substr($path,1);
+               }else{
+                       return $path;
+               }
+       }
+
+       private function simpleResponse($method,$path,$body,$expected){
+               $path=$this->cleanPath($path);
+               try{
+                       $response=$this->client->request($method,$path,$body);
+                       return $response['statusCode']==$expected;
+               }catch(Exception $e){
+                       return false;
+               }
+       }
+}
+

diff --git a/apps/files_remote/tests/config.php b/apps/files_remote/tests/config.php
index 541057829195e84b64ea4e0f31d16cfe761994f7..e2eea72f244c1fbb05a3307362a5c2d04d184f36 100644 (file)
--- a/apps/files_remote/tests/config.php
+++ b/apps/files_remote/tests/config.php
@@ -5,5 +5,11 @@ return array(
                'user'=>'test',
                'password'=>'test',
                'root'=>'/test',
-       )
+       ),
+       'webdav'=>array(
+               'host'=>'localhost',
+               'user'=>'test',
+               'password'=>'test',
+               'root'=>'/owncloud/files/webdav.php',
+       ),
 );

diff --git a/apps/files_remote/tests/ftp.php b/apps/files_remote/tests/ftp.php
index 2d5405ccda606fe6916308724792f373510dea23..03633b7c0d1095bbb90b1f6188a22b2419a7e114 100644 (file)
--- a/apps/files_remote/tests/ftp.php
+++ b/apps/files_remote/tests/ftp.php
@@ -7,9 +7,6 @@
  */
 
 class Test_Filestorage_FTP extends Test_FileStorage {
-       /**
-        * @var string tmpDir
-        */
        private $config;
        private $id;
 
@@ -24,5 +21,3 @@ class Test_Filestorage_FTP extends Test_FileStorage {
                OC_Helper::rmdirr($this->instance->constructUrl(''));
        }
 }
-
-?>
\ No newline at end of file

diff --git a/apps/files_remote/tests/webdav.php b/apps/files_remote/tests/webdav.php
new file mode 100644 (file)
index 0000000..219fff8
--- /dev/null
+++ b/apps/files_remote/tests/webdav.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Filestorage_DAV extends Test_FileStorage {
+       private $config;
+       private $id;
+
+       public function setUp(){
+               $id=uniqid();
+               $this->config=include('apps/files_remote/tests/config.php');
+               $this->config['webdav']['root'].='/'.$id;//make sure we have an new empty folder to work in
+               $this->instance=new OC_Filestorage_DAV($this->config['webdav']);
+       }
+
+       public function tearDown(){
+               $this->instance->rmdir('/');
+       }
+}