summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #2454 from lucab/ups/auto-txn-completeColin Walters2021-10-054-35/+156
|\ \ | | | | | | repo/private: allow committing/aborting through a transaction guard
| * | repo/private: allow committing/aborting through a transaction guardLuca BRUNO2021-10-054-35/+156
| |/ | | | | | | | | | | | | | | | | This enhances the auto-transaction logic, augmenting the scope of a transaction guard. It allows committing or aborting a transaction through its guard. It also supports tracking the completion status of a transaction guard, avoiding double commits/aborts, while retaining the auto-cleanup logic.
* | deploy: Ignore sockets, fifos in /etc during mergeColin Walters2021-10-011-3/+1
|/ | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1945274 is an issue where a privileged kubernetes daemonset is writing a socket into `/etc`. This makes ostree upgrades barf. Now, they should clearly move it to `/run`. However, one option is for us to just ignore it instead of erroring out. Some brief investigation shows that e.g. `git add somesocket` is a silent no-op, which is an argument in favor of ignoring it. Closes: https://github.com/ostreedev/ostree/issues/2446
* Merge pull request #2447 from cgwalters/sepolicy-for-commitColin Walters2021-09-304-32/+73
|\ | | | | repo: Add an API to init `OstreeSePolicy` from commit directly
| * sepolicy: Add deprecation comment for `_get_path()`Colin Walters2021-09-301-1/+5
| | | | | | | | | | Came up in review https://github.com/ostreedev/ostree/pull/2447#issuecomment-931428312
| * repo: Add an API to init `OstreeSePolicy` from commit directlyColin Walters2021-09-304-31/+68
| | | | | | | | | | | | | | | | | | | | This is part of `OstreeCommitModifier`, but I'm not using that in some of the ostree-ext Rust code. It just makes more sense as a direct policy API, where it should have been in the first place. There's already support for setting a policy object on a commit modifier, so that's all the old API needs to do now.
* | fsck: Print a success messageColin Walters2021-09-301-0/+3
|/ | | | | | | | | There's a general Unix philosophy that "silence is golden". However, when one is explicitly invoking an error check it's nice to see explicit success. We already print various statistics, so ending with a happy note has no extra cost.
* bin/commit: Fix --tree=tar with --selinux-policyColin Walters2021-09-301-7/+12
| | | | | | | | | | | | The logic for `--selinux-policy` ended up in the `--tree=dir` path, but there's no reason for that. Fix the imported labeling with `--tree=tar`. Prep for use with containers. We had this bug because the previous logic was trying to avoid duplicating the code for generic `--selinux-policy` and the case of `--selinux-policy-from-base --tree=dir`. It's a bit more code, but it's cleaner if we dis-entangle them.
* Release 2021.4Colin Walters2021-09-082-6/+7
|
* Merge pull request #2434 from cgwalters/custom-remoteColin Walters2021-09-083-20/+56
|\ | | | | Add support for "custom remotes"
| * Add support for "custom remotes"Colin Walters2021-09-083-20/+56
| | | | | | | | | | | | | | | | | | | | This will be helpful for the "ostree native container" work in https://github.com/ostreedev/ostree-rs-ext/ Basically in order to reuse GPG/signapi verification, we need to support adding a remote, even though it can't be used via `ostree pull`. (At least, not until we merge ostree-rs-ext into ostree, but even then I think the principle stands)
* | Merge pull request #2435 from RBuddel/fix-delta-files-resume-legacy-transactionLuca Bruno2021-09-081-1/+1
|\ \ | | | | | | repo-pull: legacy_transaction_resuming flag ignored
| * | repo-pull: legacy_transaction_resuming flag ignoredBuddelmann, Richard RB2021-09-081-1/+1
| |/ | | | | | | | | | | for deltafiles the legacy_transaction_resuming flag is not used, which will mark the commit as done, even if files are missing. using already existing commitstate_is_partial function as fix
* | upgrade: Stabilize deployment stagingColin Walters2021-09-073-3/+14
|/ | | | | | | | | | We're waaay overdue for this, it's been the default in rpm-ostree for years, and solves several important bugs around not capturing `/etc` while things are running. Also, `ostree admin upgrade --stage` (should) become idempotent. Closes: https://github.com/ostreedev/ostree/issues/2389
* Merge pull request #2340 from cgwalters/sign-verify-apiColin Walters2021-08-314-1/+174
|\ | | | | Add an API to verify a commit signature explicitly
| * Add an API to verify a commit signature explicitlyColin Walters2021-08-304-1/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of APIs to do GPG verification of a commit, but that doesn't generalize to signapi. Further, they require the caller to check the signature status explicitly which seems like a trap. This much higher level API works with both GPG and signapi. The intention is to use this in things that are doing "external pulls" like the ostree-ext tar import support. There we will get the commitmeta from the tarball and we want to verify it at the same time we import the commit.
* | Merge pull request #2426 from cgwalters/xattrs-bareuseronly-unionLuca Bruno2021-08-271-2/+2
|\ \ | | | | | | checkout: Also ignore xattrs for union in bare-user-only mode
| * | checkout: Also ignore xattrs for union in bare-user-only modeColin Walters2021-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Followup to PRs related to https://github.com/ostreedev/ostree/issues/2410 Since the test suite now covers this the test was failing on a Fedora SELinux enabled host where we see `security.selinux` even if not in the commit.
* | | Merge pull request #2425 from cgwalters/hardlink-correct-errnoLuca Bruno2021-08-271-0/+2
|\ \ \ | | | | | | | | checkout: Save errno when re-throwing
| * | | checkout: Save errno when re-throwingColin Walters2021-08-261-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | I was seeing an `EPERM` here which was confusing. It turned out the real error was `EEXIST`. Since we're referring to the original error, but we do a lot of computation in the middle, we need to save errno.
* | | Merge pull request #2422 from cgwalters/allow-none-detachedDan Nicholson2021-08-261-1/+3
|\ \ \ | |/ / |/| | lib: Change read_commit_detached_metadata to be nullable
| * | lib: Change read_commit_detached_metadata to be nullableColin Walters2021-08-251-1/+3
| |/ | | | | | | Hit this while working on some Rust code.
* | lib: improve transactions auto-cleanup logicLuca BRUNO2021-08-251-3/+12
|/ | | | | | | | | | This fixes some aspects of OstreeRepoAutoTransaction and re-aligns it with the logic in flatpak. Specifically: * link to the underlying repo through refcounting * bridge internal errors to warning messages * verify the input pointer type This is a preparation step before exposing this logic as a public API.
* lib/commit: automatically skip xattrs in bare-user-only modeLuca BRUNO2021-08-242-3/+4
|
* builtins/commit: set up relevant flags in bare-user-only modeLuca BRUNO2021-08-241-3/+3
| | | | | This detects bare-user-only mode and automatically enables a commit modifier with relevant flags.
* lib/diff: automatically skip xattrs in bare-user-only modeLuca BRUNO2021-08-241-2/+2
|
* bin/remote: Rename list-gpg-keys to gpg-list-keysDan Nicholson2021-08-232-1/+1
| | | | | | | | | | | | | | | As pointed out in the original review, `gpg-list-keys` fits better alongside the existing `gpg-import`. Changes were done with: ``` git grep -l list-gpg-keys | xargs sed -i 's/list-gpg-keys/gpg-list-keys/' for src in $(git ls-files '*list-gpg-keys*'); do dst=${src/list-gpg-keys/gpg-list-keys} git mv "$src" "$dst" done ```
* lib/diff: ignore xattrs if disabled on either reposLuca BRUNO2021-08-231-8/+11
| | | | | This fixes the logic to detect whether xattrs should be automatically ignored when diffing.
* Merge pull request #2412 from lucab/ups/lib-commit-canonicalizeColin Walters2021-08-202-9/+26
|\ | | | | lib/commit: autofix permissions for bare-user-only
| * lib/commit: autofix permissions for bare-user-onlyLuca BRUNO2021-08-202-9/+26
| | | | | | | | | | This tweaks commit logic to detect bare-user-only repositories and canonicalize permissions automatically.
* | Merge pull request #2401 from dbnicholson/gpg-key-infoColin Walters2021-08-2014-69/+847
|\ \ | |/ |/| Remote GPG key info
| * fixup! lib/repo: Add ostree_repo_remote_get_gpg_keys()Dan Nicholson2021-07-151-1/+1
| |
| * fixup! bin/remote: Add list-gpg-keys subcommandDan Nicholson2021-07-151-3/+3
| |
| * fixup! lib/repo: Add ostree_repo_remote_get_gpg_keys()Dan Nicholson2021-07-152-8/+8
| |
| * bin/remote: Include update URLs in list-gpg-keysDan Nicholson2021-07-151-0/+7
| |
| * lib/repo: Include WKD update URLs in GPG key listingDan Nicholson2021-07-152-0/+16
| | | | | | | | | | If the key UID contains a valid email address, include the GPG WKD update URLs in GVariant returned by ostree_repo_remote_get_gpg_keys().
| * libotutil: Add helper for GPG WKD update URLsDan Nicholson2021-07-152-0/+80
| | | | | | | | | | | | | | | | | | Calculate the advanced and direct update URLs for the key discovery portion[1] of the OpenPGP Web Key Directory specification, and include the URLs in the key listing in ostree_repo_remote_get_gpg_keys(). These URLs can be used to locate updated GPG keys for the remote. 1. https://datatracker.ietf.org/doc/html/draft-koch-openpgp-webkey-service#section-3.1
| * libotutil: Import implementation of zbase32 encodingDan Nicholson2021-07-152-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to implement the PGP Web Key Directory (WKD) URL generation. This is a slightly cleaned up implementation[1] taken from the zbase32 author's original implementation[2]. It provides a single zbase32_encode API to convert a set of bytes to the zbase32 encoding. I believe this should be acceptable for inclusion in ostree. The license in the source files is BSD style while the original repo LICENSE file claims the Creative Commons CC0 1.0 Universal license, which is public domain. 1. https://github.com/dbnicholson/libbase32/tree/for-ostree 2. https://github.com/zooko/libbase32
| * bin/remote: Add list-gpg-keys subcommandDan Nicholson2021-07-155-2/+184
| | | | | | | | | | | | | | | | This provides a wrapper for the `ostree_repo_remote_get_gpg_keys` function to show the GPG keys associated with a remote. This is particularly useful for validating that GPG key updates have been applied. Tests are added, which checks the `ostree_repo_remote_get_gpg_keys` API by extension.
| * lib/repo: Add ostree_repo_remote_get_gpg_keys()Dan Nicholson2021-07-155-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function enumerates the trusted GPG keys for a remote and returns an array of `GVariant`s describing them. This is useful to see which keys are collected by ostree for a particular remote. The same information can be gathered with `gpg`. However, since ostree allows multiple keyring locations, that's only really useful if you have knowledge of how ostree collects GPG keyrings. The format of the variants is documented in `OSTREE_GPG_KEY_GVARIANT_FORMAT`. This format is primarily a copy of selected fields within `gpgme_key_t` and its subtypes. The fields are placed within vardicts rather than using a more efficient tuple of concrete types. This will allow flexibility if more components of `gpgme_key_t` are desired in the future.
| * lib/repo: Allow preparing GPG verifier without global keyringsDan Nicholson2021-07-151-3/+4
| | | | | | | | | | | | | | | | Currently the verifier decides whether to include the global keyrings based on whether the specified remote has its own keyring or not. Allow callers to exclude the global keyrings even when that's not the case. This will be used in a subsequent commit in order to get the GPG keys only associated with a remote.
| * lib/repo: Factor out GPG verifier preparationDan Nicholson2021-07-151-20/+43
| | | | | | | | | | | | | | In order to use the GPG verifier, it needs to be seeded with GPG keys after instantation. Currently this is only used for verifying data, but it will also be used for getting a list of trusted GPG keys in a subsequent commit.
| * lib/repo: Factor out GPG verifier key importsDan Nicholson2021-07-151-45/+64
| | | | | | | | | | Currently the verifier only imports all the GPG keys when verifying data, but it would also be useful for inspecting the trusted keys.
* | lib/repo/checkout: use canonical perms in bare-user-only modeLuca BRUNO2021-08-191-1/+7
| | | | | | | | | | This automatically enables canonical permissions for checkouts in bare-user-only mode.
* | lib/core/checksum: add flag to use canonical permissionsLuca BRUNO2021-08-192-0/+17
| | | | | | | | | | | | This adds a new `OSTREE_CHECKSUM_FLAGS_CANONICAL_PERMISSIONS` checksumming flag, which is needed in bare-user-only mode to ignore local IDs.
* | Merge pull request #2414 from lucab/ups/cli-commit-modifier-autoptrColin Walters2021-08-181-3/+1
|\ \ | | | | | | builtins/commit: move commit modifier to auto-cleanup
| * | builtins/commit: move commit modifier to auto-cleanupLuca BRUNO2021-08-181-3/+1
| | | | | | | | | | | | | | | This reduces the usage of goto cleanup logic by porting the commit modifier pointer to autoptr.
* | | builtins/commit: check for conflicting permissions optionsLuca BRUNO2021-08-181-5/+17
|/ / | | | | | | | | | | This explicitly checks for commit command options asking for both non-zero UID/GID and canonical permissions at the same time, which are incompatible.
* | ostree/dump: Fix free'ing a static stringJonathan Lebon2021-08-031-2/+2
| | | | | | | | Reported-by: Seth Arnold <seth.arnold@canonical.com>
* | lib/sysroot: Fix error message about creating `/var/lib`Jonathan Lebon2021-08-031-1/+1
| | | | | | | | Reported-by: Seth Arnold <seth.arnold@canonical.com>