tRNG test added

Author: root

install/install.php

@@ -174,6 +174,8 @@
 //** Select installation mode
 $install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard','install_mode');
 
+//** tRNG dependencies
+$conf['tRNG']='';
 
 //** Get the hostname
 $tmp_out = array();
@@ -428,9 +430,7 @@
 		swriteln('Configuring BIND');
 		$inst->configure_bind();
 		$conf['services']['dns'] = true;
-		if(!is_installed('haveged')) {
-			swriteln("[INFO] haveged not detected - DNSSEC can fail");
-		}
+		$conf['tRNG'] .= 'DNSSEC with BIND, ';
 	}
 	//* Configure MyDNS
 	if($conf['mydns']['installed']) {
@@ -623,6 +623,8 @@
 if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
 if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
 
+//* test tRNG
+if($conf['tRNG']) tRNG();
 
 $inst->create_mount_script();
 

install/lib/install.lib.php

@@ -948,4 +948,14 @@ function getapachemodules() {
 	return $modules;
 }
 
+function tRNG(){
+	global $conf;
+	$path='/dev/random';$test='/tmp/ispconfig.tRNG';$time=8;$warn=8192;
+	echo "Testing $time seconds throughput of $path ...";
+	exec("cat $path > $test & PID=\$!; sleep $time; kill \$PID");
+	if(($result=filesize($test)) < $warn) {
+		echo "\n[WARN] these services may fail: {$conf['tRNG']}result: $result bytes, minimum recommended: $warn\n";
+	}else echo " OK\n";
+	unlink($test);
+}
 ?>

install/update.php

@@ -139,6 +139,9 @@
 include_once 'dist/lib/'.$dist['id'].'.lib.php';
 include_once 'dist/conf/'.$dist['confid'].'.conf.php';
 
+//** tRNG dependencies
+$conf['tRNG']='';
+
 //** Get hostname
 exec('hostname -f', $tmp_out);
 $conf['hostname'] = $tmp_out[0];
@@ -407,9 +410,7 @@
 		} elseif($conf['bind']['installed'] == true) {
 			swriteln('Configuring BIND');
 			$inst->configure_bind();
-			if(!is_installed('haveged')) {
-				swriteln("[INFO] haveged not detected - DNSSEC can fail");
-			}
+			$conf['tRNG'] .= 'DNSSEC with BIND, ';
 		} else {
 			swriteln('Configuring MyDNS');
 			$inst->configure_mydns();
@@ -570,6 +571,9 @@
 //* Set default servers
 setDefaultServers();
 
+//* test tRNG
+if($conf['tRNG']) tRNG();
+
 $inst->create_mount_script();
 
 //* Create md5 filelist