test/bugfixing this MR

Author: jnorell

interface/web/sites/form/web_vhost_domain.tform.php

@@ -1047,7 +1047,7 @@
 				'formtype' => 'TEXT',
 				'default' => '',
 				'validators' => array(  0 => array ('type' => 'REGEX',
-								'regex' => '/^[a-zA-Z0-9\-\_\ ]{1,512}$/',
+								'regex' => '/^[a-zA-Z0-9\-\_\ ]*$/',
 								'errmsg'=> 'jailkit_chroot_app_sections_error_regex'),
 				),
 				'value' => '',
@@ -1059,7 +1059,7 @@
 				'formtype' => 'TEXT',
 				'default' => '',
 				'validators' => array(  0 => array('type' => 'REGEX',
-								'regex' => '/^[a-zA-Z0-9\.\-\_\/\ ]{1,}$/',
+								'regex' => '/^[a-zA-Z0-9\.\-\_\/\ ]*$/',
 								'errmsg'=> 'jailkit_chroot_app_programs_error_regex'),
 				),
 				'value' => '',

interface/web/sites/templates/web_vhost_domain_advanced.htm

@@ -130,13 +130,6 @@
     <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br>&nbsp;{tmpl_var name="proxy_directive_snippets_txt"}
   </div>
 </div>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<div class="clear">
-  <div class="right">
-    <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="sites/web_vhost_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
-    <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-  </div>
-</div>
 <div class="jailkit">
   <div class="form-group">
     <label class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
@@ -157,6 +150,13 @@
     </div>
   </div>
 </div>
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
+<div class="clear">
+  <div class="right">
+    <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="sites/web_vhost_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
+    <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+  </div>
+</div>
 
 <script language="JavaScript" type="text/javascript">
   var webId = jQuery('input[name="id"]').val();

server/lib/classes/system.inc.php

@@ -2351,15 +2351,15 @@ public function create_jailkit_programs($home_dir, $programs = array(), $options
 		# prohibit ill-advised copying paths known to be sensitive/problematic
 		# (easy to bypass if needed, eg. use /./etc)
 		$blacklisted_paths_regex = array(
-			'|^/$|',
-			'|^/proc(/.*)?$|',
-			'|^/sys(/.*)?$|',
-			'|^/etc/?$|',
-			'|^/dev/?$|',
-			'|^/tmp/?$|',
-			'|^/run/?$|',
-			'|^/boot/?$|',
-			'|^/var(/?|/backups?/?)?$|',
+			'@^/$@',
+			'@^/proc(/.*)?$@',
+			'@^/sys(/.*)?$@',
+			'@^/etc/?$@',
+			'@^/dev/?$@',
+			'@^/tmp/?$@',
+			'@^/run/?$@',
+			'@^/boot/?$@',
+			'@^/var(/?|/backups?/?)?$@',
 		);
 
 		$program_args = '';
@@ -2460,8 +2460,10 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 				continue;
 			}
 
+			$this->remove_broken_symlinks($dir, true);
+
 			// save list of hardlinked files
-			if (!in_array($opts, 'hardlink') && !in_array($options, 'allow_hardlink')) {
+			if (!in_array('hardlink', $opts) && !in_array('allow_hardlink', $options)) {
                                 $find_multiple_links = function ( $path ) use ( &$find_multiple_links ) {
 					$found = array();
 					if (is_dir($path)) {
@@ -2487,6 +2489,7 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 				}
 			}
 
+			// remove broken symlinks a second time after hardlink cleanup
 			$this->remove_broken_symlinks($dir, true);
 		}
 
@@ -2497,7 +2500,7 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 			if (substr( $line, 0, 4 ) === "skip") {
 				continue;
 			}
-			if (preg_match('|^(? [^ ]+){6}(.+)$'.preg_quote($home_dir, '|').'|', $line, $matches)) {
+			if (preg_match('@^(? [^ ]+){6}(.+)'.preg_quote($home_dir, '@').'$@', $line, $matches)) {
 				# remove deprecated files that jk_update failed to remove
 				if (is_file($matches[1])) {
 $app->log("removing deprecated file which jk_update failed to remove:  ".$matches[1], LOGLEVEL_DEBUG);
@@ -2525,7 +2528,7 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 		}
 
 		// search for any hardlinked files which are now missing
-		if (!in_array($opts, 'hardlink') && !in_array($options, 'allow_hardlink')) {
+		if (!in_array('hardlink', $opts) && !in_array('allow_hardlink', $options)) {
 			foreach ($multiple_links as $file) {
 				if (!is_file($file)) {
 					// strip $home_dir from $file
@@ -2552,7 +2555,7 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 			$rewrite = false;
 			$jk_socketd_ini = $app->ini_parser->parse_ini_file('/etc/jailkit/jk_socketd.ini');
 			foreach ($jk_socketd_ini as $log => $settings) {
-				$jail = preg_replace('|/dev/log$|', '', $log);
+				$jail = preg_replace('@/dev/log$@', '', $log);
 				if ($jail != $log && !is_dir($jail)) {
 					unset($jk_socketd_ini[$log]);
 					$rewrite=true;