Commit Graph

4025 Commits

Author SHA1 Message Date
Matthew Leeds
5cff4500a2 transaction: Fix error handling for related refs
This commit fixes the handling of errors from installing/updating
related refs during a transaction, so that they're treated as non-fatal,
and so that the operation is skipped if the primary operation fails. The
current behavior is that a failure to install/update a related ref
causes the whole transaction to fail, and even after a failure to
install/update the primary ref the related ref install/update is
attempted.

I hit this error when doing an offline USB app install, when the USB
repo has an older version of the runtime and the runtime's locale
extension than what's in the local repo. Without this commit, the
failure to update the runtime (due to it being a downgrade) is treated
as a warning, but the failure to update the runtime locale is treated as
an error. With this commit, the runtime update failure is still treated
as a warning, and the locale update is not attempted. This is better
behavior because the locale extension update (or even install) is not
critical to the app install.

Closes: #1979
Approved by: alexlarsson
2018-08-17 09:34:34 +00:00
Alexander Larsson
ef9297a0f1 dbus-proxy: Fix handling of broadcasts
In https://github.com/flatpak/flatpak/pull/1689 we were meant to
have limited the receiving of broadcasts on portals, but die to a
bug in the proxy we accidentally allowed all broadcasts anyway.

The change which ignores all applied filters < POLICY_TALK fixes that.

However, it also turns out that the desktop portal actually *does*
rely on signals. For example the network portal uses property change
notification.

So, to make sure this works we allow all signal from the portal
names, but only if they are on a object path starting under
/org/freedesktop/portal (which incidentally all portal object are).
This means there is no real change in anything that is currently
deployed, but it does allow portals to opt out of this global signal
visiblity if they want by using a different object path, which we
want to use in dconf.

Closes: #1976
Approved by: alexlarsson
2018-08-17 09:24:13 +00:00
Matthew Leeds
cbc0046554 transaction: Fix a regression in installing bundles
This commit fixes a regression that causes installing from a bundle to
fail if the bundled app's runtime was itself installed from a bundle, or
otherwise has a non-working remote (such as when the user is offline).

The fix is to treat a failure of flatpak_dir_find_latest_rev() as
non-fatal in resolve_ops() if the ref in question is already installed.
In other words, if we don't need to fetch a ref for the transaction to
succeed, errors in fetching remote info about the ref shouldn't be
fatal.

Closes: #1973
Approved by: alexlarsson
2018-08-17 09:14:26 +00:00
Matthew Leeds
1fcffc8950 create-usb: Properly handle copying subpaths
Currently the create-usb command reads the subpaths listed in the
flatpak deploy data and just passes those to the ostree pull operation
to copy them to the USB. But this is not the correct way to handle them,
and leads to installs from the USB failing in the case where the locale
is partial (more specifically the install of the main ref succeeds but
the install of the locale extension doesn't).

So this commit changes create-usb to handle subpaths the same way
flatpak_dir_pull() and flatpak_dir_deploy() do, which is to copy the
/metadata path along with a subdirectory of /files for each listed
subpath. So in the case of an English partial locale, /metadata and
/files/en will be copied to the USB drive, and those are the subpaths
that will be pulled during the install (if the installing computer also
uses English).

Closes: #1972
Approved by: alexlarsson
2018-08-17 09:04:24 +00:00
Matthew Leeds
9616737c0b dir: Fix a subpath checkout error message
In this loop we're checking out a subpath under /files, not /metadata,
so fix the error message.

Closes: #1970
Approved by: alexlarsson
2018-08-17 08:45:36 +00:00
Matthew Leeds
4c5fc20d60 common: Improve "No xa.metadata" error messages
When I run `flatpak update` I get messages saying "Warning: No
xa.metadata in commit" which isn't very helpful without knowing what
commit is being referred to. So this commit adds the checksum and ref to
such error messages.

Closes: #1978
Approved by: alexlarsson
2018-08-17 08:35:07 +00:00
Matthew Leeds
76a5c63c19 doc/flatpak-build-bundle.xml: Add a usage example
In the output of `flatpak build-bundle --help` it's not clear what
LOCATION is, so the least we can do is add an example of its usage to
the man page. At some point it would be nice to also have explanations
of positional arguments in help output.

Closes: #1974
Approved by: alexlarsson
2018-08-17 08:24:33 +00:00
Matthew Leeds
425940f0c3 create-usb: Fix a leak of the list of extensions
This only fixes the leak when we don't hit an error condition. To fix it
in that case we need an autoptr for deep lists.

Closes: #1966
Approved by: alexlarsson
2018-08-17 08:13:15 +00:00
Alexander Larsson
6bb492cb6b test: Suppress weird thread-related stream leak in ostree
Closes: #1966
Approved by: alexlarsson
2018-08-17 08:13:15 +00:00
Alexander Larsson
341ad02193 flatpak_dir_remote_make_oci_summary: Actually use cache
We need to return early on cache hits.

Closes: #1966
Approved by: alexlarsson
2018-08-17 08:13:15 +00:00
Alexander Larsson
9cc0f0d404 Fix leak in flatpak_cache_http_uri
Need to free the return value of soup_header_parse_param_list

Closes: #1966
Approved by: alexlarsson
2018-08-17 08:13:15 +00:00
Alexander Larsson
3d9a616632 flatpakref: Fix leak of gpg key string
Closes: #1966
Approved by: alexlarsson
2018-08-17 08:13:15 +00:00
Matthew Leeds
c3a0617557 NULL initialize g_auto variables
It's a good idea to NULL initialize g_autoptr/g_autofree variables, so
we can be sure uninitialized memory isn't passed to g_free or similar.

Closes: #1968
Approved by: alexlarsson
2018-08-17 08:06:51 +00:00
Matthew Leeds
745287e48f dir: Fix another GVariant leak
g_variant_builder_end() returns a floating reference, so sink it.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:10 +00:00
Alexander Larsson
fe66d412ff build-commit-from: Fix gvariant leaks
ostree_repo_pull, etc does not sink the options variant, so
make sure to ref-sink it ourselves.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:10 +00:00
Alexander Larsson
b8eb940795 build-commit-from: Fix some leaks
Use &s to get child strings, otherwise we get a copy.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
75adff05f4 flatpak-json: Don't leak empty optional nodes.
Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
4b8624e705 flatpak_yes_no_prompt: Fix leak of formated string
Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
a6bec60d24 flatpak_dir_find_remote_related_for_metadata: Fix leak
Move extension_ref into the loop so its freed every iteration.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
335f69675e Fix leak in flatpak_transaction_ensure_remote_state
We return a ref now, and free it in all callers, otherwise
the non-caching codepath of this leaks the state.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
cbbc98b50d Make FlatpakRemoteState refcounted
This is needed to fix a memory leak

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
45945c5d45 tests: Add --gen-suppressions=all to valgrind commandline
Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
6a551c2ba7 Add suppression for ostree pthread_create issue
It seems like pthread_create allocates some tls that is not
immediately cleaned up. Suppress this for now.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
0d1e094f9a info: Fix leak
We have to free the return value of flatpak_deploy_get_dir.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
7e65d23a4a info: Fix leak
We have to free the FlatpakDir

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
c70078b7eb flatpak_dir_read_latest: Fix leak
Make sure we free res if we exit early

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
60283fb58d info: Fix leak
flatpak_dir_read_latest return value has to be freed

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
ebb3ff532d Fix GVariant leak
ostree_async_progress_get_variant returns a ref, so free it.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
7df3f9f1ba appstream: Fix leak
Move some autoptr to the inner scope of the loop over each
appstream branch to avoid leaking.

Closes: #1964
Approved by: mwleeds
2018-08-13 21:31:09 +00:00
Alexander Larsson
ed1d7eacf4 Fix regression from #1961 which broke the tests
Sometimes (for example in some test-repo-collections.sh test that broke) we
update from a remote with an older ostree-metadata branch, and the
check for downgrades broke in this case.

Its unclear exactly what it the best solution here, maybe to silently
disallow the update. However, this change instead just re-allows the
downgrade for this particular case so we get the old behaviour.
2018-08-13 12:10:22 +02:00
Owen W. Taylor
90be1f7515 test-oci-registry.sh: extend
Add:
 * Testing of flatpakrefs and bundles pointing to OCI remotes
 * Changing a remote from OCI to non-OCI, including during bundle
   installation.
 * Pruning origin remotes.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
09d0e83c43 Handle switching a remote type between OCI and non-OCI
When we switch the remote type, we need to clean up cached files
(appstream, OCI index/summary) because they are stored differently
for the two types of remote.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
df431fe4b0 Remove unused calls to ostree_repo_remote_get_url 2018-08-13 11:23:28 +02:00
Owen W. Taylor
d7d05a8619 Use oci+http[s]:// as an URL to identify OCI registries
The old pattern of using a separate 'OCI' flag was very ugly
internally in the code once it was extended to flatpak bundles and
flatpakrefs - using a different URI scheme means that the nature
of the remote can't be accidentally lost in some part of the code.

Probing would be possible as well, but would make it difficult to
add a remote when offline, and also doesn't deal well with the
fact that our data layout is different for the two types of remotes -
the type of remote could change at any point!

As a side effect this change enables flatpakrefs and flatpak bundles for OCI
registries.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
b283084826 Improvements to index URI generation for OCI registries
* Restrict the queried images to the desired architecture
* Sort query parameters as the spec requests
* Allow a fragment on the remote URI to mean "tag to query for
  in the registry"
* Tweak flatpak_oci_index_ensure_cached() not to return the
  index URL in the normal error case.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
d64c1c1b95 flatpak_dir_remove_oci_file(): be tolerant of missing files
If a remote is removed before we ever fetched content, the OCI
index and summary files won't exist.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
8fe9bf4d86 Look at all refs when verifying a ref for flatpak-system-helper
The normal behavior where we only list already installed refs for
a noenumerate remote doesn't work for the case where flatpak-system-helper
verifies a ref on an OCI server during installation - in that case, the
ref being installed to does not *yet* exist locally.
2018-08-13 11:23:28 +02:00
Owen W. Taylor
70776b0eaf Fix args to flatpak_bundle_load 2018-08-13 11:23:28 +02:00
Owen W. Taylor
00b5f568ec Clean up properly when pruning an origin remote
Using flatpak_dir_remove_remote() rather than ostree_repo_remove_remote()
means that appstream and OCI index/summary files will be properly
removed.
2018-08-13 11:23:28 +02:00
Matthew Leeds
5b21a5b7fc dir: Fix detection of downgrades for P2P operations
In general Flatpak tries to prevent downgrades of anything: apps,
runtimes, repo metadata, etc. with some exceptions such as when the user
specifies a commit they want. However at the moment the detection of a
downgrade is broken if both of the following are true: (1) a collection
ID is enabled on the relevant remote, and (2) a per-user installation
is being used instead of the system-wide one (or the system-helper is
otherwise being circumvented, such as by running flatpak as root).

This bug is a security vulnerability, but it's one with limited impact
because very few people have collection IDs enabled yet, and the
downgrade attack would require either a MITM on the network connection
(which HTTPS should prevent) or a malicious USB drive or local network
peer.
2018-08-13 11:21:46 +02:00
Piotr Drąg
27934d9421 Update Polish translation
Closes: #1958
Approved by: alexlarsson
2018-08-13 07:45:21 +00:00
Alexander Larsson
3fa34ebd8a Work around libsoup recursive type hang in tests
Closes: #1952
Approved by: alexlarsson
2018-08-09 15:45:08 +00:00
Alexander Larsson
f176d3eba3 Add --disable-fsync to build-export and build-commit-from
This mirrors ostree commit --disable-fsync and is useful in some cases.
For instance, we'd like to use it when building the temporary import
repositories in flathub.

Closes: #1951
Approved by: alexlarsson
2018-08-09 13:12:42 +00:00
Owen W. Taylor
8a32f0e718 Remove FLATPAK_ENABLE_EXPERIMENTAL_OCI envvar check
Now that appstream data and icons are retrievded from the index, the OCI
code is expected to be fully usable, and to work with registries as they
will actually be deployed.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:36 +00:00
Owen W. Taylor
65770d800f system-helpers: When deploying OCI's, verify refs against summary, not server
We previously made a separate request to the registry index to see if
the manifest hash of an image was the hash of the image in the registry.

Since the summary is now downloaded by the system helper and trusted, just
check if the hash matches the hash in the summary data. This is as good,
and in is a lot more efficient if the index is statically generated,
and we can't get the index data for just one image.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:36 +00:00
Owen W. Taylor
1cbae3d1af Cache the downloaded registry index in compressed form
The OCI index information should be highly compressable (especially if
icons are remote URI's rather than data URI's) so downloading it and
storing it compressed will provide sigificant efficiency gains.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:36 +00:00
Owen W. Taylor
c4c06b7be4 Allow using a compressed cache for HTTP downloads
Add a new flag for flatpak_cache_http_uri() that adds Accept-Encoding: gzip
to the request, and if the result is returned compressed, stores the data
compressed. If the data result is return uncompressed, it's compressed.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:35 +00:00
Owen W. Taylor
6838206e2a test-oci-registry.sh: Tests for talking to an OCI registry
Add a new test case to test the OCI remote functionality. The tests talk to
a server that implements good-enough index generation and bits of the
docker registry protocol. Adding and remove remotes, summary and appstream
generation, and image installation are all tested.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:35 +00:00
Owen W. Taylor
4dfa7721bb Remove unused etag functionality
Checking the registry against a previous etag is now handled inside
flatpak_cache_http_uri(), so remove the etag parameters that were
previously passed around in various places for simplicity.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:35 +00:00
Owen W. Taylor
baa7d35ca1 Extract the appstream data from the OCI registry index
Previously the code assumed that appstream data was stored in a separate
OCI image in the registry. Replace that with storing the appstream data
and icons as image annotations. When we download a new version of the
image index, the appstream data is combined, and icons are downloaded
as necessary.

Since there is no longer a content hash for the appstream data, it's
not practical for the user to download the appstream data and pass it
to the system helper, instead the system helper just downloads the
appstream data directly.

Closes: #1910
Approved by: alexlarsson
2018-08-09 12:49:35 +00:00