From 65f5beeb11314f51060120ab784749a4fa125501 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 21 Jun 2026 19:47:19 +0200
Subject: [PATCH] Add hardware RAID passthrough devices config

Add an opt-in SMART module config option for manually listing hardware RAID passthrough devices, expose configured physical disks to smartctl, and document the option.

https://github.com/webmin/webmin/issues/1704
---
 smart-status/config                        |  1 +
 smart-status/config.info                   |  1 +
 smart-status/config_info.pl                | 20 ++++++
 smart-status/help/config_raid_devices.html | 13 ++++
 smart-status/smart-status-lib.pl           | 76 ++++++++++++++++++++--
 5 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 smart-status/config_info.pl
 create mode 100644 smart-status/help/config_raid_devices.html

diff --git a/smart-status/config b/smart-status/config
index 2f395c4f9..f8954775b 100644
--- a/smart-status/config
+++ b/smart-status/config
@@ -2,3 +2,4 @@ smartctl=smartctl
 mode=1
 attribs=1
 ata=0
+raid_devices=
diff --git a/smart-status/config.info b/smart-status/config.info
index 877a82feb..1b71abcdd 100644
--- a/smart-status/config.info
+++ b/smart-status/config.info
@@ -3,3 +3,4 @@ attribs=Show all attributes,1,1-Yes,0-No
 smartctl=Full path to smartctl command,0
 ata=Force ATA query mode?,1,1-Yes,0-No
 extra=Extra command-line parameters to smartctl,3,None
+raid_devices=Hardware RAID passthrough devices,15,raid_devices
diff --git a/smart-status/config_info.pl b/smart-status/config_info.pl
new file mode 100644
index 000000000..d19d7a1d4
--- /dev/null
+++ b/smart-status/config_info.pl
@@ -0,0 +1,20 @@
+sub show_raid_devices
+{
+my ($value) = @_;
+$value ||= "";
+$value =~ s/\t/\n/g;
+my $placeholder = &quote_escape("/dev/sg0 cciss 0 3");
+return &ui_textarea("raid_devices", $value, 3, 60, undef, 0,
+		    "placeholder=\"$placeholder\"");
+}
+
+sub parse_raid_devices
+{
+my $value = $in{'raid_devices'} || "";
+$value =~ s/\r//g;
+$value =~ s/\n/\t/g;
+$value =~ s/\s+$//;
+return $value;
+}
+
+1;
diff --git a/smart-status/help/config_raid_devices.html b/smart-status/help/config_raid_devices.html
new file mode 100644
index 000000000..735794bad
--- /dev/null
+++ b/smart-status/help/config_raid_devices.html
@@ -0,0 +1,13 @@
+<header>Hardware RAID passthrough devices</header>
+
+This option can be used to add physical disks behind hardware RAID
+controllers when they are not detected automatically, but can be queried
+by <tt>smartctl</tt> through a passthrough device. Leave it empty unless
+you need to monitor disks behind such a controller. <p>
+
+For example, <tt>/dev/sg0 cciss 0 3</tt> adds three <tt>cciss</tt>
+physical disks numbered 0, 1 and 2 through the <tt>/dev/sg0</tt>
+passthrough device. The final value is the number of disks to add, not the
+last disk number. <p>
+
+<footer>
diff --git a/smart-status/smart-status-lib.pl b/smart-status/smart-status-lib.pl
index 72f482233..13f19e2e1 100755
--- a/smart-status/smart-status-lib.pl
+++ b/smart-status/smart-status-lib.pl
@@ -31,16 +31,18 @@ Returns a sorted list of disks that can support SMART.
 =cut
 sub list_smart_disks_partitions
 {
+my @rv;
 if (&foreign_check("fdisk")) {
-	return &list_smart_disks_partitions_fdisk();
+	@rv = &list_smart_disks_partitions_fdisk();
 	}
 elsif (&foreign_check("bsdfdisk")) {
-	return &list_smart_disks_partitions_bsdfdisk();
+	@rv = &list_smart_disks_partitions_bsdfdisk();
 	}
 elsif (&foreign_check("mount")) {
-	return &list_smart_disks_partitions_fstab();
+	@rv = &list_smart_disks_partitions_fstab();
 	}
-return ( );
+push(@rv, &list_configured_raid_disks());
+return &unique_smart_disks(@rv);
 }
 
 =head2 list_smart_disks_partitions_fdisk
@@ -220,6 +222,71 @@ while(1) {
 return $count;
 }
 
+=head2 list_configured_raid_disks()
+
+Returns SMART disk entries for manually configured hardware RAID passthrough
+devices. Each configured line is in device type first-disk disk-count format.
+
+=cut
+sub list_configured_raid_disks
+{
+my @rv;
+foreach my $line (split(/\t/, $config{'raid_devices'} || "")) {
+	$line =~ s/^\s+//;
+	$line =~ s/\s+$//;
+	next if (!$line || $line =~ /^#/);
+	my ($device, $type, $first, $count, $extra) = split(/\s+/, $line, 5);
+	next if (!$device || !$type ||
+		 !defined($first) || !defined($count) || defined($extra));
+	next if ($device !~ /^\/dev\/\S+$/);
+	next if ($type !~ /^[A-Za-z0-9_.+-]+$/);
+	next if ($first !~ /^\d+$/ || $count !~ /^\d+$/);
+	next if ($count < 1 || $count > 256);
+
+	for(my $i=$first; $i<$first+$count; $i++) {
+		push(@rv, { 'device' => $device,
+			    'prefix' => $device,
+			    'desc' => &configured_raid_disk_desc($type, $i),
+			    'type' => 'scsi',
+			    'subtype' => $type,
+			    'subdisk' => $i,
+			    'ids' => [ ],
+			    'manual' => 1 });
+		}
+	}
+return @rv;
+}
+
+=head2 configured_raid_disk_desc(type, subdisk)
+
+Returns a description for a manually configured hardware RAID disk.
+
+=cut
+sub configured_raid_disk_desc
+{
+my ($type, $subdisk) = @_;
+if ($type eq "cciss") {
+	return "HP Smart Array physical disk ".$subdisk;
+	}
+return "Hardware RAID ".$type." physical disk ".$subdisk;
+}
+
+=head2 unique_smart_disks(&disks)
+
+Returns SMART disk entries with duplicate device/type/subdisk entries removed.
+
+=cut
+sub unique_smart_disks
+{
+my %seen;
+return grep {
+	my $key = $_->{'device'}.":".
+		  ($_->{'subtype'} || "").":".
+		  (defined($_->{'subdisk'}) ? $_->{'subdisk'} : "");
+	!$seen{$key}++;
+	} @_;
+}
+
 =head2 list_smart_disks_partitions_fstab
 
 Returns a list of disks on which we can use SMART, taken from /etc/fstab.
@@ -563,4 +630,3 @@ return $extra_args;
 }
 
 1;
-