Merge pull request #232 from runcom/update-spec-openssl

chore(fido-device-onboard.spec): update to 0.4.5 latest

admin-tool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-admin-tool"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Antonio Murdaca <[email protected]>"]
 edition = "2018"
 
@@ -22,7 +22,7 @@ pretty_env_logger = "0.4"
 nix = "0.23"
 tokio = { version = "1", features = ["full"] }
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["server", "client"] }
-fdo-store = { path = "../store", version = "0.4.0", features = ["directory"] }
-fdo-util = { path = "../util", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["server", "client"] }
+fdo-store = { path = "../store", version = "0.4.5", features = ["directory"] }
+fdo-util = { path = "../util", version = "0.4.5" }

client-linuxapp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-client-linuxapp"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 
@@ -22,6 +22,6 @@ libcryptsetup-rs = { version = "0.5.0", features = ["mutex"] }
 secrecy = "0.8"
 devicemapper = "0.32"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["client"] }
-fdo-util = { path = "../util", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["client"] }
+fdo-util = { path = "../util", version = "0.4.5" }

data-formats/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-data-formats"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 

examples/config/manufacturing-server.yml

@@ -12,8 +12,8 @@ rendezvous_info:
   owner_port: 8082
   protocol: http
 - ip: 127.0.0.1
-  device_port: 8083
-  owner_port: 8083
+  device_port: 8084
+  owner_port: 8084
   protocol: http
 protocols:
   diun:

examples/config/serviceinfo-api-server.yml

@@ -0,0 +1,39 @@
+---
+bind: 0.0.0.0:8083
+device_specific_store_driver:
+  Directory:
+    path: /path/to/device_specific_serviceinfo
+service_info_auth_token: TestAuthToken
+admin_auth_token: TestAdminToken
+service_info:
+  initial_user:
+    username: admin
+    sshkeys:
+    - "testkey"
+  files:
+  - path: hosts
+    permissions: 644
+    source_path: /etc/hosts
+  - path: resolv.conf
+    source_path: /etc/resolv.conf
+  commands:
+  - command: ls
+    args:
+    - /etc/hosts
+    return_stdout: true
+    return_stderr: true
+  - command: ls
+    args:
+    - /etc/doesnotexist/whatever.foo
+    may_fail: true
+    return_stdout: true
+    return_stderr: true
+  - command: touch
+    args:
+    - /etc/command-testfile
+  diskencryption_clevis:
+  - disk_label: /dev/vda
+    binding:
+      pin: test
+      config: "{}"
+    reencrypt: true

examples/systemd/fdo-aio.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=FDO service info API server
+After=network-online.target
+
+[Service]
+Environment=LOG_LEVEL=info
+ExecStart=/usr/bin/fdo-admin-tool aio --directory /etc/fdo/aio --binary-path /usr/libexec/fdo
+# restart and failure condition
+
+[Install]
+WantedBy=multi-user.target

examples/systemd/fdo-serviceinfo-api-server.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=FDO service info API server
+After=network-online.target
+
+[Service]
+Environment=LOG_LEVEL=info
+ExecStart=/usr/libexec/fdo/fdo-serviceinfo-api-server
+# restart and failure condition
+
+[Install]
+WantedBy=multi-user.target

fido-device-onboard.spec

@@ -4,15 +4,15 @@
 %global __cargo_is_lib() false
 %global forgeurl https://github.com/fedora-iot/fido-device-onboard-rs
 
-Version:        0.4.0
+Version:        0.4.5
 
 %forgemeta
 
 Name:           fido-device-onboard
 Release:        1%{?dist}
 Summary:        An implementation of the FIDO Device Onboard Specification written in rust
 
-License:        BSD 3
+License:        BSD
 URL:            %{forgeurl}
 Source:         %{forgesource}
 %if 0%{?rhel} && !0%{?eln}
@@ -33,7 +33,9 @@ BuildRequires:  rust-toolset
 BuildRequires:  rust-packaging
 %endif
 BuildRequires: systemd-rpm-macros
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 3.0.1-12
+BuildRequires: golang
+BuildRequires: tpm2-tss-devel
 
 %description
 %{summary}.
@@ -55,9 +57,15 @@ install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-manufact
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-manufacturing-server
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-owner-onboarding-server
 install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-rendezvous-server
+install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-serviceinfo-api-server
+# duplicates as needed by AIO command
+install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-owner-tool
+install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-admin-tool
 install -D -m 0755 -t %{buildroot}%{_bindir} target/release/fdo-owner-tool
+install -D -m 0755 -t %{buildroot}%{_bindir} target/release/fdo-admin-tool
 install -D -m 0644 -t %{buildroot}%{_unitdir} examples/systemd/*
 install -D -m 0644 -t %{buildroot}%{_docdir}/fdo examples/config/*
+mkdir -p %{buildroot}%{_sysconfdir}/fdo
 # 52fdo
 install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/module-setup.sh
 install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/manufacturing-client-generator
@@ -66,6 +74,7 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/m
 
 %package -n fdo-init
 Summary: dracut module for device initialization
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-init
 %{summary}
 
@@ -76,23 +85,30 @@ Summary: dracut module for device initialization
 
 %package -n fdo-owner-onboarding-server
 Summary: FDO Owner Onboarding Server implementation
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-owner-onboarding-server
 %{summary}
 
 %files -n fdo-owner-onboarding-server
 %license LICENSE
 %{_libexecdir}/fdo/fdo-owner-onboarding-server
+%{_libexecdir}/fdo/fdo-serviceinfo-api-server
 %{_docdir}/fdo/owner-onboarding-server.yml
+%{_docdir}/fdo/serviceinfo-api-server.yml
 %{_unitdir}/fdo-owner-onboarding-server.service
+%{_unitdir}/fdo-serviceinfo-api-server.service
 
 %post -n fdo-owner-onboarding-server
 %systemd_post fdo-owner-onboarding-server.service
+%systemd_post fdo-serviceinfo-api-server.service
 
 %preun -n fdo-owner-onboarding-server
 %systemd_preun fdo-owner-onboarding-server.service
+%systemd_preun fdo-serviceinfo-api-server.service
 
 %postun -n fdo-owner-onboarding-server
 %systemd_postun_with_restart fdo-owner-onboarding-server.service
+%systemd_postun_with_restart fdo-serviceinfo-api-server.service
 
 %package -n fdo-rendezvous-server
 Summary: FDO Rendezvous Server implementation
@@ -116,14 +132,14 @@ Summary: FDO Rendezvous Server implementation
 
 %package -n fdo-manufacturing-server
 Summary: FDO Manufacturing Server implementation
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-manufacturing-server
 %{summary}
 
 %files -n fdo-manufacturing-server
 %license LICENSE
 %{_libexecdir}/fdo/fdo-manufacturing-server
 %{_docdir}/fdo/manufacturing-server.yml
-%{_docdir}/fdo/rendezvous-info.yml
 %{_unitdir}/fdo-manufacturing-server.service
 
 %post -n fdo-manufacturing-server
@@ -137,6 +153,7 @@ Summary: FDO Manufacturing Server implementation
 
 %package -n fdo-client
 Summary: FDO Client implementation
+Requires: openssl-libs >= 3.0.1-12
 %description -n fdo-client
 %{summary}
 
@@ -152,7 +169,7 @@ Summary: FDO Client implementation
 %systemd_preun fdo-client-linuxapp.service
 
 %postun -n fdo-client
-%systemd_postun_with_restart fdo-client.linuxapp.service
+%systemd_postun_with_restart fdo-client-linuxapp.service
 
 %package -n fdo-owner-cli
 Summary: FDO Owner tools implementation
@@ -162,9 +179,39 @@ Summary: FDO Owner tools implementation
 %files -n fdo-owner-cli
 %license LICENSE
 %{_bindir}/fdo-owner-tool
-%{_docdir}/fdo/owner-addresses.yml
+%{_libexecdir}/fdo/fdo-owner-tool
+
+%package -n fdo-admin-cli
+Summary: FDO admin tools implementation
+Requires: fdo-manufacturing-server
+Requires: fdo-init
+Requires: fdo-client
+Requires: fdo-rendezvous-server
+Requires: fdo-owner-onboarding-server
+Requires: fdo-owner-cli
+%description -n fdo-admin-cli
+%{summary}
+
+%files -n fdo-admin-cli
+%license LICENSE
+%dir %{_sysconfdir}/fdo
+%{_bindir}/fdo-admin-tool
+%{_libexecdir}/fdo/fdo-admin-tool
+%{_unitdir}/fdo-aio.service
+
+%post -n fdo-admin-cli
+%systemd_post fdo-aio.service
+
+%preun -n fdo-admin-cli
+%systemd_preun fdo-aio.service
+
+%postun -n fdo-admin-cli
+%systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Tue Mar 15 2022 Antonio Murdaca <[email protected]> - 0.4.5-1
+- Rebase to 0.4.5
+
 * Thu Feb 24 2022 Patrick Uiterwijk <[email protected]> - 0.4.0-1
 - Rebase to 0.4.0
 

http-wrapper/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-http-wrapper"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 
@@ -18,8 +18,8 @@ hex = "0.4"
 
 openssl = "0.10"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-store = { path = "../store", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-store = { path = "../store", version = "0.4.5" }
 aws-nitro-enclaves-cose = "0.4.0"
 
 # Server-side

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "integration-tests"
-version = "0.4.0"
+version = "0.4.5"
 edition = "2018"
 publish = false
 

libfdo-data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-data"
-version = "0.4.0"
+version = "0.4.5"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,7 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
 libc = "0.2"
 
 [build-dependencies]

libfdo-data/fdo_data.h

@@ -14,7 +14,7 @@
 
 #define FDO_DATA_MAJOR 0
 #define FDO_DATA_MINOR 4
-#define FDO_DATA_PATCH 0
+#define FDO_DATA_PATCH 5
 
 typedef struct FdoOwnershipVoucher FdoOwnershipVoucher;
 

manufacturing-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-manufacturing-client"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 
@@ -17,6 +17,6 @@ passwd = "0.0.1"
 rand = "0.8.4"
 tss-esapi = "7.0"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["client"] }
-fdo-util = { path = "../util", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["client"] }
+fdo-util = { path = "../util", version = "0.4.5" }

manufacturing-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-manufacturing-server"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 
@@ -18,7 +18,7 @@ log = "0.4"
 hex = "0.4"
 serde_yaml = "0.8"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["server"] }
-fdo-store = { path = "../store", version = "0.4.0", features = ["directory"] }
-fdo-util = { path = "../util", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["server"] }
+fdo-store = { path = "../store", version = "0.4.5", features = ["directory"] }
+fdo-util = { path = "../util", version = "0.4.5" }

owner-onboarding-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fdo-owner-onboarding-server"
-version = "0.4.0"
+version = "0.4.5"
 authors = ["Patrick Uiterwijk <[email protected]>"]
 edition = "2018"
 
@@ -21,7 +21,7 @@ serde_yaml = "0.8"
 time = "0.3"
 hex = "0.4"
 
-fdo-data-formats = { path = "../data-formats", version = "0.4.0" }
-fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["server", "client"] }
-fdo-store = { path = "../store", version = "0.4.0", features = ["directory"] }
-fdo-util = { path = "../util", version = "0.4.0" }
+fdo-data-formats = { path = "../data-formats", version = "0.4.5" }
+fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["server", "client"] }
+fdo-store = { path = "../store", version = "0.4.5", features = ["directory"] }
+fdo-util = { path = "../util", version = "0.4.5" }