mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-18 05:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

image-source: Pass token to flatpak_image_source_new_remote()

Browse Source 
Since flatpak_image_source_new_remote() already tries to load files
from the registry, having a separate flatpak_image_source_set_token()
doesn't work - when the token is set, it's already too late to
be passed along with the initial requests.
This commit is contained in:
Owen W. Taylor
2025-08-28 16:48:52 +02:00
committed by Georges Basile Stavracas Neto
parent 76266177ab
commit 2c7b9342cc
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-dir.c
View File

@@ -1078,12 +1078,10 @@ flatpak_remote_state_new_image_source (FlatpakRemoteState *self,
if (registry_uri == NULL)
return NULL;
image_source = flatpak_image_source_new_remote (registry_uri, oci_repository, digest, NULL, error);
image_source = flatpak_image_source_new_remote (registry_uri, oci_repository, digest, token, NULL, error);
if (image_source == NULL)
return NULL;
flatpak_image_source_set_token (image_source, token);
return g_steal_pointer (&image_source);
}

3
common/flatpak-image-source-private.h
View File

@@ -39,14 +39,13 @@ FlatpakImageSource *flatpak_image_source_new_local (GFile *file,
FlatpakImageSource *flatpak_image_source_new_remote (const char *uri,
const char *oci_repository,
const char *digest,
const char *token,
GCancellable *cancellable,
GError **error);
FlatpakImageSource *flatpak_image_source_new_for_location (const char *location,
GCancellable *cancellable,
GError **error);
void flatpak_image_source_set_token (FlatpakImageSource *self,
const char *token);
void flatpak_image_source_set_delta_url (FlatpakImageSource *self,
const char *delta_url);

10
common/flatpak-image-source.c
View File

@@ -177,6 +177,7 @@ FlatpakImageSource *
flatpak_image_source_new_remote (const char *uri,
const char *oci_repository,
const char *digest,
const char *token,
GCancellable *cancellable,
GError **error)
{
@@ -186,6 +187,8 @@ flatpak_image_source_new_remote (const char *uri,
if (!registry)
return NULL;
flatpak_oci_registry_set_token (registry, token);
return flatpak_image_source_new (registry, oci_repository, digest, cancellable, error);
}
@@ -325,13 +328,6 @@ flatpak_image_source_new_for_location (const char *location,
}
}
void
flatpak_image_source_set_token (FlatpakImageSource *self,
const char *token)
{
flatpak_oci_registry_set_token (self->registry, token);
}
void
flatpak_image_source_set_delta_url (FlatpakImageSource *self,
const char *delta_url)