mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-22 14:48:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable collection IDs for OCI remotes

Browse Source 
We want to use collection IDs to specify what remote to install from
when processing /etc/flatpak/preinstall.d; in order for this to work
for OCI remotes, we need to permit collection IDs.

 - In flatpakrepo files, don't require a GPGKey for a OCI remote
   with a collection - we don't have signature verification for GPG remotes.
 - Don't validate that the collection ID appears in the summary -
   the image index doesn't currently contain an image ID
This commit is contained in:
Owen W. Taylor
2024-10-30 14:27:44 -04:00
committed by Sebastian Wick
parent 609f0ce0a1
commit 555d676cc0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/flatpak-dir.c
View File

@@ -12931,9 +12931,13 @@ _flatpak_dir_get_remote_state (FlatpakDir *self,
return NULL;
}
/* For OCI remotes, the collection ID is local configuration only:
* In the future we could add it to the index format.
*/
if (state->collection_id != NULL &&
state->summary != NULL &&
!_validate_summary_for_collection_id (state->summary, state->collection_id, error))
!(flatpak_dir_get_remote_oci (self, state->remote_name) ||
_validate_summary_for_collection_id (state->summary, state->collection_id, error)))
return NULL;
if (flatpak_dir_get_remote_oci (self, remote_or_uri))

5
common/flatpak-repo-utils.c
View File

@@ -2929,7 +2929,10 @@ flatpak_parse_repofile (const char *remote_name,
FLATPAK_REPO_COLLECTION_ID_KEY);
if (collection_id != NULL)
{
if (gpg_key == NULL)
/* We don't support signatures for OCI remotes, but Collection ID's are
* still useful for preinstallation.
*/
if (gpg_key == NULL && !g_str_has_prefix (uri, "oci+"))
{
flatpak_fail_error (error, FLATPAK_ERROR_INVALID_DATA, _("Collection ID requires GPG key to be provided"));
return NULL;