Enable bundle delete during non-format bump updates

Signed-off-by: William Douglas <william.douglas@intel.com>

Author: William Douglas

src/cmds/bundle_list.c

@@ -270,6 +270,12 @@ static enum swupd_code show_included_bundles(char *bundle_name, int version)
 		goto out;
 	}
 
+	if (!mom_search_bundle(mom, bundle_name)) {
+		ret_code = SWUPD_INVALID_BUNDLE;
+		warn("Bundle \"%s\" is invalid, skipping it...", bundle_name);
+		goto out;
+	}
+
 	// add_subscriptions takes a list, so construct one with only bundle_name
 	bundles = list_prepend_data(bundles, bundle_name);
 	ret = add_subscriptions(bundles, &subs, mom, true, 0);

src/cmds/update.c

@@ -137,7 +137,7 @@ int add_included_manifests(struct manifest *mom, struct list **subs)
 	 * hit the Manifest delta path. */
 	ret = add_subscriptions(subbed, subs, mom, true, 0);
 	list_free_list(subbed);
-	if (ret & (add_sub_ERR | add_sub_BADNAME)) {
+	if (ret & add_sub_ERR) {
 		return ret;
 	}
 
@@ -258,6 +258,47 @@ static struct list *create_update_list(struct manifest *server)
 	return output;
 }
 
+static void handle_deleted_bundles(struct manifest *current_manifest, struct manifest *server_manifest)
+{
+	struct list *deletes = NULL;
+	struct list *list1, *list2;
+	struct file *file1, *file2;
+
+	list1 = list_head(current_manifest->files);
+	list2 = list_head(server_manifest->files);
+
+	while (list1 && list2) { /* m1/file1 matches m2/file2 */
+		int ret;
+		file1 = list1->data;
+		file2 = list2->data;
+
+		ret = str_cmp(file1->filename, file2->filename);
+		if (ret == 0) {
+			list1 = list1->next;
+			list2 = list2->next;
+			continue;
+		}
+		if (ret < 0) { /*  m1/file1 is before m2/file2 */
+			file1->is_deleted = true;
+			deletes = list_prepend_data(deletes, file1);
+			list1 = list1->next;
+			continue;
+		} /* else ret > 0  m1/file1 is after m2/file2 */
+		list2 = list2->next;
+	}
+
+	while (list1) {
+		file1 = list1->data;
+		file1->is_deleted = true;
+		deletes = list_prepend_data(deletes, file1);
+		list1 = list1->next;
+	}
+
+	deletes = list_sort(deletes, cmp_file_filename_is_deleted);
+	heuristics_apply(deletes);
+	(void)rename_all_files_to_final(deletes);
+}
+
 enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_fn_t file_validation_fn)
 {
 	int current_version = -1, server_version = -1;
@@ -366,14 +407,8 @@ enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_
 	timelist_timer_start(globals.global_times, "Add included bundle manifests");
 	ret = add_included_manifests(server_manifest, &latest_subs);
 	if (ret) {
-		if (ret & add_sub_BADNAME) {
-			/* this means a bundle(s) was removed in a future version */
-			warn("One or more installed bundles are no longer available at version %d\n",
-			     server_version);
-		} else {
-			ret = SWUPD_RECURSE_MANIFEST;
-			goto clean_exit;
-		}
+		ret = SWUPD_RECURSE_MANIFEST;
+		goto clean_exit;
 	}
 	timelist_timer_stop(globals.global_times); // closing: Add included bundle manifests
 
@@ -430,6 +465,11 @@ enum swupd_code execute_update_extra(extra_proc_fn_t post_update_fn, extra_proc_
 	heuristics_apply(updates);
 	timelist_timer_stop(globals.global_times); // closing: Applying heuristics
 	ret = update_loop(updates, server_manifest, file_validation_fn);
+	if (!download_only) {
+		timelist_timer_start(globals.global_times, "Bundle deletes");
+		handle_deleted_bundles(current_manifest, server_manifest);
+		timelist_timer_stop(globals.global_times); // closing Bundle deletes
+	}
 	if (ret == 0 && !download_only) {
 		/* Failure to write the version file in the state directory
 		 * should not affect exit status. */

src/cmds/verify.c

@@ -1029,6 +1029,16 @@ enum swupd_code execute_verify_extra(extra_proc_fn_t post_verify_fn)
 	/* get the list of subscribed (installed) bundles */
 	read_subscriptions(&all_subs);
 	selected_subs = all_subs;
+	if (!cmdline_option_force) {
+		char *bundle_name = NULL;
+		for (iter = list_head(all_subs); iter; iter = iter->next) {
+			bundle_name = ((struct sub *)(iter->data))->component;
+			if (!mom_search_bundle(official_manifest, bundle_name)) {
+				invalid_bundle = true;
+				warn("Bundle \"%s\" is invalid, skipping it...\n", bundle_name);
+			}
+		}
+	}
 	if (cmdline_option_bundles) {
 		info("\n");
 		for (iter = list_head(cmdline_option_bundles); iter; iter = iter->next) {
@@ -1084,18 +1094,7 @@ enum swupd_code execute_verify_extra(extra_proc_fn_t post_verify_fn)
 	 * continue only if --force was used since the bundles could be removed */
 	if (ret || invalid_bundle) {
 		if ((ret & add_sub_BADNAME) || invalid_bundle) {
-			if (cmdline_option_force) {
-				if (cmdline_option_picky && cmdline_option_fix) {
-					warn("\nOne or more installed bundles that are not "
-					     "available at version %d will be removed\n",
-					     version);
-				} else if (cmdline_option_picky && !cmdline_option_fix) {
-					warn("\nOne or more installed bundles are not "
-					     "available at version %d\n",
-					     version);
-				}
-				ret = SWUPD_OK;
-			} else {
+			if (!cmdline_option_force) {
 				if (cmdline_option_install || cmdline_option_bundles) {
 					error("\nOne or more of the provided bundles are not available at version %d\n", version);
 					info("Please make sure the name of the provided bundles are correct, or use --force to override\n")

src/swupd_lib/manifest.c

@@ -469,19 +469,20 @@ void link_manifests(struct manifest *m1, struct manifest *m2)
 			continue;
 		}
 		if (ret < 0) { /*  m1/file1 is before m2/file2 */
-			/* File is absent in m2, indicating that a format bump
-			 * happened, removing deleted file entries from the
-			 * previous format(s). Do not account the deleted file
-			 * in this case, since an update will not delete the
-			 * file.
-			 */
+			account_deleted_file();
 			list1 = list1->next;
 			continue;
 		} /* else ret > 0  m1/file1 is after m2/file2 */
 		list2 = list2->next;
 		account_new_file();
 	}
 
+	// Capture deleted files if they are at the tail end of the file list
+	while (list1) {
+		list1 = list1->next;
+		account_deleted_bundle();
+	}
+
 	// Capture new files if they are at the tail end of the file list
 	while (list2) {
 		list2 = list2->next;
@@ -534,9 +535,10 @@ void link_submanifests(struct manifest *m1, struct manifest *m2, struct list *su
 		}
 		if (ret < 0) { /*  m1/file1 is before m2/file2 */
 			/* A bundle manifest going missing from the MoM in the
-			 * latest version is a breaking change, only possible
-			 * during a format bump, so don't account for this
-			 * possibility in the stats. */
+			 * latest version is no longer a breaking change. */
+			if (!server && subbed1) {
+				account_deleted_bundle();
+			}
 			list1 = list1->next;
 			continue;
 		} /* else ret > 0  m1/file1 is after m2/file2 */
@@ -546,8 +548,14 @@ void link_submanifests(struct manifest *m1, struct manifest *m2, struct list *su
 		}
 	}
 
+	// Capture deleted bundles if they are at the tail end of the list
+	while (!server && list1) {
+		list1 = list1->next;
+		account_deleted_bundle();
+	}
+
 	// Capture new bundles if they are at the tail end of the list
-	while (list2) {
+	while (server && list2) {
 		file2 = list2->data;
 		list2 = list2->next;
 		bool subbed2 = component_subscribed(subs2, file2->filename);

src/swupd_lib/subscriptions.c

@@ -202,8 +202,7 @@ static int recurse_subscriptions(struct list *bundles, struct list **subs, struc
 
 		file = mom_search_bundle(mom, bundle);
 		if (!file) {
-			warn("Bundle \"%s\" is invalid, skipping it...\n", bundle);
-			ret |= add_sub_BADNAME; /* Use this to get non-zero exit code */
+			// No longer add_sub_BADNAME with bundle deletes allowed
 			continue;
 		}
 

src/swupd_lib/target_root.c

@@ -640,7 +640,7 @@ int rename_staged_file_to_final(struct file *file)
 	return ret;
 }
 
-static int rename_all_files_to_final(struct list *updates)
+int rename_all_files_to_final(struct list *updates)
 {
 	int ret, update_errs = 0;
 	struct list *dirs_to_remove = NULL;

src/swupd_lib/target_root.h

@@ -13,6 +13,13 @@
 extern "C" {
 #endif
 
+/**
+ * @brief Final stage of filesystem modification.
+ *
+ * @param updates The list of files to be modified.
+ */
+int rename_all_files_to_final(struct list *updates);
+
 /**
  * @brief Install files from 'files' into the system.
  *

test/functional/diagnose/diagnose-picky-downgrade.bats

@@ -20,8 +20,6 @@ test_setup() {
 	expected_output=$(cat <<-EOM
 		Diagnosing version 10
 		Downloading missing manifests...
-		Warning: Bundle "test-bundle2" is invalid, skipping it...
-		Warning: One or more installed bundles are not available at version 10
 		Checking for missing files
 		Checking for corrupt files
 		 -> Hash mismatch for file: $ABS_TARGET_DIR/usr/lib/os-release

test/functional/repair/repair-picky-downgrade.bats

@@ -23,8 +23,8 @@ test_setup() {
 	expected_output=$(cat <<-EOM
 		Diagnosing version 10
 		Warning: The --picky option is specified; ignoring version mismatch for repair
-		Downloading missing manifests...
 		Warning: Bundle "test-bundle2" is invalid, skipping it...
+		Downloading missing manifests...
 		Error: Unable to verify. One or more currently installed bundles are not available at version 10. Use --force to override
 		Repair did not fully succeed
 	EOM
@@ -47,8 +47,6 @@ test_setup() {
 		Diagnosing version 10
 		Warning: The --force option is specified; ignoring version mismatch for repair
 		Downloading missing manifests...
-		Warning: Bundle "test-bundle2" is invalid, skipping it...
-		Warning: One or more installed bundles that are not available at version 10 will be removed
 		Checking for corrupt files
 		Validate downloaded files
 		Starting download of remaining update content. This may take a while...
@@ -93,8 +91,6 @@ test_setup() {
 		Diagnosing version 10
 		Warning: The --force option is specified; ignoring version mismatch for repair
 		Downloading missing manifests...
-		Warning: Bundle "test-bundle2" is invalid, skipping it...
-		Warning: One or more installed bundles that are not available at version 10 will be removed
 		Checking for corrupt files
 		Validate downloaded files
 		Starting download of remaining update content. This may take a while...

test/functional/update/update-bundle-removed.bats

@@ -17,28 +17,24 @@ test_setup() {
 @test "UPD008: Updating a system where a bundle was removed in the newer version" {
 
 	# If a bundle happens to be removed from the content server (or mix) it means the
-	# bundle won't be in the MoM anymore, so the bundle in the system will look like an
-	# invalid bundle. If this happens, the user should be informed, and the update should
-	# continue.
+	# bundle won't be in the MoM anymore, this now indicates a bundle delete.
 
 	run sudo sh -c "$SWUPD update $SWUPD_OPTS"
 
 	assert_status_is 0
 	expected_output=$(cat <<-EOM
 		Update started
 		Preparing to update from 10 to 20
-		Warning: Bundle "test-bundle1" is invalid, skipping it...
-		Warning: One or more installed bundles are no longer available at version 20
 		Downloading packs for:
 		 - os-core
 		Finishing packs extraction...
 		Statistics for going from version 10 to version 20:
 		    changed bundles   : 1
 		    new bundles       : 0
-		    deleted bundles   : 0
+		    deleted bundles   : 1
 		    changed files     : 2
 		    new files         : 0
-		    deleted files     : 0
+		    deleted files     : 2
 		Validate downloaded files
 		No extra files need to be downloaded
 		Installing files...
@@ -49,8 +45,8 @@ test_setup() {
 	)
 	assert_is_output "$expected_output"
 	# bundle should not be removed
-	assert_file_exists "$TARGET_DIR"/file_1
-	assert_file_exists "$TARGET_DIR"/usr/share/clear/bundles/test-bundle1
+	assert_file_not_exists "$TARGET_DIR"/file_1
+	assert_file_not_exists "$TARGET_DIR"/usr/share/clear/bundles/test-bundle1
 
 }
 #WEIGHT=5