| ";
@@ -625,6 +624,23 @@
default:
html_header($course, $wdir);
+ if (empty($CFG->webdavroot)) {
+ $webdavurl = $CFG->wwwroot.'/webdav/moodledata-server.php/';
+ } else {
+ $webdavurl = $CFG->webdavroot.'/webdav/moodledata-server.php/';
+ }
+ if ($wdir==='/' &&
+ (!empty($CFG->webdavallowfilemanagers)) || has_capability('moodle/site:webdav', get_context_instance(CONTEXT_SYSTEM))) {
+ $msg = '';
+ if (true || check_browser_version('MSIE')) {
+ $msg = ' '.get_string('webdavconnectmsie')
+ . " '.get_string('webdavcanmanage')
+ . " '.get_string('webdavmoreinfo').' '; + print_box($msg); + } displaydir($wdir); html_footer(); break; diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php index 28450b7..2ea7c18 100644 --- a/lang/en_utf8/admin.php +++ b/lang/en_utf8/admin.php @@ -424,6 +424,7 @@ $string['langupdatecomplete'] = 'Language pack update completed'; $string['latexpreamble'] = 'LaTeX preamble'; $string['latexsettings'] = 'LaTeX renderer Settings'; $string['latinexcelexport'] = 'Excel encoding'; +$string['xmlrecommended'] = 'Installing the optional PHP XML extension is recommended -- it enables WebDAV support.'; $string['localetext'] = 'Sitewide locale'; $string['localstringcustomization'] = 'Local string customization'; $string['location'] = 'Location'; @@ -720,6 +721,17 @@ $string['uuupdatemissing'] = 'Fill in missing from file and defaults'; $string['uuupdatetype'] = 'Existing user details'; $string['validateerror'] = 'This value was not valid:'; $string['warningcurrentsetting'] = 'Invalid current value: $a'; +$string['webdav'] = 'WebDAV'; +$string['webdavenable'] = 'Enable WebDAV access'; +$string['webdavallowfilemanagers'] = 'Allow WebDAV to file managers'; +$string['webdavroot'] = 'WebDAV root URL'; +$string['webdavsessttl'] = 'WebDAV session TTL'; +$string['webdavsubnet'] = 'WebDAV subnet'; +$string['configwebdavenable'] = 'Enables access to Moodledata using the WebDAV protocol. Only users with \'moodle/site:webdav\' capabilities will be allowed to use it (only admins by default).'; +$string['configwebdavallowfilemanagers'] = 'Allows WebDAV access to users that have are allowed file management (\'moodle/course:managefiles\') in any course. \'Editing teacher\' roles normally have this, so this is a handy way to allow editing teachers.'; +$string['configwebdavroot'] = 'Override wwwroot for WebDAV connections -- normally not needed. Useful to bypass load balancers.'; +$string['configwebdavsessttl'] = 'In minutes. Controls how long the WebDAV cached credentials last. Moodle caches access credentials used over WebDAV to avoid innecesary traffic to the authentication backends.'; +$string['configwebdavsubnet'] = 'Only allow WebDAV connections from this subnet. Can be used to only permit WebDAV access from the local LAN. If empty, connections are accepted from any machine.'; $string['webproxy'] = 'Web proxy'; $string['webproxyinfo'] = 'Fill in following options if your Moodle server can not access internet directly. Internet access is required for download of environment data, language packs, RSS feeds, timezones, etc.PHP cURL extension is highly recommended.'; $string['xmlstrictheaders'] = 'XML strict headers'; diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php index df3373e..91b5a3a 100644 --- a/lang/en_utf8/moodle.php +++ b/lang/en_utf8/moodle.php @@ -1582,6 +1582,9 @@ $string['virusplaceholder'] = 'This file that has been uploaded was found to con $string['visible'] = 'Visible'; $string['visibletostudents'] = 'Visible to $a'; $string['warningdeleteresource'] = 'Warning: $a is referred in a resource. Would you like to update the resource?'; +$string['webdavcanmanage'] = 'To manage files for all the courses you have access to using WebDAV, use this address:'; +$string['webdavconnectmsie'] = 'You can connect to this directory via Web Folders (will open in Windows File Explorer) following this link:'; +$string['webdavmoreinfo'] = 'For more information on how to connect to WebDAV, see the WebDAV Connect page.'; $string['webpage'] = 'Web page'; $string['week'] = 'Week'; $string['weekhide'] = 'Hide this week from $a'; diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php index ad296ca..fc0af4b 100644 --- a/lang/en_utf8/role.php +++ b/lang/en_utf8/role.php @@ -150,6 +150,7 @@ $string['site:uploadusers'] = 'Upload new users from file'; $string['site:viewfullnames'] = 'Always see full names of users'; $string['site:viewparticipants'] = 'View participants'; $string['site:viewreports'] = 'View reports'; +$string['site:webdav'] = 'Connect via WebDAV'; $string['tag:manage'] = 'Manage all tags'; $string['tag:create'] = 'Create new tags'; $string['tag:edit'] = 'Edit existing tags'; diff --git a/lib/db/access.php b/lib/db/access.php index 22b34e4..78db153 100644 --- a/lib/db/access.php +++ b/lib/db/access.php @@ -1203,8 +1203,16 @@ $moodle_capabilities = array( 'editingteacher' => CAP_ALLOW, 'coursecreator' => CAP_ALLOW ) + ), + + 'moodle/site:webdav' => array( + 'riskbitmask' => RISK_XSS, + 'captype' => 'write', + 'contextlevel' => CONTEXT_SYSTEM, + 'legacy' => array( + 'coursecreator' => CAP_ALLOW + ) ) ); - ?> diff --git a/lib/moodlelib.php b/lib/moodlelib.php index a28985e..c02bf88 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -857,6 +857,14 @@ function gc_cache_flags() { } /** + * Garbage-collect webdav locks + * + */ +function gc_webdav_locks() { + return delete_records_select('webdav_locks', 'expiry < ' . time()); +} + +/** * Refresh current $USER session global variable with all their current preferences. * @uses $USER */ diff --git a/webdav/moodledata-server.php b/webdav/moodledata-server.php new file mode 100644 index 0000000..5c8dcfd --- /dev/null +++ b/webdav/moodledata-server.php @@ -0,0 +1,48 @@ +qstr(); + +require_once(dirname(dirname(__FILE__)).'/config.php'); + +if (empty($CFG->webdavenable)) { + header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); + $msg = 'WebDAV request forbidden - WebDAV is disabled'; + echo " $msg "; + mdie($msg); +} +if (!empty($CFG->webdavsubnet)) { + // A local reverse proxy defeats the purpose of this :-/ + if (!address_in_subnet($_SERVER['REMOTE_ADDR'],$CFG->webdavsubnet)) { + $msg = 'WebDAV request forbidden - WebDAV is restricted'; + echo "$msg "; + mdie($msg); + } +} +if (!function_exists('xml_parser_create_ns')) { + header($_SERVER['SERVER_PROTOCOL'] . ' 500 Server Error'); + $msg = 'WebDAV requires the XML extension.'; + echo "$msg "; + mdie($msg); +} + +// Adding our PEAR path - maybe this should be +// in lib/setup.php +ini_set("include_path", ini_get("include_path"). PATH_SEPARATOR . $CFG->libdir.'/pear'); + +// Here we go! +require_once($CFG->libdir . '/filelib.php'); +require_once (dirname(__FILE__)."/server/moodledata.class.php"); +$server = new HTTP_WebDAV_Server_Moodledata(); +$server->ServeRequest($CFG->dataroot); + +// The EOF should be flush with the PHP closing tag... +?> \ No newline at end of file diff --git a/webdav/server/moodledata.class.php b/webdav/server/moodledata.class.php new file mode 100644 index 0000000..71e01be --- /dev/null +++ b/webdav/server/moodledata.class.php @@ -0,0 +1,990 @@ + + * @author Martin LanghoffIndex of ".htmlspecialchars($displaypath)."\n"; + + echo ""; + printf($format, "Size", "Last modified", "Filename"); + echo ""; + + closedir($handle); + + echo "\n"; + + exit; + } + + /** + * PUT method handler + * + * @param array parameter passing array + * @return bool true on success + */ + function PUT(&$options) + { + $fspath = $this->base . $this->_cleanpath($options["path"]); + $fspath = dirname($fspath) . '/' . clean_param(basename($fspath),PARAM_FILE); + + if (!$this->_fspathallowed($fspath)) { + return "403 Forbidden"; + } + + $dir = dirname($fspath); + + if ($dir===$this->base) { + // No writing at the top of the tree! + return "403 Forbidden"; + } + + if (!file_exists($dir) || !is_dir($dir)) { + return "409 Conflict"; // TODO right status code for both? + } + + $options["new"] = ! file_exists($fspath); + + if ($options["new"] && !is_writeable($dir)) { + return "403 Forbidden"; + } + if (!$options["new"] && !is_writeable($fspath)) { + return "403 Forbidden"; + } + if (!$options["new"] && is_dir($fspath)) { + return "403 Forbidden"; + } + $fp = fopen($fspath, "w"); + return $fp; + } + + + /** + * MKCOL method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function MKCOL($options) + { + $path = $this->base .$this->_cleanpath($options["path"]); + $parent = dirname($path); + $name = clean_param(basename($path), PARAM_FILE); + + if (!$this->_fspathallowed($path)) { + return "403 Forbidden"; + } + if ($parent===$this->base) { + // No writing at the top of the tree! + return "403 Forbidden"; + } + + + if (!file_exists($parent)) { + return "409 Conflict"; + } + + if (!is_dir($parent)) { + return "403 Forbidden"; + } + + if ( file_exists($parent."/".$name) ) { + return "405 Method not allowed"; + } + + if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet + return "415 Unsupported media type"; + } + + $stat = mkdir($parent."/".$name, 0777); + if (!$stat) { + return "403 Forbidden"; + } + + return ("201 Created"); + } + + + /** + * DELETE method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function DELETE($options) + { + if (empty($options["path"]) || $options["path"]==='/') { + return '403 Forbidden'; + } + + $path = $this->base .$this->_cleanpath($options["path"]); + + if (!$this->_fspathallowed($path)) { + return '403 Forbidden'; + } + + if (preg_match(":^/\d+/?$:",$options['path']) ) { + // course directory! + return '403 Forbidden'; + } + + if (!file_exists($path)) { + return "404 Not found"; + } + + if (is_dir($path)) { + System::rm(array("-rf", $path)); + } else { + unlink($path); + } + + return "204 No Content"; + } + + + /** + * MOVE method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function MOVE($options) + { + return $this->COPY($options, true); + } + + /** + * COPY method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function COPY($options, $del=false) + { + // TODO Property updates still broken (Litmus should detect this?) + + if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet + return "415 Unsupported media type"; + } + + // no copying to different WebDAV Servers yet + if (isset($options["dest_url"])) { + return "502 bad gateway"; + } + + $source = $this->base . $this->_cleanpath($options["path"]); + if (!file_exists($source)) { + return "404 Not found"; + } + + if (is_dir($source)) { // resource is a collection + switch ($options["depth"]) { + case "infinity": // valid + break; + case "0": // valid for COPY only + if ($del) { // MOVE? + return "400 Bad request"; + } + break; + case "1": // invalid for both COPY and MOVE + default: + return "400 Bad request"; + } + } + + if ($del===true) { // MOVE - check we are not being asked to move a coursedir + $rxbasedir = preg_quote($this->base,':'); + if (preg_match(":^$rxbasedir/\d+/?$:",$source) ) { + return "403 Forbidden"; + } + } + + $dest = $this->base . $this->_cleanpath($options["dest"]); + $destdir = dirname($dest); + + if ($destdir===$this->base + || (is_dir($source) && ($source===$this->base || $source===$this->base.'/'))) { + // No writing at the top of the tree, or copying the whole tree! + return "403 Forbidden"; + } + + if (!$this->_fspathallowed($dest) || !$this->_fspathallowed($source)) { + return "403 Forbidden"; + } + + if (!file_exists($destdir) || !is_dir($destdir)) { + return "409 Conflict"; + } + + $new = !file_exists($dest); + $existing_col = false; + + if (!$new) { + if ($del && is_dir($dest)) { + if (!$options["overwrite"]) { + return "412 precondition failed"; + } + $dest .= basename($source); + if (file_exists($dest)) { + $options["dest"] .= basename($source); + } else { + $new = true; + $existing_col = true; + } + } + } + + if (!$new) { + if ($options["overwrite"]) { + $stat = $this->DELETE(array("path" => $options["dest"])); + if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) { + return $stat; + } + } else { + return "412 precondition failed"; + } + } + + if ($del) { + if (!rename($source, $dest)) { + return "500 Internal server error"; + } + $destpath = $this->_unslashify($options["dest"]); + } else { + if (is_dir($source)) { + $files = System::find($source); + $files = array_reverse($files); + } else { + $files = array($source); + } + + if (!is_array($files) || empty($files)) { + return "500 Internal server error"; + } + + + foreach ($files as $file) { + if (is_dir($file)) { + $file = $this->_slashify($file); + } + + $destfile = str_replace($source, $dest, $file); + + if (is_dir($file)) { + if (!file_exists($destfile)) { + if (!is_writeable(dirname($destfile))) { + return "403 Forbidden"; + } + if (!mkdir($destfile)) { + return "409 Conflict"; + } + } else if (!is_dir($destfile)) { + return "409 Conflict"; + } + } else { + + if (!copy($file, $destfile)) { + return "409 Conflict"; + } + } + } + + } + + return ($new && !$existing_col) ? "201 Created" : "204 No Content"; + } + + /** + * PROPPATCH method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function PROPPATCH(&$options) + { + // No additional properties + return "403 Forbidden"; + } + + + /** + * LOCK method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function LOCK(&$options) + { + global $CFG, $db; + + // get absolute fs path to requested resource + $fspath = $this->base . $this->_cleanpath($options["path"]); + + // TODO recursive locks on directories not supported yet + // makes litmus test "32. lock_collection" fail + if (is_dir($fspath) && !empty($options["depth"])) { + return "409 Conflict"; + } + + $options["timeout"] = time()+300; // 5min. hardcoded + + // Sanitise input values we'll use + $options['path'] = addslashes($options['path']); + if (isset($options['update'])) { + $options['update'] = addslashes($options['update']); + } + if (isset($options['locktoken'])) { + $options['locktoken'] = addslashes($options['locktoken']); + } + + if (isset($options["update"])) { // Lock Update + $where = " path = '{$options[path]}' AND token = '{$options[update]}'"; + if (get_records_where('webdav_locks', $where)) { + $query = "UPDATE {$CFG->prefix}webdav_locks + SET expiry = '{$options[timeout]}', + modified = ".time()." + WHERE $where"; + execute_sql($query,1); + + // martinl's notes: + // these here are a no-op... there's something odd + // about them + $options['owner'] = $row['owner']; + $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared"; + $options['type'] = $row["exclusivelock"] ? "write" : "read"; + + return true; + } else { + return false; + } + } + + $newlock = new StdClass; + $newlock->token= $options['locktoken']; + $newlock->path = $options['path']; + $newlock->created = time(); + $newlock->modified = time(); + $newlock->expiry = $options['timeout']; + $newlock->userid = $this->session['userid']; + $newlock->exclusivelock = ($options['scope'] === "exclusive" ? "1" : "0"); + if (!empty($options['owner'])) { + $newlock->owner = addslashes($options['owner']); + } + + if (insert_record('webdav_locks',$newlock)) { + return '200 OK'; + } else { + return "409 Conflict"; + } + } + + /** + * UNLOCK method handler + * + * @param array general parameter passing array + * @return bool true on success + */ + function UNLOCK(&$options) + { + global $db; + + $res = delete_records('webdav_locks', + 'path', addslashes($options['path']), + 'token',addslashes($options['token'])); + return $db->Affected_Rows() ? "204 No Content" : "409 Conflict"; + } + + /** + * checkLock() helper + * + * @param string resource path to check for locks + * @return bool true on success + */ + function checkLock($path) + { + global $CFG; + + $result = false; + + $path = addslashes($path); + $sql = "SELECT l.exclusivelock, l.token, l.created, + l.modified, l.expiry, l.owner, + u.username + FROM {$CFG->prefix}webdav_locks l + LEFT OUTER JOIN {$CFG->prefix}user u + ON l.userid=u.id + WHERE l.path='{$path}'"; + $lock = get_record_sql($sql); + if ($lock) { + $result = array( "type" => "write", + "scope" => $lock->exclusivelock ? "exclusive" : "shared", + "depth" => 0, + "owner" => empty($lock->owner) ? $lock->username : $lock->owner, + "token" => $lock->token, + "created" => $lock->created, + "modified" => $lock->modified, + // WebDAV protocol calls it 'expires' + // but all expiries in Moodle are called 'expiry' + "expires" => $lock->expiry + ); + } + return $result; + } + + /* + * Ensure that a client-provided path is consistent - + * it should have no doubled-up slashes. If it's a directory, it + * may still have a trailing slash or not. + * + * @param string path + * @return string path + */ + + function _cleanpath($path) { + $path = preg_replace(':/+:', '/', $path); // collapse doubled-up slashes + return ($path); + } + +} + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode:nil + * End: + */ |