particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sources: relax "mirror" regexp to follow upstream repo ID

Browse source 
This commit relaxes the "mirror" schema regex from only allow
hashes to the repo ID regex as described in
https://dnf.readthedocs.io/en/latest/conf_ref.html#description

This is needed because in e.g. bootc-image-builder we use
"SetRootDir()" to get the repository information from an existing
bootc image and there the repo_id (that is then used as the mirror_id)
is written in a human friendly way instead of hex.

Thanks to Tomáš Hozza for the suggestions and background info, see
https://github.com/osbuild/osbuild/pull/1974#issuecomment-2579325272
This commit is contained in:
Michael Vogt 2025-01-09 09:45:40 +01:00 • committed by Simon de Vlieger
parent b2a34d8b33
commit 65a7ce2461
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sources/org.osbuild.librepo
View file

@ -22,6 +22,9 @@ from osbuild.util.rhsm import Subscriptions
# NOTE: The top level schema properties are limited to items and options by the # NOTE: The top level schema properties are limited to items and options by the
# v2 schema definition # v2 schema definition
#
# "mirror" pattern follows dnf repo_id as described in:
# https://dnf.readthedocs.io/en/latest/conf_ref.html#description
SCHEMA_2 = """ SCHEMA_2 = """
"properties": { "properties": {
"items": { "items": {
@ -57,7 +60,7 @@ SCHEMA_2 = """
"type": "object", "type": "object",
"additionalProperties": false, "additionalProperties": false,
"patternProperties": { "patternProperties": {
"^[0-9a-f]+$": { "^[0-9a-zA-Z-._:]+$": {
"required": [ "required": [
"url", "url",
"type" "type"

11
sources/test/test_librepo.py
View file

@ -140,9 +140,9 @@ def test_librepo_secrets_mtls(mocked_download_pkgs, sources_service, monkeypatch
@pytest.mark.parametrize("test_mirrors,expected_err", [ @pytest.mark.parametrize("test_mirrors,expected_err", [
# bad # bad
( (
# only hashes supported for mirror_ids # no spaces in mirror_id
{"bad_mirror_id": {"url": "http://example.com", "type": "mirrorlist"}}, {"bad mirror": {"url": "http://example.com", "type": "mirrorlist"}},
"'bad_mirror_id' does not match any of the regexes: '^[0-9a-f]+$'", "'bad mirror' does not match any of the regexes: ",
), ),
( (
{"0123456789abcdef": {"type": "mirrorlist"}}, {"0123456789abcdef": {"type": "mirrorlist"}},
@ -168,7 +168,10 @@ def test_librepo_secrets_mtls(mocked_download_pkgs, sources_service, monkeypatch
), ),
( (
{"0123": {"url": "http://example.com", "type": "baseurl"}}, "", {"0123": {"url": "http://example.com", "type": "baseurl"}}, "",
) ),
(
{"Com_plex:id.": {"url": "http://x.com", "type": "baseurl"}}, "",
),
]) ])
def test_schema_validation(sources_schema, test_mirrors, expected_err): def test_schema_validation(sources_schema, test_mirrors, expected_err):
test_input = { test_input = {