Merge pull request #1 from koditoriet/github-ci

Add CI workflows.

Author: valderman

.github/workflows/unit-tests.yml

@@ -0,0 +1,23 @@
+name: Run unit tests
+on: [push]
+jobs:
+    unit-tests:
+        runs-on: self-hosted
+        steps:
+            - run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+            - name: Check out repo
+              uses: actions/checkout@v4
+            - run: |
+                . "$HOME/.cargo/env"
+                cargo test
+                dbus-run-session cargo test --features=install,dbus-tests
+    clippy:
+        runs-on: self-hosted
+        steps:
+            - run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+            - name: Check out repo
+              uses: actions/checkout@v4
+            - run: |
+                . "$HOME/.cargo/env"
+                cargo clippy
+                cargo clippy --features=install,dbus-tests

Makefile

@@ -17,8 +17,18 @@ totpm-$(VERSION).tar.gz: $(SOURCES)
 totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).src.rpm: totpm-$(VERSION).tar.gz
 	fedpkg --release f$(FEDORA_RELEASE) srpm
 
-totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).$(ARCH).rpm: totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).src.rpm
-	fedpkg --release f$(FEDORA_RELEASE) mockbuild
+totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).$(ARCH).rpm: totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).src.rpm fedora-builder/Dockerfile fedora-builder/storage.conf
+	podman build \
+		-t totpm-builder:$(FEDORA_RELEASE) \
+		--build-arg FEDORA_RELEASE=$(FEDORA_RELEASE) \
+		fedora-builder
+
+	podman run \
+		--privileged \
+		-v .:/build:rw,z \
+		totpm-builder:$(FEDORA_RELEASE) \
+		fedpkg --release f$(FEDORA_RELEASE) mockbuild
+
 	cp -a results_totpm/$(VERSION)/1.fc$(FEDORA_RELEASE)/totpm-$(VERSION)-1.fc$(FEDORA_RELEASE).$(ARCH).rpm ./
 
 .PHONY: fedora-package

fedora-builder/Dockerfile

@@ -0,0 +1,7 @@
+ARG FEDORA_RELEASE=40
+FROM fedora:${FEDORA_RELEASE}
+VOLUME /build
+RUN dnf -y install jq cargo fedpkg
+RUN mkdir -p /run/containers/storage /var/lib/containers/storage
+COPY ./storage.conf /etc/containers/storage.conf
+WORKDIR /build

fedora-builder/storage.conf

@@ -0,0 +1,4 @@
+[storage]
+driver = "vfs"
+runroot = "/run/containers/storage"
+graphroot = "/var/lib/containers/storage"

src/commands/init.rs

@@ -177,7 +177,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn init_creates_all_necessary_and_files_with_correct_permissions() {
+    fn init_creates_all_necessary_secrets_and_files_with_correct_permissions() {
         let swtpm = SwTpm::new();
         let dir = tempdir().unwrap();
         let cfg_path = dir.path().join("totpm.conf");
@@ -298,6 +298,6 @@ mod tests {
     }
 
     fn get_user_name() -> String {
-        std::env::var("USER").unwrap_or("root".to_string())
+        String::from_utf8(Command::new("whoami").output().unwrap().stdout).unwrap().trim().to_string()
     }
 }

src/presence_verification/fprintd.rs

@@ -114,7 +114,7 @@ impl <'a> FprintDevice<'a> {
             true
         }).or(fail("fprintd: unable to listen for signal"))?;
 
-        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStart", ("any",))
+        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStart", ("any",))
             .or(fail("fprintd: unable to start fingerprint verification"))?;
 
         eprintln!("place your finger on the fingerprint reader");
@@ -129,15 +129,15 @@ impl <'a> FprintDevice<'a> {
             if let Some(status) = *scan_status_clone.lock().unwrap() {
                 match status {
                     Status::Match => {
-                        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
+                        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
                             .or(fail("fprintd: unable to stop fingerprint verification"))?;
                         return Ok(true)
                     },
                     Status::NoMatch => {
                         eprintln!("fingerprint not recognized, try again");
-                        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
+                        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
                             .or(fail("fprintd: unable to stop fingerprint verification"))?;
-                        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStart", ("any",))
+                        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStart", ("any",))
                             .or(fail("fprintd: unable to restart fingerprint verification"))?;
                     },
                     Status::RetryScan | Status::SwipeTooShort | Status::FingerNotCentered | Status::RemoveAndRetry => {
@@ -148,15 +148,15 @@ impl <'a> FprintDevice<'a> {
                         return fail("fprintd: fingerprint reader disconnected")
                     },
                     Status::UnknownError => {
-                        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
+                        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
                             .or(fail("fprintd: unable to stop fingerprint verification"))?;
                         return fail("fprintd: fingerprint scan failed with unknown error")
                     },
                 }
 
             }
         }
-        self.proxy.method_call(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
+        self.proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "VerifyStop", ())
             .or(fail("fprintd: unable to stop fingerprint verification"))?;
         Ok(false)
     }
@@ -175,7 +175,7 @@ impl <'a> FprintDevice<'a> {
             device_path,
             Duration::from_secs(10),
         );
-        proxy.method_call(FPRINTD_DEVICE_IFACE, "Claim", ("",))
+        proxy.method_call::<(), _, _, _>(FPRINTD_DEVICE_IFACE, "Claim", ("",))
             .or(Err(super::Error::ImplementationSpecificError("fprintd: unable to claim device".to_owned())))?;
         Ok(FprintDevice { proxy, connection: conn })
     }