lib.version.Dependency: Reject unsupported spec operators
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 4m27s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 4m54s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 4m0s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 4m17s
CI / Packaging test (push) Successful in 0s
All checks were successful
CI / Packaging - Kali Linux (pull_request) Successful in 4m27s
CI / Packaging - OpenSUSE Tumbleweed (pull_request) Successful in 4m54s
CI / Packaging test (pull_request) Successful in 0s
CI / Packaging - Kali Linux (push) Successful in 4m0s
CI / Packaging - OpenSUSE Tumbleweed (push) Successful in 4m17s
CI / Packaging test (push) Successful in 0s
The spec split pattern ([=><]+) tokenizes only the =, > and < characters,
so a PEP 440 operator like ~= or != leaves its ~ or ! glued to the package
name: Dependency('pkg~=1.0') parses to base name 'pkg~' with operator '='.
App.__get_project_refs() carries the same pattern inline, so the same specs
corrupt the module name used for the -devel subpackage check. The split
also tolerates operator strings the language does not support, most visibly
==, which parses and renders but raises NotImplementedError only when
expansion is requested.
The spec language supports exactly =, <, <=, > and >=, and boundary
expansion implements all of them. Extend the split pattern with ~ and ! so
that foreign operators tokenize as operator strings, and reject every
operator outside the supported set in Dependency.__parsed_spec() with
Dependency.Error, naming the supported operators. Route
App.__get_project_refs() through Dependency for the name and module parts
instead of the second inline split, so the validation lives in one place.
The catch all in Dependency.__version_boundaries() stays as a backstop
against drift between the allow list and the expansion cases.
The tests drop == from the accepted operator loop, drop the now-unreachable
not-expandable case, and assert that ~=, !=, ~, ==, ===, << and >> are
rejected at parse time with a message naming the operator.
Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.85.1
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
d5e09fca91
commit
c31dfb4bbf
3 changed files with 31 additions and 12 deletions
|
|
@ -209,8 +209,9 @@ class App(Base):
|
||||||
scope: Scope,
|
scope: Scope,
|
||||||
names_only: bool,
|
names_only: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
name = self.strip_module_from_spec(spec)
|
dep = Dependency(spec)
|
||||||
mod = re.split('([=><]+)', spec)[0].strip()
|
name = dep.base_name
|
||||||
|
mod = dep.full_name
|
||||||
if names_only:
|
if names_only:
|
||||||
spec = name
|
spec = name
|
||||||
if spec in buf:
|
if spec in buf:
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ class Dependency: # export
|
||||||
class Error(ValueError):
|
class Error(ValueError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
__SPLIT_RE: ClassVar[re.Pattern[str]] = re.compile('([=><]+)')
|
__SPLIT_RE: ClassVar[re.Pattern[str]] = re.compile('([~=><!]+)')
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def __target_prefix(self) -> str:
|
def __target_prefix(self) -> str:
|
||||||
|
|
@ -45,6 +45,12 @@ class Dependency: # export
|
||||||
case 3:
|
case 3:
|
||||||
if not parts[0] or not parts[2]:
|
if not parts[0] or not parts[2]:
|
||||||
self.__raise(f'Invalid dependency spec "{self.__spec}"')
|
self.__raise(f'Invalid dependency spec "{self.__spec}"')
|
||||||
|
if parts[1] not in ('=', '<', '<=', '>', '>='):
|
||||||
|
self.__raise(
|
||||||
|
f'Spec "{self.__spec}": unsupported operator '
|
||||||
|
f'"{parts[1]}", supported operators are =, <, '
|
||||||
|
'<=, > and >='
|
||||||
|
)
|
||||||
if parts[2] == 'REVISION':
|
if parts[2] == 'REVISION':
|
||||||
self.__raise(
|
self.__raise(
|
||||||
f'Spec "{self.__spec}": a bare REVISION renders as a '
|
f'Spec "{self.__spec}": a bare REVISION renders as a '
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ assert d.base_name == 'dev'
|
||||||
assert d.full_name == 'dev'
|
assert d.full_name == 'dev'
|
||||||
|
|
||||||
# Operators with and without whitespace
|
# Operators with and without whitespace
|
||||||
for op in ['=', '==', '<', '<=', '>', '>=']:
|
for op in ['=', '<', '<=', '>', '>=']:
|
||||||
d = Dependency(f'foo {op} 1.0')
|
d = Dependency(f'foo {op} 1.0')
|
||||||
assert d.base_name == 'foo'
|
assert d.base_name == 'foo'
|
||||||
assert d.full_name == 'foo'
|
assert d.full_name == 'foo'
|
||||||
|
|
@ -135,14 +135,6 @@ d = Dependency('foo = 1.2.3', app.get_version)
|
||||||
assert d.constraint_str(as_range = True) == 'foo = 1.2.3'
|
assert d.constraint_str(as_range = True) == 'foo = 1.2.3'
|
||||||
d = Dependency('foo = 1.0-rc1', app.get_version)
|
d = Dependency('foo = 1.0-rc1', app.get_version)
|
||||||
assert d.constraint_str(as_range = True) == 'foo = 1.0-rc1'
|
assert d.constraint_str(as_range = True) == 'foo = 1.0-rc1'
|
||||||
# unimplemented operators raise
|
|
||||||
d = Dependency('foo == 1.2.3-45', app.get_version)
|
|
||||||
try:
|
|
||||||
d.constraint_str(as_range = True)
|
|
||||||
assert False, 'Should have raised'
|
|
||||||
except NotImplementedError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Default syntax is SEM_VER
|
# Default syntax is SEM_VER
|
||||||
d = Dependency('foo < 2.0')
|
d = Dependency('foo < 2.0')
|
||||||
assert d.constraint_str(untemplated = False) == 'foo < 2.0'
|
assert d.constraint_str(untemplated = False) == 'foo < 2.0'
|
||||||
|
|
@ -238,6 +230,26 @@ for bad in ['', 'foo =', ' = 1.0']:
|
||||||
except Dependency.Error:
|
except Dependency.Error:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# Operators outside the supported set are rejected when parsed,
|
||||||
|
# not folded into the package name or deferred to expansion
|
||||||
|
for bad in [
|
||||||
|
'foo ~= 1.0',
|
||||||
|
'foo~=1.0',
|
||||||
|
'foo ~ 1.0',
|
||||||
|
'foo != 1.0',
|
||||||
|
'foo!=1.0',
|
||||||
|
'foo == 1.0',
|
||||||
|
'foo==1.0',
|
||||||
|
'foo === 1.0',
|
||||||
|
'foo << 1.0',
|
||||||
|
'foo >> 1.0',
|
||||||
|
]:
|
||||||
|
try:
|
||||||
|
Dependency(bad).full_name
|
||||||
|
assert False, f'Should have raised for {bad!r}'
|
||||||
|
except Dependency.Error as e:
|
||||||
|
assert 'unsupported operator' in str(e)
|
||||||
|
|
||||||
# str
|
# str
|
||||||
assert str(Dependency('foo-devel >= 1.0')) == 'foo-devel >= 1.0'
|
assert str(Dependency('foo-devel >= 1.0')) == 'foo-devel >= 1.0'
|
||||||
assert str(Dependency('foo')) == 'foo'
|
assert str(Dependency('foo')) == 'foo'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue