This release improves rename detection times from a O(n^3) operation to
roughly a O(n^2) operation (although typically less). It also makes curl
error messages more consistent across the codebase.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
This line of code is a recent addition, and I think it is more helpful
for the end user to see the pretty-printed curl error message in
addition to the error number.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This release fixes client re-exec capabilities over format bumps.
Instead of relying on a special post-update action from the server via
the Manifest.MoM (which was being done incorrectly server-side) the
client now does format bump detection by itself.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Instead of relying on swupd-server to put the post-update action in the
correct manifest and in the correct format, do the format change
detection on the client.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
The check_network() function definition was recently removed, but the
declaration remained. Remove the declaration as well.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This release adds logic to skip deletion of boot files since they are
managed by clr-boot-manager. It also adds "ghost" file handling to allow
files managed by other programs to be used as a rename base but not
actually deleted by or otherwise managed by swupd.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
The target-dir is wiped every run, so putting the .gitignore in the
target-dir directory doesn't work.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Implement handling of ghosted files in manifests via the 'g' flag. These
files are treated the same as deleted files except that they are not
actually deleted during the update. This allows ghosted files to serve
as the basis for renames while not actually being deleted by swupd.
This change also covers the verify --fix and verify --fix --picky paths.
Ghosted files will be ignored in these cases.
An example of where this is useful is with kernel files, which are
deleted from /usr/lib/kernel/ by clr-boot-manager but should still be
marked as deleted to utilize the rename functionality.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Fixes#306
Because 'ignore-list' contains patterns that cannot match lines from
'lines-checked', they should also be absent from the diff output that
compares 'lines-checked' to 'lines-output'. Implement this by post
processing 'lines-output' to omit ignored lines.
This change improves error reporting when check_lines() finds mismatches
between 'lines-checked' and 'lines-output' for a particular test.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Since I changed check_lines() to propogate the matcher.awk exit status,
this test failed due to a missing 'lines-checked' file. Add the file to
fix that issue.
Also, remove the -x and -v options to the shell invocation, because more
lines of output are produced and that should not be checked.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Fixes#307
Previously to this change, lines-checked may have contained lines
matching patterns from the ignore-list, but matcher.awk does not expect
this situation and may result in difficult-to-diagnose test failures.
Instead, pre-validate lines-checked and if this validation fails, exit
with status code 2.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
If the test passes, BATS will not print the output anyway, so always
echoing $output (regardless of exit status) is better.
Also, make sure check_lines() returns the correct status.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Because the next commit will be adding validation to ensure
lines-checked lines do not match ignore-list patterns, ignore-list must
be processed first.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
I will be reusing this logic, so moving it into a user-defined AWK
function will help with maintenance.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Add /lib/kernel as the files to skip in addition to /lib/modules as
these are managed by clear-boot-manager.
Fixes#313
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
This release fixes a bug that caused the fallback CApath to be
overlooked due to a double-increment of an index variable.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Remove the increment left-over from changing from while to for.
The issue does not impact happy scenario. However, when the fallback
needs to be used (e.g. when the default trust store is removed or in a
container where it's not generated), swupd fails to connect because it
never gets to try the fallback CApath: if there's just one fallback, it
the cycle will end before it is tried.
This release makes several bug fixes and minor improvements.
Bug fixes
- File rename bug fixed, swupd-client can now handle the simplest case
of renames where the file name changes but the content does not.
- Several compiler warning fixes.
- A fix for doc build failure for separate src and build dirs.
- Travis CI dependency update.
- Progress meter will always fully reach 100%.
- Progress meter flushes to stdout during redirected output.
Improvements
- Add progress updates for --verify.
- Support IPv6 in downloads.
- Support mixing of http and file URLs for content and version URLs.
- Add CApath fallback support.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Fixes#272
The create_update_list function was not adding a file onto its return
list if it was part of a rename that didn't change the contents. This
was due to a short circuit which failed to check if the flags
associated with a file (is_file, is_deleted etc) were the same.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
This test renames foo to bar with no changes to contents, and baz to
bat with minimal changes.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
Allow chown_root and revert_chown_root to take multiple parameters, in
particular they can now take -R to do a recursive chown.
New functions clean_web_dir, clean_state_dir and clean_target_dir to
clean things up (clean_test_dir is now an alias for
clean_state_dir).
New function set_os_release to set the value in target_dir
New function unpack_target_from_manifest. This takes two parameters
release and name. It reads the manifest, locates the files from the
web-dir/$release/staged directory and copies them into target-dir, and
also creates the directories. Helpful in creating initial versions of
target-dir. Should be expanded to do deletion.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
A colon-separated list of alternative CApath options can be passed to
swupd-client at the configuration time using --with-fallback-capaths
option.
In runtime, fallback CApath support is implemented as part of the
connectivity check. The implementation will try the default (built into
curl) and then will iterate through the list in the order they were
specified. It is done only once on the first call.
The code is reorganized to keep the connectivity check inside curl
wrapper:
* Deleted check_network implementation from version.c
* Removed have_network global (globals.c)
* Scoped swupd_curl_test_resume to curl.c
* Change use of check_network to swupd_curl_check_network
Also:
* Fixed an issue where SSL was only enabled if a URL was matching the
content URL
swupd used to enforce that version and content URL had to use the same
protocol because then it only needed to check once whether it was
downloading locally.
However, it's not that much more difficult to check each individual
URL, so now that's what swupd does now and thus the restriction is
gone.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
The calls to strstr() and strcasestr() in file_search() from search.c
result in compiler warnings when -Wnonnull is specified, because GCC's
"nonnull" attribute applies to these functions.
The logic from the file_search() call sites prevent NULL pointers from
being passed to these functions, but to protect against future
refactoring introducing this bug, check that the appropriate pointers
are non-NULL before calling the string functions.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Fixes#200
Because swupd-client uses libcurl, and my guess is that libcurl has
supported IPv6 for a long time, I don't see any reason to restrict
downloads to IPv4 only.
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Fixing the compiler issue for check_network in check_update.c triggered
test failures. Fix the test failures and improve the error output for
when check_network() fails.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Fixes#263
The conditional checking for network connection always evaluated as true
since the check_network() function was not being called. Add the
parentheses to actually check for network.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Fixes#276
Refactor fixing a single file into its own routine, then call it in a
loop with print_progress.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
The progress meter adds a dot for every 10 steps taken if the output
is not to a terminal, but the output is probably block buffered so
output only occurs every 40960 steps. Add a fflush to force it out
straight away.
Related to #256.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
The denominator for the progress report is based on the length of the
linked list to be processed, and the numerator is the number of
elements processed. Most loops have short cut conditions, which invoke
continue, which don't therefore update the numerator, and so loops end
before the progress meter shows 100%. In particular the final file
might be skipped.
Update the numerator early in the loop, and add a final call to
print_progress to force showing 100% if it has not already been done.
Note this can force another dot to be output for the case where stdout
is not connected to a terminal.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
Now we have dots (or percentages) when files are being downloaded
these can intermingle with the normal output if they are flushed.
Alter the fix-missing-file test to remove dots from the lines to be
compared, and alter the lines-checked to add in the lines which would
normally be ignored but no longer match due to the missing dots,
e.g. "Downloading packs."
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
Recent outages to sourceforge break Travis CI runs. Use the github
release instead and update to the latest version of libcheck (0.11.0).
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Use = rather than := on the line. It is only an efficiency gain.
replace patsubst and filter with a new variable and standard
substitution.
Replace %-style pattern with suffix rule.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
glibc marks system() as a function whose return value should not be
ignored, which is generally reasonable. In this case we do want to
ignore the return value. Just casting to void is not enough to stop
the gcc warning. So instead we use the value in an if statement with
an empty body, which we trust the optimizer to remove so there is no
run time penalty.
The alternative solution would be to use
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwarn_unused_result"
system(log_cmd);
#pragma GCC diagnostic pop
but that is rather gcc specific.
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
This release improves error reporting for container use-cases.
* Adds systemctl check for autoupdate to correctly report that swupd is
"Unable to determine autoupdate status" in a container.
* Adds a --no-boot-update flag to disable boot file updates particularly
for use in a container when boot file management will fail.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Since clr-boot-manager does not work in a container add the
--no-boot-update option to allow installation into a container to skip
the boot partition management. This also calls apply_heuristics when
running bundle-add, with the result of running CBM when necessary for
bundle-adds and skipping CBM when the --no-boot-update flag is
specified.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
In a container systemctl does not work, and /usr/bin/systemctl fails as
expected with "Failed to connect to bus: No such file or directory."
Because of this, swupd autoupdate will not work either. However,
"systemctl is-enabled ..." will not fail, even though it should.
Add an additional check to make sure /usr/bin/systemctl is working
before checking if swupd-update.service is-enabled. Report that swupd
was "Unable to determine autoupdate status" if this check fails.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
This release improves error messages for post update scripts when
systemd is not operable, such as in a container, adds a --force or
--picky requirement when verify --fixing to another version, and
performs hash checks on every file when adding a bundle.
Signed-off-by: Matthew Johnson <matthew.johnson@intel.com>
Matthew Johnson