Merge branch 'master' of github.com:webmin/webmin

CHANGELOG.md

@@ -19,10 +19,12 @@
 * Fix unsafe decoding of Outlook `winmail.dat` attachments
 * Fix Certbot standalone port conflicts
 * Fix to correctly preserve full quoted action parameters in the Fail2Ban jail editor [#2647](https://github.com/webmin/webmin/issues/2647)
+* Fix Fail2Ban default jail options to preserve required timing defaults when saving
 * Fix ZFS to fall back to `df` when disk space cannot be computed from `zpool`
 * Fix to allow toggling process priority and I/O controls on or off
 * Fix issue where disabled email notifications were still being processed
 * Update Authentic theme to the latest version with various improvements and fixes:
+  - Upgrade stats history graphs from laggy SVG to a blazing-fast canvas renderer
   - Add option to control corner roundness for the menu, content area and right-side slider
   - Change the content area to use rounded corners and a margin by default
   - Fix message of the day display in login page correctly [webmin#2555](https://github.com/webmin/webmin/issues/2685)

fail2ban/edit_jaildef.cgi

@@ -22,23 +22,23 @@ print &ui_table_start($text{'jaildef_header'}, undef, 2);
 # Matches needed
 my $def_maxretry = 3;
 my $maxretry = &find_value("maxretry", $jail);
+$maxretry = $def_maxretry if (!defined($maxretry) || $maxretry eq "");
 print &ui_table_row($text{'jail_maxretry'},
-	&ui_opt_textbox("maxretry", $maxretry, 6,
-			$text{'default'}." (".$def_maxretry.")"));
+	&ui_textbox("maxretry", $maxretry, 3));
 
 # Time to scan over
 my $def_findtime = 600;
 my $findtime = &find_value("findtime", $jail);
+$findtime = $def_findtime if (!defined($findtime) || $findtime eq "");
 print &ui_table_row($text{'jail_findtime'},
-	&ui_opt_textbox("findtime", $findtime, 6,
-			$text{'default'}." (".$def_findtime.")"));
+	&ui_textbox("findtime", $findtime, 5));
 
 # Time to ban for
 my $def_bantime = 600;
 my $bantime = &find_value("bantime", $jail);
+$bantime = $def_bantime if (!defined($bantime) || $bantime eq "");
 print &ui_table_row($text{'jail_bantime'},
-	&ui_opt_textbox("bantime", $bantime, 6,
-			$text{'default'}." (".$def_bantime.")"));
+	&ui_textbox("bantime", $bantime, 5));
 
 # IPs to ignore
 my $def_ignoreip = "127.0.0.1";

fail2ban/save_jaildef.cgi

@@ -33,8 +33,13 @@ foreach my $ip (@ignoreips) {
 
 # Update the jail
 &lock_all_config_files();
+my %defaults = (
+	'maxretry' => 3,
+	'findtime' => 600,
+	'bantime' => 600,
+	);
 foreach my $f ("maxretry", "findtime", "bantime") {
-	&save_directive($f, $in{$f."_def"} ? undef : $in{$f}, $jail);
+	&save_directive($f, $in{$f."_def"} ? $defaults{$f} : $in{$f}, $jail);
 	}
 &save_directive("ignoreip", @ignoreips ? join(" ", @ignoreips) : undef, $jail);
 &save_directive("backend", $in{'backend'} || undef, $jail);

nftables/nftables-lib.pl

@@ -2024,13 +2024,20 @@ foreach my $r (@{$table->{'rules'}}) {
 return;
 }
 
+# nftables_save_header()
+# Returns the generated-file header for saved rules
+sub nftables_save_header
+{
+return "# This file was auto-generated by the module.\n".
+       "# Manual changes may be overwritten.\n\n";
+}
 
 # dump_nftables_save(@tables)
 # Returns a string representation of the firewall rules
 sub dump_nftables_save
 {
 my (@tables) = @_;
-my $rv;
+my $rv = nftables_save_header();
 foreach my $t (@tables) {
 	if ($t->{'family'}) {
 		$rv .= "table $t->{'family'} $t->{'name'} {\n";

proc/linux-lib.pl

@@ -635,7 +635,7 @@ if (&has_command("sensors")) {
             next if ($cpu_aux && !$cpu_unnamed);
 
             # CPU types
-            ($cpu_broadcom) = $_ =~ /cpu_thermal-virtual-[\d]+/i if (!$cpu_broadcom);
+            ($cpu_broadcom) = $_ =~ /(cpu|soc)_thermal-virtual-[\d]+/i if (!$cpu_broadcom);
             ($cpu_amd)      = $_ =~ /\w[\d]{2}temp-pci/i         if (!$cpu_amd);
 
             # Full CPU output #1253

xterm/rc/.bashrc

@@ -53,3 +53,17 @@ if [ -d ~/.bashrc.d ]; then
     done
 fi
 unset rc
+
+# set XDG_RUNTIME_DIR and DBUS_SESSION_BUS_ADDRESS if not set
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+    uid=$(id -u)
+    xdg_runtime_dir="/run/user/$uid"
+
+    if [ -d "$xdg_runtime_dir" ] && [ -O "$xdg_runtime_dir" ] && \
+       [ -S "$xdg_runtime_dir/bus" ]; then
+        export XDG_RUNTIME_DIR="$xdg_runtime_dir"
+        export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+    fi
+
+    unset uid xdg_runtime_dir
+fi

xterm/rc/.zshrc

@@ -22,3 +22,17 @@ fi
 if [ -f ~/.zshrc ]; then
     . ~/.zshrc
 fi
+
+# set XDG_RUNTIME_DIR and DBUS_SESSION_BUS_ADDRESS if not set
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+    uid=$(id -u)
+    xdg_runtime_dir="/run/user/$uid"
+
+    if [ -d "$xdg_runtime_dir" ] && [ -O "$xdg_runtime_dir" ] && \
+       [ -S "$xdg_runtime_dir/bus" ]; then
+        export XDG_RUNTIME_DIR="$xdg_runtime_dir"
+        export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+    fi
+
+    unset uid xdg_runtime_dir
+fi