From 36d7df2ccc934227e923f49bba9198aed035cc52 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Mon, 28 Feb 2022 11:40:45 +0100 Subject: [PATCH] chore(*): bump to 0.4.5 Signed-off-by: Antonio Murdaca --- admin-tool/Cargo.toml | 10 ++-- client-linuxapp/Cargo.toml | 8 +-- data-formats/Cargo.toml | 2 +- examples/config/manufacturing-server.yml | 4 +- examples/config/serviceinfo-api-server.yml | 39 ++++++++++++ examples/systemd/fdo-aio.service | 11 ++++ .../fdo-serviceinfo-api-server.service | 11 ++++ fido-device-onboard.spec | 59 +++++++++++++++++-- http-wrapper/Cargo.toml | 6 +- integration-tests/Cargo.toml | 2 +- libfdo-data/Cargo.toml | 4 +- libfdo-data/fdo_data.h | 2 +- manufacturing-client/Cargo.toml | 8 +-- manufacturing-server/Cargo.toml | 10 ++-- owner-onboarding-server/Cargo.toml | 10 ++-- owner-tool/Cargo.toml | 8 +-- rendezvous-server/Cargo.toml | 10 ++-- serviceinfo-api-server/Cargo.toml | 10 ++-- store/Cargo.toml | 4 +- util/Cargo.toml | 8 +-- 20 files changed, 167 insertions(+), 59 deletions(-) create mode 100644 examples/config/serviceinfo-api-server.yml create mode 100644 examples/systemd/fdo-aio.service create mode 100644 examples/systemd/fdo-serviceinfo-api-server.service diff --git a/admin-tool/Cargo.toml b/admin-tool/Cargo.toml index 09c96bc31..792d700bd 100644 --- a/admin-tool/Cargo.toml +++ b/admin-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-admin-tool" -version = "0.4.0" +version = "0.4.5" authors = ["Antonio Murdaca "] 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" } diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml index 1d7b3fb62..0077339a4 100644 --- a/client-linuxapp/Cargo.toml +++ b/client-linuxapp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-client-linuxapp" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -19,6 +19,6 @@ nix = "0.23.0" uuid = "0.8" thiserror = "1" -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" } diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml index 1c2bfe5ef..1f68c1258 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-data-formats" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] edition = "2018" diff --git a/examples/config/manufacturing-server.yml b/examples/config/manufacturing-server.yml index 7f0e33fff..c6b91baef 100644 --- a/examples/config/manufacturing-server.yml +++ b/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: diff --git a/examples/config/serviceinfo-api-server.yml b/examples/config/serviceinfo-api-server.yml new file mode 100644 index 000000000..700b7e90e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/examples/systemd/fdo-aio.service b/examples/systemd/fdo-aio.service new file mode 100644 index 000000000..58ffc9d1e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/examples/systemd/fdo-serviceinfo-api-server.service b/examples/systemd/fdo-serviceinfo-api-server.service new file mode 100644 index 000000000..c2c591808 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 8fe05537a..c584e33bb 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -4,7 +4,7 @@ %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 @@ -12,7 +12,7 @@ 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,6 +132,7 @@ 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} @@ -123,7 +140,6 @@ Summary: FDO Manufacturing Server implementation %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 - 0.4.5-1 +- Rebase to 0.4.5 + * Thu Feb 24 2022 Patrick Uiterwijk - 0.4.0-1 - Rebase to 0.4.0 diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml index fc5bc499d..0afad5293 100644 --- a/http-wrapper/Cargo.toml +++ b/http-wrapper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-http-wrapper" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] 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 diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index ebc2cb3de..bda146110 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration-tests" -version = "0.4.0" +version = "0.4.5" edition = "2018" publish = false diff --git a/libfdo-data/Cargo.toml b/libfdo-data/Cargo.toml index 9fabae0bd..7e130ecde 100644 --- a/libfdo-data/Cargo.toml +++ b/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] diff --git a/libfdo-data/fdo_data.h b/libfdo-data/fdo_data.h index 6158e7a29..d57fe41e8 100644 --- a/libfdo-data/fdo_data.h +++ b/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; diff --git a/manufacturing-client/Cargo.toml b/manufacturing-client/Cargo.toml index ff13d5fc4..dd31db327 100644 --- a/manufacturing-client/Cargo.toml +++ b/manufacturing-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-client" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] 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" } diff --git a/manufacturing-server/Cargo.toml b/manufacturing-server/Cargo.toml index abf21d6d4..450a34c8c 100644 --- a/manufacturing-server/Cargo.toml +++ b/manufacturing-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-server" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] 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" } diff --git a/owner-onboarding-server/Cargo.toml b/owner-onboarding-server/Cargo.toml index af75072de..567e9a463 100644 --- a/owner-onboarding-server/Cargo.toml +++ b/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 "] 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" } diff --git a/owner-tool/Cargo.toml b/owner-tool/Cargo.toml index f2bacc8b1..a8697ff25 100644 --- a/owner-tool/Cargo.toml +++ b/owner-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-owner-tool" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -16,9 +16,9 @@ serde_yaml = "0.8" tokio = { version = "1", features = ["full"] } tss-esapi = "7.0" -fdo-util = { path = "../util", version = "0.4.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.5" } +fdo-data-formats = { path = "../data-formats", version = "0.4.5" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["client"] } hex = "0.4" diff --git a/rendezvous-server/Cargo.toml b/rendezvous-server/Cargo.toml index 83ae5fd6f..300c70167 100644 --- a/rendezvous-server/Cargo.toml +++ b/rendezvous-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-rendezvous-server" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,7 +17,7 @@ warp = "0.3" log = "0.4" time = "0.3" -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" } -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" } +fdo-util = { path = "../util", version = "0.4.5" } diff --git a/serviceinfo-api-server/Cargo.toml b/serviceinfo-api-server/Cargo.toml index 1ca669ab7..cb12ef484 100644 --- a/serviceinfo-api-server/Cargo.toml +++ b/serviceinfo-api-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-serviceinfo-api-server" -version = "0.4.0" +version = "0.4.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +16,7 @@ serde = "1" serde_bytes = "0.11" serde_json = "1" -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["server"] } -fdo-data-formats = { path = "../data-formats", version = "0.4.0" } -fdo-store = { path = "../store", version = "0.4.0", features = ["directory"] } -fdo-util = { path = "../util", version = "0.4.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["server"] } +fdo-data-formats = { path = "../data-formats", version = "0.4.5" } +fdo-store = { path = "../store", version = "0.4.5", features = ["directory"] } +fdo-util = { path = "../util", version = "0.4.5" } diff --git a/store/Cargo.toml b/store/Cargo.toml index ccec2c629..9dba81933 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "fdo-store" -version = "0.4.0" +version = "0.4.5" authors = ["Patrick Uiterwijk "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fdo-data-formats = { path = "../data-formats", version = "0.4.0" } +fdo-data-formats = { path = "../data-formats", version = "0.4.5" } config = "0.11" futures = "0.3" diff --git a/util/Cargo.toml b/util/Cargo.toml index 8e46afebd..a3bcb50b5 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-util" -version = "0.4.0" +version = "0.4.5" authors = ["Antonio Murdaca "] edition = "2018" @@ -13,9 +13,9 @@ glob = "0.3.0" log = "0.4" serde = "1" -fdo-data-formats = { path = "../data-formats", version = "0.4.0" } -fdo-store = { path = "../store", version = "0.4.0" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.0", features = ["server", "client"] } +fdo-data-formats = { path = "../data-formats", version = "0.4.5" } +fdo-store = { path = "../store", version = "0.4.5" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.5", features = ["server", "client"] } serde_yaml = "0.8" serde_cbor = "0.11" serde_json = "1"