begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.

2 files changed, 156 insertions, 27 deletions

diff --git a/mod/cloud.php b/mod/cloud.php
index 27724f6b0..03676c599 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -3,7 +3,7 @@
  * @file mod/cloud.php
  * @brief Initialize RedMatrix's cloud (SabreDAV).
  *
- * Module for accessing the DAV storage area.
+ * Module for accessing the DAV storage area from a web client.
  */
 
 use Sabre\DAV;
@@ -12,25 +12,6 @@ use RedMatrix\RedDAV;
 // composer autoloader for SabreDAV
 require_once('vendor/autoload.php');
 
-// workaround for HTTP-auth in CGI mode
-if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
- 	$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
-	if(strlen($userpass)) {
-	 	list($name, $password) = explode(':', $userpass);
-		$_SERVER['PHP_AUTH_USER'] = $name;
-		$_SERVER['PHP_AUTH_PW'] = $password;
-	}
-}
-
-if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
-	$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
-	if(strlen($userpass)) {
-		list($name, $password) = explode(':', $userpass);
-		$_SERVER['PHP_AUTH_USER'] = $name;
-		$_SERVER['PHP_AUTH_PW'] = $password;
-	}
-}
-
 /**
  * @brief Fires up the SabreDAV server.
  *
@@ -126,13 +107,8 @@ function cloud_init(&$a) {
 	}
 
 	if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
-		try {
-			$auth->Authenticate($server, t('RedMatrix - Guests: Username: {your email address}, Password: +++'));
-		}
-		catch (Exception $e) {
-			logger('mod_cloud: auth exception' . $e->getMessage());
-			http_status_exit($e->getHTTPCode(), $e->getMessage());
-		}
+		logger('mod_cloud: auth exception' . $e->getMessage());
+		http_status_exit($e->getHTTPCode(), $e->getMessage());
 	}
 
 	require_once('include/RedDAV/RedBrowser.php');
diff --git a/mod/dav.php b/mod/dav.php
new file mode 100644
index 000000000..1bff5ffbc
--- /dev/null
+++ b/mod/dav.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @file mod/dav.php
+ * @brief Initialize RedMatrix's cloud (SabreDAV).
+ *
+ * Module for accessing the DAV storage area from a DAV client.
+ */
+
+use Sabre\DAV;
+use RedMatrix\RedDAV;
+
+// composer autoloader for SabreDAV
+require_once('vendor/autoload.php');
+
+// workaround for HTTP-auth in CGI mode
+if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
+ 	$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+	if(strlen($userpass)) {
+	 	list($name, $password) = explode(':', $userpass);
+		$_SERVER['PHP_AUTH_USER'] = $name;
+		$_SERVER['PHP_AUTH_PW'] = $password;
+	}
+}
+
+if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
+	$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
+	if(strlen($userpass)) {
+		list($name, $password) = explode(':', $userpass);
+		$_SERVER['PHP_AUTH_USER'] = $name;
+		$_SERVER['PHP_AUTH_PW'] = $password;
+	}
+}
+
+/**
+ * @brief Fires up the SabreDAV server.
+ *
+ * @param App &$a
+ */
+function dav_init(&$a) {
+	// call ($currenttheme)_init since we're operating outside of index.php
+	$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
+	if (file_exists($theme_info_file)){
+		require_once($theme_info_file);
+		if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
+			$func = str_replace('-', '_', current_theme()) . '_init';
+			$func($a);
+		}
+	}
+
+	require_once('include/reddav.php');
+
+	if (! is_dir('store'))
+		os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
+
+	$which = null;
+	if (argc() > 1)
+		$which = argv(1);
+
+	$profile = 0;
+
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which . '" />' . "\r\n";
+
+	if ($which)
+		profile_load($a, $which, $profile);
+
+	$auth = new RedDAV\RedBasicAuth();
+
+	$ob_hash = get_observer_hash();
+
+	if ($ob_hash) {
+		if (local_user()) {
+			$channel = $a->get_channel();
+			$auth->setCurrentUser($channel['channel_address']);
+			$auth->channel_id = $channel['channel_id'];
+			$auth->channel_hash = $channel['channel_hash'];
+			$auth->channel_account_id = $channel['channel_account_id'];
+			if($channel['channel_timezone'])
+				$auth->setTimezone($channel['channel_timezone']);
+		}
+		$auth->observer = $ob_hash;
+	}
+
+	if ($_GET['davguest'])
+		$_SESSION['davguest'] = true;
+
+	$_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']);
+	$_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']);
+	$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['QUERY_STRING']);
+
+	$_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']);
+
+	$rootDirectory = new RedDAV\RedDirectory('/', $auth);
+
+	// A SabreDAV server-object
+	$server = new DAV\Server($rootDirectory);
+	// prevent overwriting changes each other with a lock backend
+	$lockBackend = new DAV\Locks\Backend\File('store/[data]/locks');
+	$lockPlugin = new DAV\Locks\Plugin($lockBackend);
+
+	$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. 
+	// In order to avoid prompting for passwords for viewing a DIRECTORY, add
+	// the URL query parameter 'davguest=1'.
+
+	$isapublic_file = false;
+	$davguest = ((x($_SESSION, 'davguest')) ? true : false);
+
+	if ((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) {
+		try { 
+			$x = RedFileData('/' . $a->cmd, $auth);
+			if($x instanceof RedDAV\RedFile)
+				$isapublic_file = true;
+		}
+		catch (Exception $e) {
+			$isapublic_file = false;
+		}
+	}
+
+	if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
+		try {
+			$auth->Authenticate($server, t('RedMatrix channel'));
+		}
+		catch (Exception $e) {
+			logger('mod_cloud: auth exception' . $e->getMessage());
+			http_status_exit($e->getHTTPCode(), $e->getMessage());
+		}
+	}
+
+	require_once('include/RedDAV/RedBrowser.php');
+	// provide a directory view for the cloud in Red Matrix
+	$browser = new RedDAV\RedBrowser($auth);
+	$auth->setBrowserPlugin($browser);
+
+	$server->addPlugin($browser);
+
+	// Experimental QuotaPlugin
+//	require_once('include/RedDAV/QuotaPlugin.php');
+//	$server->addPlugin(new RedDAV\QuotaPlugin($auth));
+
+	// All we need to do now, is to fire up the server
+	$server->exec();
+
+	killme();
+}