Skip to content

Add checks on reserved names #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limetech merged 5 commits into from
May 11, 2026
+46 −2
Merged

Add checks on reserved names #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4236ba4
Add checks on reserved names
SimonFair May 8, 2026
c3b1f46
Change to check for specific prefixes
SimonFair May 8, 2026
0166772
Fix error showing pool status for array disk
SimonFair May 8, 2026
71ab00e
refine pool status
SimonFair May 8, 2026
e77e0d2
Update zfs checks
SimonFair May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion emhttp/plugins/dynamix/CacheDevices.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,33 @@ if (count($devs) > 1) {
}
?>
<script>
function isReservedPoolName(poolname, reserved) {
var name = (poolname || '').trim().toLowerCase();
var reservedPrefixes = ['mirror', 'raidz', 'draid', 'spare'];

if (!name) return false;

return reserved.some(function(entry) {
var reservedName = (entry || '').toLowerCase();
if (!reservedName) return false;
if (reservedName.endsWith('*')) {
return name.startsWith(reservedName.slice(0, -1));
}
if (reservedPrefixes.includes(reservedName)) {
return name === reservedName || name.startsWith(reservedName);
}
return name === reservedName;
});
}

function validate(poolname) {
var valid = /^[a-z]([a-z0-9~._-]*[a-z_-])*$/;
var reserved = [<?=makeList(explode(',',_var($var,'reservedNames')))?>];
var shares = [<?=makeList(array_map('sharename',glob('boot/config/shares/*.cfg',GLOB_NOSORT)))?>];
var pools = [<?=makeList($pools)?>];
poolname = (poolname || '').trim();
if (!poolname.trim()) return false;
if (reserved.includes(poolname)) {
if (isReservedPoolName(poolname, reserved)) {
swal({title:"_(Invalid pool name)_",text:"_(Do not use reserved names)_",html:true,type:'error',confirmButtonText:"_(Ok)_"});
return false;
} else if (shares.includes(poolname)) {
Expand Down
26 changes: 25 additions & 1 deletion emhttp/plugins/dynamix/DeviceInfo.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,25 @@ function is_upgraded_ZFS_pool($pool_name)

String.prototype.celsius = function(){return Math.round((parseInt(this)-32)*5/9).toString();}

function isReservedPoolName(poolname, reserved) {
var name = (poolname || '').trim().toLowerCase();
var reservedPrefixes = ['mirror', 'raidz', 'draid', 'spare'];

if (!name) return false;

return reserved.some(function(entry) {
var reservedName = (entry || '').toLowerCase();
if (!reservedName) return false;
if (reservedName.endsWith('*')) {
return name.startsWith(reservedName.slice(0, -1));
}
if (reservedPrefixes.includes(reservedName)) {
return name === reservedName || name.startsWith(reservedName);
}
return name === reservedName;
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

function setFloor() {
if ($('#shareFloor').length==0) return;
const fsSize = {<?=fsSize()?>};
Expand Down Expand Up @@ -711,8 +730,9 @@ function validate(poolname) {
var reserved = [<?=makeList(explode(',', _var($var, 'reservedNames')))?>];
var shares = [<?=makeList(array_map('sharename', glob('boot/config/shares/*.cfg', GLOB_NOSORT)))?>];
var pools = [<?=makeList($pools)?>];
poolname = (poolname || '').trim();
if (!poolname.trim()) return false;
if (reserved.includes(poolname)) {
if (isReservedPoolName(poolname, reserved)) {
swal({title:"_(Invalid pool name)_",text:"_(Do not use reserved names)_",type:'error',html:true,confirmButtonText:"_(Ok)_"});
return false;
} else if (shares.includes(poolname)) {
Expand Down Expand Up @@ -1035,6 +1055,7 @@ _(Critical disk utilization threshold)_ (%):

<?if (fsType('btrfs')):?>
<?if (_var($disk,'fsStatus')=="Mounted"):?>
<?if (isPool($name)):?>
<div id="poolsummary" class="title nocontrol">
<span class="left">
<i class="title fa fa-hdd-o"></i> _(Pool Status)_
Expand All @@ -1059,6 +1080,7 @@ if (!empty($poolstatus['pools'][$poolName])) {
?>
_(pool status)_:
: <span class="<?=$statusClass?>"><?=$status?><?=$statusLink?></span>
<?endif;?>

</form>

Expand Down Expand Up @@ -1398,6 +1420,7 @@ _(btrfs check status)_:
<?endif;?>
<?if (fsType('zfs') && !isSubpool($name)):?>
<?if (_var($disk,'fsStatus')=="Mounted"):?>
<?if (isPool($name)):?>
<div id="poolsummary" class="title nocontrol">
<span class="left">
<i class="title fa fa-info-circle"></i>_(Pool Status Summary)_
Expand All @@ -1422,6 +1445,7 @@ if (!empty($poolstatus['pools'][$poolName])) {
?>
_(pool status)_:
: <span class="<?=$statusClass?>"><?=$status?><?=$statusLink?></span>
<?endif;?>

</form>
<?endif;?>
Expand Down
Loading