X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/54b9d43e43e2d6ab2212ba9abbac04290de925e0..HEAD:/gui/rpc/zfs.inc

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index 7a6b364..22011e4 100644
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -31,6 +31,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$this->registermethod("getSharedParams");
 		$this->registermethod("createShare");
 		$this->registermethod("getObjectDetails");
+		$this->registermethod("expandPool");
 	}
 
 	public function addPool($params, $context) {
@@ -44,7 +45,8 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 				  "force":{"type":"boolean"},
 				  "mountpoint":{"type":"string"},
 				  "name":{"type":"string"},
-				  "devices":{"type":"string"}
+				  "devices":{"type":"string"},
+				  "diskpath":{"type":"boolean"}
 			  }
 		  }');
 		switch ($params['pooltype']) {
@@ -76,14 +78,23 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$opts .= "-m " . $params['mountpoint'] . " ";
 		}
 
-		//Use /dev/disk/by-path as deafult when creating new pools as suggested in ZoL FAQ.
 		$disks = preg_split("/[,;]/", $params['devices']);
-		if (file_exists("/dev/disk/by-path/")) {
-			$tmp_disks = array();
-			foreach ($disks as $disk) {
-				$tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+		foreach ($disks as $disk) {
+			OMVModuleZFSUtil::setGPTLabel($disk);
+		}
+		//Use /dev/disk/by-path as suggested in ZoL FAQ.
+		if ($params['diskpath']) {
+			try {
+				if (file_exists("/dev/disk/by-path/")) {
+					$tmp_disks = array();
+					foreach ($disks as $disk) {
+						$tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+					}
+					$disks = $tmp_disks;
+				}
+			} catch (OMVModuleZFSException $e) {
+				//Do nothing if an excpetion is thrown
 			}
-			$disks = $tmp_disks;
 		}
 
 		$vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
@@ -125,16 +136,26 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["filesystem","snapshot",' .
-					'"volume"]},
+					'"volume","clone"]},
 				  "path":{"type":"string"},
 				  "name":{"type":"string"},
-				  "size":{"type":"string"}
+				  "size":{"type":"string"},
+				  "clonename":{"type":"string"},
+				  "mountpoint":{"type":"string"}
 			  }
 		  }');
 		switch ($params['type']) {
+		case "clone":
+			$tmp = new OMVModuleZFSSnapshot($params['path']);
+			$tmp->clonesnap($params['clonename']);
+			break;
 		case "filesystem":
 			$name = $params['path'] . "/" . $params['name'];
 			$tmp = new OMVModuleZFSDataset($name);
+			if (strlen($params['mountpoint']) > 0) {
+				$properties = array("mountpoint"=>$params['mountpoint']);
+				$tmp->setProperties($properties);
+			}
 			break;
 		case "snapshot":
 			$name = $params['path'] . "@" . $params['name'];
@@ -158,7 +179,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
-					'"Volume","Clone","Pool"]},
+					'"Volume","Pool"]},
 				  "name":{"type":"string"}
 			  }
 		  }');
@@ -170,10 +191,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$tmp = new OMVModuleZFSDataset($name);
 			$tmp->destroy();
 			break;
-		case "Clone":
-			$tmp = new OMVModuleZFSDataset($name);
-			$tmp->destroy();
-			break;
 		case "Snapshot":
 			$tmp = new OMVModuleZFSSnapshot($name);
 			$tmp->destroy();
@@ -190,8 +207,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "' and type='zfs']";
 			$object = $xmlConfig->get($xpath);
 			$xmlConfig->delete($xpath);
-			$dispatcher = &OMVNotifyDispatcher::getInstance();
-			$dispatcher->notify(OMV_NOTIFY_DELETE,"org.openmediavault.system.fstab.mntent", $object);
 			OMVModuleZFSUtil::clearZFSLabel($disks);
 			break;
 		default:
@@ -218,7 +233,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$name = $params['name'];
 		switch ($params['type']) {
 		case "Filesystem":
-		case "Clone":
 			$tmp = new OMVModuleZFSDataset($name);
 			break;
 		case "Snapshot":
@@ -253,7 +267,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			"type":"object",
 				"properties":{
 					"type":{"type":"string","enum":["Filesystem","Snapshot",' .
-						'"Volume","Clone","Pool"]},
+						'"Volume","Pool"]},
 					"name":{"type":"string"},
 					"properties":{"type":"array","items":{
 						"type":"object",
@@ -262,10 +276,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 							"value":{"type":"string"}}}}
 				}
 		}');
-		$objects = array();
+		global $xmlConfig;
 		switch ($params['type']) {
 		case "Filesystem":
-		case "Clone":
 			$tmp = new OMVModuleZFSDataset($params['name']);
 			break;
 		case "Snapshot":
@@ -282,9 +295,14 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			break;
 		}
 		foreach ($params['properties'] as $property) {
+			unset($objects);
+			$objects = array();
 			$objects[$property['property']] = $property['value'];
+			$tmp->setProperties($objects);
+			if ((strcmp($property['property'], "mountpoint") === 0) && (strcmp($params['type'], "Filesystem") === 0)) {
+				OMVModuleZFSUtil::relocateFilesystem($params['name']);
+			}
 		}
-		$tmp->setProperties($objects);
 	}
 
 	public function inherit($params, $context) {
@@ -294,7 +312,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
-					'"Volume","Clone","Pool"]},
+					'"Volume","Pool"]},
 				  "name":{"type":"string"},
 				  "property":{"type":"string"}
 			  }
@@ -312,7 +330,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$this->updateBgProcStatus($bgStatusFilename, "outputfilename", $bgOutputFilename);
 			switch ($params['type']) {
 			case "Filesystem":
-			case "Clone":
 				$tmp = new OMVModuleZFSDataset($params['name']);
 				break;
 			case "Snapshot":
@@ -348,10 +365,10 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  }
 		  }');
 		$objects = array();
-		$ds = new OMVModuleZFSDataset($params['name']);
-		$mountpoint = $ds->getMountPoint();
+		//$ds = new OMVModuleZFSDataset($params['name']);
+		//$mountpoint = $ds->getMountPoint();
 		return array(
-			"mountpoint" => $mountpoint,
+			//"mountpoint" => $mountpoint,
 			"name" => $params['name'],
 			"type" => $params['type']);
 	}
@@ -364,7 +381,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			  "type":"object",
 			  "properties":{
 				  "name":{"type":"string"},
-				  "type":{"type":"string","enum":["Filesystem","Clone"]},
+				  "type":{"type":"string","enum":["Filesystem"]},
 				  "sharename":{'.$GLOBALS['OMV_JSONSCHEMA_SHARENAME'].'},
 				  "comment":{"type":"string"},
 				  "mode":{"type":"string","enum":["700","750","755",'.
@@ -372,37 +389,42 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 				  "mountpoint":{"type":"string"}
 			  }
 		  }');
-
-		//Get the UUID of the Pool
-		$poolname = OMVModuleZFSUtil::getPoolname($params['name']);
-		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
-
-		//Get the mntent object and fetch it's uuid.
-		$xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']";
-		$mountpoint = $xmlConfig->get($xpath);
-		$mntentref = $mountpoint['uuid'];
-
+		
+   		// The field 'reldirpath' may not contain the characters '..'. This
+	    // is because of security reasons: the given canonicalized absolute
+	    // path MUST be below the given mount point.
+	    if(1 == preg_match("/\.\./", $params['mountpoint'])) {
+	    	throw new OMVException(OMVErrorMsg::E_RPC_SERVICE_METHOD_INVALID_PARAMS,
+				sprintf(gettext("The field '%s' contains forbidden two-dot symbols"), "mountpoint"));
+		}
+	
 		// Prepare the configuration object. Use the name of the shared
 		// folder as the relative directory name of the share.
 		switch ($params['type']) {
 		case "Filesystem":
 			$tmp = new OMVModuleZFSDataset($params['name']);
 			break;
-		case "Clone":
-			$tmp = new OMVModuleZFSDataset($params['name']);
-			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 			break;
 		}
 
+		$poolname = OMVModuleZFSUtil::getPoolname($params['name']);
+		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
+		$dir = $tmp->getMountPoint();
+
+		//Get the mntent object and fetch it's uuid.
+		$xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "' and dir='" . $dir . "' and type='zfs']";
+		$mountpoint = $xmlConfig->get($xpath);
+		$mntentref = $mountpoint['uuid'];
+		
 		$uuid = OMVUtil::uuid();
-		$pathName = $tmp->getMountPoint();
-		$reldirpath = OMVModuleZFSUtil::getReldirpath($pathName);
+		$pathName = $dir . "/" . trim($params['mountpoint'], "/");
+		$reldirpath = trim($params['mountpoint'], "/");
 		$object = array(
 			"uuid" => $uuid,
 			"name" => $params['sharename'],
-			"comment" => $params['comment'],
+			"comment" => $params['comment'] . "*** ZFS share on " . $params['name'] . " ***",
 			"mntentref" => $mntentref,
 			"reldirpath" => $reldirpath
 		);
@@ -436,6 +458,24 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$object['mode'] = $params['mode'];
 		}
 
+		// Create the shared folder directory if necessary.
+		if(FALSE === file_exists($pathName)) {
+		// Create the directory. Note, the function seems to have a bug
+		// when using the mask parameter. E.g. octdec("777") does not
+		// create the correct permissions as expected, thus change the
+		// mode using chmod.
+			if(FALSE === mkdir($pathName, 0700, TRUE)) {
+				throw new OMVException(OMVErrorMsg::E_MISC_FAILURE,
+					sprintf("Failed to create the directory '%s'", $pathName));
+			}
+			// Change the directory mode.
+			if(FALSE === chmod($pathName, octdec($object['mode']))) {
+				throw new OMVException(OMVErrorMsg::E_MISC_FAILURE,
+					sprintf("Failed to set file mode to '%s' for '%s'",
+					$object['mode'], $pathName));
+			}
+		}
+		
 		// Change group owner of directory to configured default group,
 		// e.g. 'users'.
 		if(FALSE === chgrp($pathName, $GLOBALS['OMV_USERMGMT_DEFAULT_GROUP'])) {
@@ -486,8 +526,18 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$cmd = "zfs get all {$params['name']}";
 			break;
 		case "Pool":
-			$output .= "Pool details (zpool get all):\n\r\n\r";
+			$output .= "Pool status (zpool status):\n\r\n\r";
+			$cmd = "zpool status {$params['name']}";
+			OMVModuleZFSUtil::exec($cmd,$out,$res);
+			$output .= implode("\n\r", $out);
+			unset($out);
+			$output .= "\n\r\n\rPool details (zpool get all):\n\r\n\r";
 			$cmd = "zpool get all {$params['name']}";
+			OMVModuleZFSUtil::exec($cmd,$out,$res);
+			$output .= implode("\n\r", $out);
+			unset($out);
+			$output .= "\n\r\n\rPool filesystem details (zfs get all):\n\r\n\r";
+			$cmd = "zfs get all {$params['name']}";
 			break;
 		default:
 			throw new OMVModuleZFSException("Incorrect type provided");
@@ -496,6 +546,69 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$output .= implode("\n\r", $out);
 		return array("details" => $output);
 	}
+	
+	public function expandPool($params, $context) {
+		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
+		// Validate the parameters of the RPC service method.
+		$this->validateMethodParams($params, '{
+			  "type":"object",
+			  "properties":{
+				  "vdevtype":{"type":"string","enum":["basic","mirror",' .
+					'"raidz1","raidz2","raidz3"]},
+				  "name":{"type":"string"},
+				  "devices":{"type":"string"},
+				  "force":{"type":"boolean"},
+				  "diskpath":{"type":"boolean"}
+			  }
+		}');
+		$pool = new OMVModuleZFSZpool($params['name']);
+		switch ($params['vdevtype']) {
+		case "basic":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSPLAIN;
+			break;
+		case "mirror":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSMIRROR;
+			break;
+		case "raidz1":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ1;
+			break;
+		case "raidz2":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ2;
+			break;
+		case "raidz3":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ3;
+			break;
+		default:
+			throw new OMVModuleZFSException("Incorrect pool type specified");
+			break;
+		}
+		if ($params['force']) {
+			$opts .= "-f ";
+		}
+		$disks = preg_split("/[,;]/", $params['devices']);
+		foreach ($disks as $disk) {
+			OMVModuleZFSUtil::setGPTLabel($disk);
+		}
+		//Use /dev/disk/by-path as suggested in ZoL FAQ.
+		if ($params['diskpath']) {
+			try {
+				if (file_exists("/dev/disk/by-path/")) {
+					$tmp_disks = array();
+					foreach ($disks as $disk) {
+						$tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+					}
+					$disks = $tmp_disks;
+				}
+			} catch (OMVModuleZFSException $e) {
+				//Do nothing if an exception is thrown
+			}
+		}
+		$vdev[] = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
+		$pool->addVdev($vdev, $opts);
+		//Ugly fix to solve the problem of blkid not displaying info on newly created pools
+		$pool->export();
+		$pool->import($pool->getName());
+	}
 }
 
 // Register the RPC service.