Add ability to control Server: response header #1945

This change:

  1. Adds ability for an admin to set custom response header for `Server:`
  2. Fixes displaying of running Webmin version for unauthenticated user

acl/edit_user.cgi

@@ -207,7 +207,7 @@ if ($access{'lang'}) {
 if ($access{'locale'}) {
 	# Current locale
 	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
-	if (!$@) {
+	if (!$@ && $] > 5.011) {
 		my $locales = &list_locales();
 		my %localesrev = reverse %{$locales};
 		my $locale_auto = &parse_accepted_language();

apache/core.pl

@@ -1041,7 +1041,7 @@ sub edit_LimitRequestBody
 {
 return (1, $text{'core_maxbody'},
 	&opt_input($_[0]->{'value'}, "LimitRequestBody", $text{'core_default'}, 8)
-		.$text{'bytes'});
+		.&ui_space(2).$text{'bytes'});
 }
 sub save_LimitRequestBody
 {
@@ -1052,7 +1052,7 @@ sub edit_LimitXMLRequestBody
 {
 return (1, $text{'core_maxxml'},
 	&opt_input($_[0]->{'value'}, "LimitXMLRequestBody",
-		   $text{'core_default'}, 8).$text{'bytes'});
+		   $text{'core_default'}, 8).&ui_space(2).$text{'bytes'});
 }
 sub save_LimitXMLRequestBody
 {

apache/lang/en

@@ -637,6 +637,7 @@ mod_proxy_preserve=Preserve original Host: header
 mod_proxy_timeout=Proxy request timeout in seconds
 mod_proxy_etimeout=Proxy request timeout must be a number of seconds
 mod_proxy_via=Set Via: headers
+mod_proxy_preserve=Preserve original HTTP host
 mod_proxy_not=None
 
 mod_log_agent_default=Default

apache/mod_proxy.pl

@@ -25,6 +25,7 @@ $rv = [ [ 'ProxyRequests', 0, 13, 'virtual', undef, 11 ],
 	[ 'ProxyMaxForwards', 0, 13, 'virtual', 2.0 ],
 	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.031 ],
 	[ 'ProxyTimeout', 0, 13, 'virtual', 2.031 ],
+	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.3 ],
 	[ 'ProxyVia', 0, 13, 'virtual', 2.0 ] ];
 return &make_directives($rv, $_[0], "mod_proxy");
 }
@@ -291,7 +292,16 @@ sub save_ProxyVia
 return &parse_choice("ProxyVia", "");
 }
 
-
+sub edit_ProxyPreserveHost
+{
+return (1, $text{'mod_proxy_preserve'},
+	&choice_input($_[0]->{'value'}, "ProxyPreserveHost", "",
+	      "$text{'yes'},on", "$text{'no'},off", "$text{'default'},"));
+}
+sub save_ProxyPreserveHost
+{
+return &parse_choice("ProxyPreserveHost", "");
+}
 
 1;
 

apache/mod_suexec.pl

@@ -13,6 +13,7 @@ sub edit_SuexecUserGroup
 local $rv;
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=1 %s> %s\n",
 		$_[0] ? "" : "checked", $text{'suexec_none'};
+$rv .= &ui_newline();
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=0 %s>\n",
 		$_[0] ? "checked" : "";
 $rv .= sprintf "%s <input name=SuexecUserGroup_u size=8 value='%s'> %s\n",

bind8/bind8-lib.pl

@@ -65,10 +65,10 @@ our @dnssec_dlv_key = ( 257, 3, 5, '"BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWE
 
 my $rand_flag;
 if ($gconfig{'os_type'} =~ /-linux$/ && 
+    $config{'force_random'} eq '0' &&
     -r "/dev/urandom" &&
-    !$config{'force_random'} &&
-    $bind_version &&
-    &compare_version_numbers($bind_version, '9.14') < 0) {
+    $bind_version =~ /^9\./ &&
+    &compare_version_numbers($bind_version, '<', '9.14.2')) {
 	# Version: 9.14.2 deprecated the use of -r option 
 	# in favor of using /dev/random [bugs:#5370]
 	$rand_flag = "-r /dev/urandom";

bind8/edit_master.cgi

@@ -17,6 +17,14 @@ my $dom = $zone->{'name'};
 &ui_print_header(&zone_subhead($zone), $text{'master_title'}, "",
 		 undef, undef, undef, undef, &restart_links($zone));
 
+my $d = &get_virtualmin_domains($dom);
+if ($d && $d->{'alias'}) {
+	print &ui_alert_box($text{'master_vminalias'}, 'danger');
+	}
+elsif ($d) {
+	print &ui_alert_box($text{'master_vmin'}, 'warn');
+	}
+
 # Find the record types
 my (@rcodes, @recs);
 if (!$config{'largezones'}) {

bind8/lang/en

@@ -147,6 +147,8 @@ master_defttl=Default time-to-live for records
 master_edefttl='$1' is not a valid default time-to-live for records
 master_esoagone=No SOA record found!
 master_einclude=Additional template file does not exist
+master_vmin=This zone is managed by Virtualmin. Records should be edited using the Virtualmin UI, to ensure they are consistent with other virtual server settings.
+master_vminalias=This zone is an alias of a Virtualmin domain, which is kept in sync with it's target. Records should never be edited here, as any changes will be overwritten!
 
 delete_title=Delete Zone
 delete_mesg=Are you sure you want to delete the zone $1 ? All records and the zone file will be deleted.

change-user/index.cgi

@@ -59,9 +59,9 @@ if ($access{'lang'}) {
 
 # Old datetime format or a new locale
 if ($access{'locale'}) {
-	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
 	&foreign_require('webmin');
-	if (!$@) {
+	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
+	if (!$@ && $] > 5.011) {
         my $locales = &list_locales();
         my %localesrev = reverse %{$locales};
         my $locale = $locale_auto || $gconfig{'locale'} || &get_default_system_locale();

cron/cron-lib.pl

@@ -925,7 +925,7 @@ $table .= &ui_columns_row(\@cols, [ "valign=top", "valign=top", "valign=top",
 				    "valign=top", "valign=top" ]);
 $table .= &ui_columns_end();
 $table .= $text{'edit_ctrl'};
-$rv .= &ui_table_row(undef, $table, $width);
+$rv .= &ui_table_row(undef, $table, $width, undef, ['data-schedule-tr']);
 return $rv;
 }
 

dhcpd/dhcpd-lib.pl

@@ -74,12 +74,12 @@ open(FILE, "<".$_[0]);
 while($line = <FILE>) {
 	# strip comments
 	$line =~ s/\r|\n//g;
+	$line =~ s/([^\\])\\"/$1\\042/g;	# convert escaped quotes to \042
 	$line =~ s/^([^"#]*)#.*$/$1/g;
 	$line =~ s/^([^"]*)\/\/.*$/$1/g;
 	$line =~ s/^([^"]*)\s+#.*$/$1/g;	# remove stuff after #, unless
 	$line =~ s/^(.*".*".*)\s+#.*$/$1/g;	#  it is inside quotes
 	$line =~ s/\\\\/\\134/g;		# convert \\ into \134
-	$line =~ s/([^\\])\\"/$1\\042/g;	# convert escaped quotes to \042
 	while(1) {
 		if (!$cmode && $line =~ /\/\*/ && $line !~ /\".*\/\*.*\"/) {
 			# start of a C-style comment

file/xinha

@@ -1 +0,0 @@
-../mailboxes/xinha