Jan Lindemann
a1ae17c8cb
Assembling a scheme-bearing form always writes '://' after the scheme, even if the input has no authority part. For a schemeless relative path such as '../../local/path', .full then becomes 'file://../../local/path', which re-parses with '..' as the host and '/../local/path' as the path, both entirely broken. Fix __assemble() to write a bare ':' instead of '://' when the input has no host and a relative path, so the assembled form re-parses back to the same relative path: full of '../../local/path' is now 'file:../../local/path'. Absolute paths and forms with an authority are unchanged. The assembled 'file:../../local/path' form is a valid URI under the RFC 3986 generic grammar (scheme with a rootless path), while RFC 8089's file URI ABNF admits only an empty or an absolute path. Uri thus trades RFC 8089 conformance for RFC 3986 compatibility: a relative path survives the full-and-reparse cycle unchanged. Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.84.2 Signed-off-by: Jan Lindemann <jan@janware.com>
99 lines
2.6 KiB
Python
99 lines
2.6 KiB
Python
from jw.pkg.lib.Uri import Uri
|
|
|
|
# Basic URL parsing
|
|
u = Uri('ssh://john.doe@host:22/path/to/repo')
|
|
assert u.protocol == 'ssh'
|
|
assert u.hostname == 'host'
|
|
assert u.port == 22
|
|
assert u.path == '/path/to/repo'
|
|
|
|
# Username and password
|
|
u = Uri('https://user:pass@example.com/repo')
|
|
assert u.username == 'user'
|
|
assert u.password == 'pass'
|
|
|
|
# Credentials in output
|
|
u = Uri('https://user:secret@example.com/repo')
|
|
assert 'secret' in u.full # full shows password
|
|
assert '<hidden>' in u.safe_full_with_username # safe version hides password
|
|
|
|
# Scheme defaults to file
|
|
u = Uri('/local/path')
|
|
assert u.scheme == 'file'
|
|
assert u.protocol == 'file'
|
|
assert u.full == 'file:///local/path'
|
|
|
|
# Relative paths default to file, too
|
|
u = Uri('../../local/path')
|
|
assert u.scheme == 'file'
|
|
assert u.protocol == 'file'
|
|
assert u.path == '../../local/path'
|
|
|
|
# full keeps relative paths relative: '://' would re-parse the
|
|
# first segment as a host
|
|
assert u.full == 'file:../../local/path'
|
|
assert Uri(u.full).path == '../../local/path'
|
|
|
|
# An explicit file: scheme with a relative path round-trips, too
|
|
u = Uri('file:../../local/path')
|
|
assert u.path == '../../local/path'
|
|
assert u.full == 'file:../../local/path'
|
|
|
|
# Pimp returns existing Uri unchanged
|
|
u1 = Uri('ssh://host/path')
|
|
u2 = Uri.pimp(u1)
|
|
assert u2 is u1
|
|
|
|
# New with path (add)
|
|
u = Uri('ssh://host/path')
|
|
u2 = u.new_add_path('subdir')
|
|
assert u2.to_string == 'ssh://host/path/subdir'
|
|
|
|
# New with path (replace) - to_string is updated
|
|
u3 = u.new_replace_path('/other')
|
|
assert u3.to_string == 'ssh://host/other'
|
|
|
|
# Authority includes credentials
|
|
u = Uri('ssh://user:pass@host:22/path')
|
|
assert u.authority == 'userpass@host:22'
|
|
|
|
# Origin excludes credentials
|
|
assert u.origin == 'host:22'
|
|
|
|
# ID and safe version hide password
|
|
assert u.id == 'ssh://user:<hidden>@host:22'
|
|
assert '<hidden>' in u.safe_full_with_username
|
|
|
|
# Full includes path and credentials
|
|
assert u.full == 'ssh://userpass@host:22/path'
|
|
|
|
# Simple URLs
|
|
u = Uri('https://example.com/repo.git')
|
|
assert u.hostname == 'example.com'
|
|
assert u.path == '/repo.git'
|
|
assert u.basename == 'repo.git'
|
|
|
|
# Username setter
|
|
u = Uri('ssh://host/path')
|
|
u.set_username('newuser')
|
|
assert u.username == 'newuser'
|
|
|
|
# Password setter
|
|
u = Uri('ssh://host/path')
|
|
u.set_password('newpass')
|
|
assert u.password == 'newpass'
|
|
|
|
# No port
|
|
u = Uri('ssh://host/path')
|
|
assert u.port is None
|
|
assert u.port_str is None
|
|
|
|
# to_string returns original
|
|
u = Uri('ssh://user:pass@host:22/path')
|
|
assert u.to_string == 'ssh://user:pass@host:22/path'
|
|
|
|
# String representation hides credentials
|
|
u = Uri('https://user:secret@example.com/repo.git')
|
|
assert '<hidden>' in str(u)
|
|
|
|
print('All Uri tests passed')
|