Skip to content

Url varexpand issues #497

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

Jump to bottom
Draft
mlandres wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Url varexpand issues #497

mlandres wants to merge 9 commits into from

Conversation

@mlandres
Copy link
Member

@mlandres mlandres commented Nov 17, 2023

@mlandres mlandres marked this pull request as draft November 17, 2023 15:32
@mlandres mlandres requested a review from bzeller November 17, 2023 15:32
@mlandres mlandres force-pushed the ma-1217192-URL_varexpand_issues branch 9 times, most recently from c73a80b to dc1a9c0 Compare November 29, 2023 13:59
@mlandres mlandres force-pushed the ma-1217192-URL_varexpand_issues branch from dc1a9c0 to 6b31a68 Compare November 29, 2023 14:35
@mlandres
Copy link
Member Author

mlandres commented Nov 29, 2023

Introducing the zypp-rawurl: schema to transport unexpanded strings parsed from a .repo/.service file into the RepoInfo (which is able to actually replace the variables) has it's obstacles. We need to resolve all kinds of Url manipulation which were formerly performed on the unexpanded Url (based on the assumption they will be still valid after variable expansion).

Now we use the zypp-rawurl: query part to build a kind of todo list to be performed on the Url after variable expansion.

@mlandres mlandres force-pushed the ma-1217192-URL_varexpand_issues branch from 6b31a68 to ae2cc75 Compare November 29, 2023 15:00
@mlandres
fix typo in comment
3d8667d
@mlandres
Url: Fix bug when parsing empty components like query or fragment
cf3d9ab 
As a regex is used anyway there's also no need for substring actions.
@mlandres
Url: Fix regexes; '.' inside a character class must not be \-escaped
9d4853e
@mlandres
RepoVarExpand: Fix expansion of embedded words with invalid variable …
9ce8905 
…definitions

An incomplete variable definition is to be expanded literally. It should
produce the same result as if the the introducing '$' was escaped.
@mlandres
RepoVarExpand: VarRetriever callback is not needed for backslash esca…
1faba2a 
…ped literals
@mlandres
Add hasRepoVarsEmbedded test for strings
82d408f
@mlandres
Url: Add builtin "zypp-rawurl" schema for strings with unexpanded rep…
3219d97 
…o variables

The schema is used internally to wrap raw strings with unexpanded
repo variables into type Url. The raw string is stored in the Url's
fragment because it does not necessarily form a valid Url before it
got expanded.
@mlandres
Add RawUrl for constructing the zypp-rawurl: schema and handle it in …
b889e22 
…RepoVariablesUrlReplacer
@mlandres
WIP
a7d1a12 
Repo/Service file: Full support for using repo variables in URLs (bsc#1217192)

With a libzypp providing 'libzypp(repovarexpand) >= 1.2' the use of
repo variables in URLs is no longer restricted to the host and path
component of an URL, nor must the not-expanded string form a valid URL.
@mlandres mlandres force-pushed the ma-1217192-URL_varexpand_issues branch from ae2cc75 to a7d1a12 Compare December 15, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bzeller bzeller Awaiting requested review from bzeller

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mlandres