- added fuser calls to unmount directoriies more securely

Marius Cramer · Marius Cramer · commit dc679e382b6f · 2015-06-26T18:00:42.000+02:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -594,6 +594,7 @@ function update($event_name, $data) {
 				}
 				
 				//* Unmount the old log directory bfore we move the log dir
+				exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
 				exec('umount '.escapeshellcmd($old_dir.'/log'));
 
 				//* Create new base directory, if it does not exist yet
@@ -676,6 +677,7 @@ function update($event_name, $data) {
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 
 			//* Unmount log directory
+			exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 		}
 
@@ -1900,10 +1902,12 @@ function delete($event_name, $data) {
 			if(is_array($log_folders) && !empty($log_folders)){
 				foreach($log_folders as $log_folder){
 					//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+					exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 					exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 				}
 			} else {
 				//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+				exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 				exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 			}
 		}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -475,6 +475,7 @@ function update($event_name, $data) {
 				}
 				
 				//* Unmount the old log directory bfore we move the log dir
+				exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
 				exec('umount '.escapeshellcmd($old_dir.'/log'));
 
 				//* Create new base directory, if it does not exist yet
@@ -557,6 +558,7 @@ function update($event_name, $data) {
 			$app->system->removeLine('/etc/fstab', $fstab_line);
 
 			//* Unmount log directory
+			exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 			exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
 		}
 
@@ -1880,10 +1882,12 @@ function delete($event_name, $data) {
 			if(is_array($log_folders) && !empty($log_folders)){
 				foreach($log_folders as $log_folder){
 					//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+					exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 					exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 				}
 			} else {
 				//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
+				exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 				exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -594,6 +594,7 @@ function update($event_name, $data) {`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`//* Unmount the old log directory bfore we move the log dir`
	`597`	`+ exec('fuser -km '.escapeshellcmd($old_dir.'/log'));`
`597`	`598`	`exec('umount '.escapeshellcmd($old_dir.'/log'));`
`598`	`599`
`599`	`600`	`//* Create new base directory, if it does not exist yet`
`@@ -676,6 +677,7 @@ function update($event_name, $data) {`
`676`	`677`	`$app->system->removeLine('/etc/fstab', $fstab_line);`
`677`	`678`
`678`	`679`	`//* Unmount log directory`
	`680`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));`
`679`	`681`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));`
`680`	`682`	`}`
`681`	`683`
`@@ -1900,10 +1902,12 @@ function delete($event_name, $data) {`
`1900`	`1902`	`if(is_array($log_folders) && !empty($log_folders)){`
`1901`	`1903`	`foreach($log_folders as $log_folder){`
`1902`	`1904`	`//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));`
	`1905`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1903`	`1906`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1904`	`1907`	`}`
`1905`	`1908`	`} else {`
`1906`	`1909`	`//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));`
	`1910`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1907`	`1911`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1908`	`1912`	`}`
`1909`	`1913`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,7 @@ function update($event_name, $data) {`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`//* Unmount the old log directory bfore we move the log dir`
	`478`	`+ exec('fuser -km '.escapeshellcmd($old_dir.'/log'));`
`478`	`479`	`exec('umount '.escapeshellcmd($old_dir.'/log'));`
`479`	`480`
`480`	`481`	`//* Create new base directory, if it does not exist yet`
`@@ -557,6 +558,7 @@ function update($event_name, $data) {`
`557`	`558`	`$app->system->removeLine('/etc/fstab', $fstab_line);`
`558`	`559`
`559`	`560`	`//* Unmount log directory`
	`561`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));`
`560`	`562`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));`
`561`	`563`	`}`
`562`	`564`
`@@ -1880,10 +1882,12 @@ function delete($event_name, $data) {`
`1880`	`1882`	`if(is_array($log_folders) && !empty($log_folders)){`
`1881`	`1883`	`foreach($log_folders as $log_folder){`
`1882`	`1884`	`//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));`
	`1885`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1883`	`1886`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1884`	`1887`	`}`
`1885`	`1888`	`} else {`
`1886`	`1889`	`//if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));`
	`1890`	`+ exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1887`	`1891`	`exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');`
`1888`	`1892`	`}`
`1889`	`1893`	`}`