Add testutils generate-synthetic-upgrade

We want to test upgrades that actually change files as a general
rule; in some cases we want to test "large" upgrades to validate
performance.

This code generates a "synthetic" upgrade that adds an ELF note
to a percentage of ELF files (randomly selected).  By doing
it this way we are only actually testing one version of the code.

Migrated from https://github.com/coreos/coreos-assembler/pull/1635/
using the Rust code from https://github.com/ostreedev/ostree/pull/2127

rust/.gitignore

@@ -0,0 +1 @@
+target/

rust/Cargo.lock

@@ -689,6 +689,7 @@ dependencies = [
  "nix 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "openat 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "openat-ext 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.115 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",

rust/Cargo.toml

@@ -23,6 +23,7 @@ openat-ext = "0.1.4"
 curl = "0.4.31"
 rayon = "1.3"
 c_utf8 = "0.1.0"
+rand = "0.7.3"
 systemd = "0.4.0"
 indicatif = "0.15.0"
 lazy_static = "1.1.0"

rust/src/lib.rs

@@ -25,3 +25,5 @@ mod lockfile;
 pub use self::lockfile::*;
 mod utils;
 pub use self::utils::*;
+mod testutils;
+pub use self::testutils::*;

rust/src/testutils.rs

@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ */
+
+//! # Test utility functions
+//!
+//! This backs the hidden `rpm-ostree testutils` CLI.  Subject
+//! to change.
+
+use anyhow::{Context, Result};
+use openat;
+use openat_ext::{FileExt, OpenatDirExt};
+use rand::Rng;
+use std::fs;
+use std::fs::File;
+use std::io::Write as IoWrite;
+use std::os::unix::fs::FileExt as UnixFileExt;
+use std::path::Path;
+use std::process::Command;
+use structopt::StructOpt;
+
+#[derive(Debug, StructOpt)]
+struct SyntheticUpgradeOpts {
+    #[structopt(long)]
+    repo: String,
+
+    #[structopt(long = "srcref")]
+    src_ref: Option<String>,
+
+    #[structopt(long = "ref")]
+    ostref: String,
+
+    #[structopt(long, default_value = "30")]
+    percentage: u32,
+
+    #[structopt(long)]
+    commit_version: Option<String>,
+}
+
+#[derive(Debug, StructOpt)]
+#[structopt(name = "testutils")]
+#[structopt(rename_all = "kebab-case")]
+enum Opt {
+    /// Generate an OS update by changing ELF files
+    GenerateSyntheticUpgrade(SyntheticUpgradeOpts),
+}
+
+/// Returns `true` if a file is ELF; see https://en.wikipedia.org/wiki/Executable_and_Linkable_Format
+pub(crate) fn is_elf(f: &mut File) -> Result<bool> {
+    let mut buf = [0; 5];
+    let n = f.read_at(&mut buf, 0)?;
+    if n < buf.len() {
+        anyhow::bail!("Failed to read expected {} bytes", buf.len());
+    }
+    Ok(buf[0] == 0x7F && &buf[1..4] == b"ELF")
+}
+
+pub(crate) fn mutate_one_executable_to(
+    f: &mut File,
+    name: &std::ffi::OsStr,
+    dest: &openat::Dir,
+    notepath: &str,
+    have_objcopy: bool,
+) -> Result<()> {
+    let mut destf = dest
+        .write_file(name, 0o755)
+        .context("Failed to open for write")?;
+    f.copy_to(&destf).context("Failed to copy")?;
+    if have_objcopy {
+        std::mem::drop(destf);
+        let r = Command::new("objcopy")
+            .arg(format!("--add-section=.note.coreos-synthetic={}", notepath))
+            .status()?;
+        if !r.success() {
+            anyhow::bail!("objcopy failed: {:?}", r)
+        }
+    } else {
+        // ELF is OK with us just appending some junk
+        let extra = rand::thread_rng()
+            .sample_iter(&rand::distributions::Alphanumeric)
+            .take(10)
+            .collect::<String>();
+        destf
+            .write_all(extra.as_bytes())
+            .context("Failed to append extra data")?;
+    }
+
+    Ok(())
+}
+
+/// Find ELF files in the srcdir, write new copies to dest (only percentage)
+pub(crate) fn mutate_executables_to(
+    src: &openat::Dir,
+    dest: &openat::Dir,
+    percentage: u32,
+    notepath: &str,
+    have_objcopy: bool,
+) -> Result<u32> {
+    use nix::sys::stat::Mode as NixMode;
+    assert!(percentage > 0 && percentage <= 100);
+    let mut mutated = 0;
+    for entry in src.list_dir(".")? {
+        let entry = entry?;
+        if src.get_file_type(&entry)? != openat::SimpleType::File {
+            continue;
+        }
+        let meta = src.metadata(entry.file_name())?;
+        let st = meta.stat();
+        let mode = NixMode::from_bits_truncate(st.st_mode);
+        // Must be executable
+        if !mode.intersects(NixMode::S_IXUSR | NixMode::S_IXGRP | NixMode::S_IXOTH) {
+            continue;
+        }
+        // Not suid
+        if mode.intersects(NixMode::S_ISUID | NixMode::S_ISGID) {
+            continue;
+        }
+        // Greater than 1k in size
+        if st.st_size < 1024 {
+            continue;
+        }
+        let mut f = src.open_file(entry.file_name())?;
+        if !is_elf(&mut f)? {
+            continue;
+        }
+        if !rand::thread_rng().gen_ratio(percentage, 100) {
+            continue;
+        }
+        mutate_one_executable_to(&mut f, entry.file_name(), dest, notepath, have_objcopy)
+            .with_context(|| format!("Failed updating {:?}", entry.file_name()))?;
+        mutated += 1;
+    }
+    Ok(mutated)
+}
+
+// Note this function is copied from https://github.com/ostreedev/ostree/blob/364556b8ae30d1a70179a49e5238c8f5e85f8776/tests/inst/src/treegen.rs#L117
+// The ostree version may later use this one.
+/// Given an ostree ref, use the running root filesystem as a source, update
+/// `percentage` percent of binary (ELF) files
+fn update_os_tree(opts: &SyntheticUpgradeOpts) -> Result<()> {
+    // A new mount namespace should have been created for us
+    let r = Command::new("mount")
+        .args(&["-o", "remount,rw", "/sysroot"])
+        .status()?;
+    if !r.success() {
+        anyhow::bail!("Failed to remount /sysroot");
+    }
+    assert!(opts.percentage > 0 && opts.percentage <= 100);
+    let repo_path = Path::new(opts.repo.as_str());
+    let tempdir = tempfile::tempdir_in(repo_path.join("tmp"))?;
+    let tmp_rootfs = tempdir.path().join("rootfs");
+    fs::create_dir(&tmp_rootfs)?;
+    let notepath = tempdir.path().join("note");
+    fs::write(&notepath, "Synthetic upgrade")?;
+    let mut mutated = 0;
+    // TODO run this as a container image, or (much more heavyweight)
+    // depend on https://lib.rs/crates/goblin
+    let have_objcopy = Path::new("/usr/bin/objcopy").exists();
+    {
+        let tempdir = openat::Dir::open(&tmp_rootfs)?;
+        let binary_dirs = &["usr/bin", "usr/sbin", "usr/lib", "usr/lib64"];
+        let rootfs = openat::Dir::open("/")?;
+        for v in binary_dirs {
+            let v = *v;
+            if let Some(src) = rootfs.sub_dir_optional(v)? {
+                tempdir.ensure_dir("usr", 0o755)?;
+                tempdir.ensure_dir(v, 0o755)?;
+                let dest = tempdir.sub_dir(v)?;
+                mutated += mutate_executables_to(
+                    &src,
+                    &dest,
+                    opts.percentage,
+                    notepath.to_str().unwrap(),
+                    have_objcopy,
+                )
+                .with_context(|| format!("Replacing binaries in {}", v))?;
+            }
+        }
+    }
+    assert!(mutated > 0);
+    println!("Mutated ELF files: {}", mutated);
+    let src_ref = opts
+        .src_ref
+        .as_ref()
+        .map(|s| s.as_str())
+        .unwrap_or(opts.ostref.as_str());
+    let mut cmd = Command::new("ostree");
+    cmd.arg(format!("--repo={}", repo_path.to_str().unwrap()))
+        .args(&["commit", "--consume", "-b"])
+        .arg(opts.ostref.as_str())
+        .args(&[
+            format!("--base={}", src_ref),
+            format!("--tree=dir={}", tmp_rootfs.to_str().unwrap()),
+        ])
+        .args(&[
+            "--owner-uid=0",
+            "--owner-gid=0",
+            "--selinux-policy-from-base",
+            "--link-checkout-speedup",
+            "--no-bindings",
+            "--no-xattrs",
+        ]);
+    if let Some(v) = opts.commit_version.as_ref() {
+        cmd.arg(format!("--add-metadata-string=version={}", v));
+    }
+    let r = cmd.status()?;
+    if !r.success() {
+        anyhow::bail!("Failed to commit updated content: {:?}", r)
+    }
+    Ok(())
+}
+
+fn testutils_main(args: &Vec<String>) -> Result<()> {
+    let opt = Opt::from_iter(args.iter());
+    match opt {
+        Opt::GenerateSyntheticUpgrade(ref opts) => update_os_tree(opts)?,
+    };
+    Ok(())
+}
+
+mod ffi {
+    use super::*;
+    use glib_sys;
+    use libc;
+
+    use crate::ffiutil::*;
+
+    #[no_mangle]
+    pub extern "C" fn ror_testutils_entrypoint(
+        argv: *mut *mut libc::c_char,
+        gerror: *mut *mut glib_sys::GError,
+    ) -> libc::c_int {
+        let v: Vec<String> = unsafe { glib::translate::FromGlibPtrContainer::from_glib_none(argv) };
+        int_glib_error(testutils_main(&v), gerror)
+    }
+}
+pub use self::ffi::*;

src/app/rpmostree-builtin-testutils.c

@@ -26,6 +26,7 @@
 
 #include "rpmostree-builtins.h"
 #include "rpmostree-rpm-util.h"
+#include "rpmostree-rust.h"
 
 gboolean
 rpmostree_testutils_builtin_inject_pkglist (int argc, char **argv,
@@ -35,6 +36,7 @@ rpmostree_testutils_builtin_inject_pkglist (int argc, char **argv,
 static RpmOstreeCommand testutils_subcommands[] = {
   { "inject-pkglist", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
     NULL, rpmostree_testutils_builtin_inject_pkglist },
+  // Avoid adding other commands here - write them in Rust in testutils.rs
   { NULL, 0, NULL, NULL }
 };
 
@@ -43,8 +45,18 @@ rpmostree_builtin_testutils (int argc, char **argv,
                              RpmOstreeCommandInvocation *invocation,
                              GCancellable *cancellable, GError **error)
 {
-  return rpmostree_handle_subcommand (argc, argv, testutils_subcommands,
-                                      invocation, cancellable, error);
+  // See above; avoid adding other commands here - write them in Rust in testutils.rs
+  if (argc >= 2 && g_str_equal (argv[1], "inject-pkglist"))
+    return rpmostree_handle_subcommand (argc, argv, testutils_subcommands,
+                                        invocation, cancellable, error);
+  else
+    {
+        g_autoptr(GPtrArray) args = g_ptr_array_new ();
+        for (int i = 0; i < argc; i++)
+          g_ptr_array_add (args, argv[i]);
+        g_ptr_array_add (args, NULL);
+        return ror_testutils_entrypoint ((char**)args->pdata, error);
+    }
 }
 
 /*

tests/common/libvm.sh

@@ -676,8 +676,9 @@ vm_ostreeupdate_lift_commit() {
 _commit_and_inject_pkglist() {
   local version=$1; shift
   local src_ref=$1; shift
-  vm_cmd ostree commit --repo=$REMOTE_OSTREE -b vmcheck --fsync=no \
-    --tree=ref=$src_ref --add-metadata-string=version=$version
+  # Small percentage by default here; unshare to create a new mount namespace to make /sysroot writable
+  vm_cmd unshare -m rpm-ostree testutils generate-synthetic-upgrade --percentage=5 --repo=$REMOTE_OSTREE --ref=vmcheck \
+    --srcref=$src_ref --commit-version=$version
   vm_cmd_sysroot_rw rpm-ostree testutils inject-pkglist $REMOTE_OSTREE vmcheck
 }