Skip to content

Accept abbreviated upper bounds in version ranges #699

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
xdelaruelle merged 1 commit into from
Sep 17, 2026
Merged

Accept abbreviated upper bounds in version ranges #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions NEWS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ Modules 5.7.0 (not yet released)
shell meta-characters. Completion candidates were passed to ``compgen -W``
which evaluates command substitution syntax. (fix `CVE-2026-85013`_ found
by AISLE in partnership with Red Hat)
* Accept abbreviated upper bounds in version ranges such as ``@3.20:3`` to
select versions starting at ``3.20`` within major version ``3``.

.. _CVE-2026-85013: https://github.com/envmodules/modules/security/advisories/GHSA-8hrw-p88g-qhmg

Expand Down
8 changes: 8 additions & 0 deletions doc/source/design/advanced-module-version-specifiers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ Specification

- for instance *@1:1.10* will matches *1.0* and *1.8* but not *1.12*

- the upper bound may be less precise than the lower bound

- an abbreviated upper bound includes all versions that extend it,
provided they also satisfy the lower bound
- for instance *@1.2:1* matches *1.2* and *1.10* but not *1.1* or *2.0*
- a reversed range remains invalid unless the lower bound extends the
abbreviated upper bound, so *@2.0:1* is still rejected

- version could be specified as list

- soft@vers,vers,vers
Expand Down
3 changes: 3 additions & 0 deletions doc/source/module.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3235,6 +3235,9 @@ the activation of the extended default mechanism (see
to refer to more precise version numbers like ``1.2.3``. Characters ``.`` and
``-`` are considered version number separator to determine abbreviated
versions. Range of versions on its side natively handles abbreviated versions.
The upper bound may be less precise than the lower bound. An abbreviated
upper bound includes all versions that extend it, provided they also satisfy
the lower bound.
Comment thread
xdelaruelle marked this conversation as resolved.
Comment thread
xdelaruelle marked this conversation as resolved.

In order to be specified in a range of versions or compared to a range of
versions, the version major element should corresponds to a number. For
Expand Down
3 changes: 3 additions & 0 deletions doc/source/modulefile.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,6 +2137,9 @@ notation like ``@1`` to refer to more precise version numbers like ``1.2.3``.
Characters ``.`` and ``-`` are considered version number separator to
determine abbreviated versions. Range of versions on its side natively handles
abbreviated versions.
The upper bound may be less precise than the lower bound. An abbreviated
upper bound includes all versions that extend it, provided they also satisfy
the lower bound.

In order to be specified in a range of versions or compared to a range of
versions, the version major element should corresponds to a number. For
Expand Down
4 changes: 3 additions & 1 deletion tcl/modspec.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,9 @@ proc parseModuleVersionSpecifier {modspec} {
set cmpspec le
set versspec $hivers
# between or equal
} elseif {[versioncmp $lovers $hivers] == 1} {
# An abbreviated upper bound includes its more precise versions.
} elseif {[versioncmp $lovers $hivers] == 1 && ![string match\
$hivers[extendedDefaultCharGlobMatch] $lovers]} {
set invalidversrange 1
} else {
set cmpspec be
Expand Down
17 changes: 17 additions & 0 deletions testsuite/modules.70-maint/272-adv_version_spec-range.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ testouterr_cmd sh {load mod@1::} ERR "$err_specvers'1::'"
testouterr_cmd sh {load mod@1,:,} ERR "$err_specvers'1,:,'"
testouterr_cmd sh {load mod@,:} ERR "$err_specvers',:'"
testouterr_cmd sh {load mod@1.3:1.2} ERR "$err_rangevers'1.3:1.2'"
testouterr_cmd sh {load mod@4.1:3} ERR "$err_rangevers'4.1:3'"
testouterr_cmd sh {load mod@1.30:1.3} ERR "$err_rangevers'1.30:1.3'"
testouterr_cmd sh {load mod@,<} ERR "$err_specvers',<'"
testouterr_cmd sh {load mod@:<} ERR "$err_rangevers':<'"
testouterr_cmd sh {load mod@1/1:2} ERR "$err_specvers'1/1:2'"
Expand Down Expand Up @@ -113,6 +115,7 @@ testouterr_cmd sh {load extdfl @1.2:} $ans {}
testouterr_cmd sh {load extdfl @:1.3.1} $ans {}
testouterr_cmd sh {load extdfl @:1.3.7} $ans {}
testouterr_cmd sh {load extdfl @1.2:1.3} $ans {}
testouterr_cmd sh {load extdfl @1.2:1} $ans {}
Comment thread
xdelaruelle marked this conversation as resolved.
testouterr_cmd sh {load extdfl @1.2.3:1.3.7} $ans {}
testouterr_cmd sh {load extdfl @:2.0.1} $ans {}
testouterr_cmd sh {load extdfl @:2.0} $ans {}
Expand Down Expand Up @@ -162,6 +165,7 @@ testouterr_cmd sh {path extdfl/ @1.2:1.3} [list [list text $mp/extdfl/1.3.1]] {}

# test all sub-cmd concerned by context
testouterr_cmd sh {avail -t extdfl @1.3:1.4} OK "$mp:\nextdfl/1.3.1(default)\nextdfl/1.3.7\nextdfl/1.4.5"
testouterr_cmd sh {avail -t extdfl @1.3.7:1} OK "$mp:\nextdfl/1.3.7\nextdfl/1.4.5"
testouterr_cmd_re sh {whatis extdfl@1.3.7:1.4.5} OK "$modlin $mpre $modlin
\\s+extdfl/1.3.7: extdfl/1.3.7
\\s+extdfl/1.4.5: extdfl/1.4.5"
Expand All @@ -187,6 +191,18 @@ testouterr_cmd sh {spider -t ext?fl @1.3:} OK "$mp:\nextdfl/1.3.1(default)\nextd
testouterr_cmd sh {avail -t e??.* @:1.4} OK "$mp:\ne.t.fl/1.3.1\ne.t.fl/1.3.7\ne.t.fl/1.4.5"

# additional version tests
# Abbreviated upper bounds apply independently of extended defaults.
foreach extdfl {0 1} {
setenv_var MODULES_EXTENDED_DEFAULT $extdfl
set ans [list [list text $mp/extdfl/1.3.7] [list text $mp/extdfl/1.4.5]]
testouterr_cmd sh {paths extdfl@1.3.7:1} $ans {}
testouterr_cmd sh {paths -i EXTDFL@1.3.7:1} $ans {}
set ans [list [list text $mp/extdfl/1.3.7]]
testouterr_cmd sh {paths extdfl@1.3.7:1.3} $ans {}
testouterr_cmd sh {paths extdfl@1.3.7:1.3,9:10} $ans {}
}
unsetenv_var MODULES_EXTENDED_DEFAULT

testouterr_cmd sh {avail -t extdfl8 @1.33:} OK "$mp:\nextdfl8/1.33"
testouterr_cmd sh {avail -t extdfl8 @:1.3} OK "$mp:\nextdfl8/1.3.1\nextdfl8/1.3.7"
testouterr_cmd sh {spider -t extdfl8 @:1.3} OK "$mp:\nextdfl8/1.3.1\nextdfl8/1.3.7"
Expand Down Expand Up @@ -297,6 +313,7 @@ set ans [list]
lappend ans [list set _LMFILES_ $mp/extdfl2/3.1.7]
lappend ans [list set LOADEDMODULES extdfl2/3.1.7]
testouterr_cmd sh {load extdfl2@3.0.2:3.1.7} $ans {}
testouterr_cmd sh {load extdfl2@3.1.7:3.1} $ans {}
testouterr_cmd sh {load extdfl2@:3.1.7} $ans {}
testouterr_cmd sh {load extdfl2@:3.1.7} $ans {}
testouterr_cmd sh "load $mp/extdfl2 @:3.1.7" ERR "$err_file'$mp/extdfl2 @:3.1.7'"
Expand Down