refactor: adapt database structure for openbao

Signed-off-by: Francesco Noacco <francesco.noacco@secomind.com>

Author: noaccOS

.github/workflows/astarte-end-to-end-test-workflow.yaml

@@ -112,8 +112,8 @@ jobs:
       - name: Checkout fdo e2e repo
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
-          repository: astarte-platform/astarte-device-fdo-rust
-          ref: dev
+          repository: noaccos/astarte-device-fdo-rust
+          ref: push-mzlxtwylktkr
       - uses: ./.github/actions/install-deps
       - name: Install astartectl
         run: |

apps/astarte_housekeeping/lib/astarte_housekeeping/realms/queries.ex

@@ -625,9 +625,15 @@ defmodule Astarte.Housekeeping.Realms.Queries do
   defp create_ownership_vouchers_table(keyspace_name) do
     query = """
     CREATE TABLE #{keyspace_name}.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
       guid blob,
+      voucher_data blob,
+      output_voucher blob,
+      replacement_guid blob,
+      replacement_rendezvous_info blob,
+      replacement_public_key blob,
+      key_name varchar,
+      key_algorithm int,
+      user_id blob,
       PRIMARY KEY (guid)
     );
     """
@@ -673,9 +679,6 @@ defmodule Astarte.Housekeeping.Realms.Queries do
       device_service_info map<tuple<text, text>, blob>,
       owner_service_info list<blob>,
       last_chunk_sent int,
-      replacement_guid blob,
-      replacement_rv_info blob,
-      replacement_pub_key blob,
       replacement_hmac blob,
       PRIMARY KEY (guid)
     )

apps/astarte_housekeeping/priv/migrations/realm/0015_drop_replacement_data.sql

@@ -0,0 +1,2 @@
+ALTER TABLE :keyspace.to2_sessions
+DROP (replacement_guid, replacement_rv_info, replacement_pub_key)

apps/astarte_housekeeping/priv/migrations/realm/0016_drop_private_key.sql

@@ -0,0 +1,2 @@
+ALTER TABLE :keyspace.ownership_voucher
+DROP private_key

apps/astarte_housekeeping/priv/migrations/realm/0017_add_replacement_data_and_remote_key.sql

@@ -0,0 +1,10 @@
+ALTER TABLE :keyspace.ownership_voucher
+ADD (
+  replacement_guid blob,
+  replacement_rendezvous_info blob,
+  replacement_public_key blob,
+  output_voucher blob,
+  key_name varchar,
+  key_algorithm int,
+  user_id blob,
+);

apps/astarte_pairing/test/support/helpers/database.ex

@@ -83,9 +83,15 @@ defmodule Astarte.Helpers.Database do
 
   @create_ownership_vouchers_table """
   CREATE TABLE :keyspace.ownership_vouchers (
-      private_key blob,
-      voucher_data blob,
       guid blob,
+      voucher_data blob,
+      output_voucher blob,
+      replacement_guid blob,
+      replacement_rendezvous_info blob,
+      replacement_public_key blob,
+      key_name varchar,
+      key_algorithm int,
+      user_id blob,
       PRIMARY KEY (guid)
    );
   """
@@ -112,9 +118,6 @@ defmodule Astarte.Helpers.Database do
     device_service_info map<tuple<text, text>, blob>,
     owner_service_info list<blob>,
     last_chunk_sent int,
-    replacement_guid blob,
-    replacement_rv_info blob,
-    replacement_pub_key blob,
     replacement_hmac blob,
     PRIMARY KEY (guid)
   )

…lib/astarte_data_access/fdo/db_record.ex …rte_data_access/fdo/ownership_voucher.exlibs/astarte_data_access/lib/astarte_data_access/fdo/db_record.ex renamed to libs/astarte_data_access/lib/astarte_data_access/fdo/ownership_voucher.ex libs/astarte_data_access/lib/astarte_data_access/fdo/db_record.ex renamed to libs/astarte_data_access/lib/astarte_data_access/fdo/ownership_voucher.ex

@@ -21,14 +21,25 @@ defmodule Astarte.DataAccess.FDO.OwnershipVoucher do
   Ecto schema for persisting ownership voucher binary data to the database.
   """
   use TypedEctoSchema
+
   import Ecto.Changeset
+
+  alias Astarte.DataAccess.FDO.CBOR.Encoded, as: CBOREncoded
   alias Astarte.DataAccess.FDO.OwnershipVoucher
+  alias Astarte.FDO.Core.OwnershipVoucher.RendezvousInfo
+  alias Astarte.FDO.Core.PublicKey
 
   @primary_key false
   typed_schema "ownership_vouchers" do
-    field :private_key, :binary
-    field :voucher_data, :binary
     field :guid, Astarte.DataAccess.UUID, primary_key: true
+    field :voucher_data, :binary
+    field :output_voucher, :binary
+    field :user_id, :binary
+    field :key_name, :string
+    field :key_algorithm, Ecto.Enum, values: [es256: 0, es384: 1, rs256: 10, rs384: 11]
+    field :replacement_guid, :binary
+    field :replacement_rv_info, CBOREncoded, using: RendezvousInfo
+    field :replacement_pub_key, CBOREncoded, using: PublicKey
   end
 
   @doc false

libs/astarte_data_access/lib/astarte_data_access/fdo/to2_session.ex

@@ -24,8 +24,6 @@ defmodule Astarte.DataAccess.FDO.TO2Session do
 
   alias Astarte.DataAccess.FDO.CBOR.Encoded, as: CBOREncoded
   alias Astarte.FDO.Core.Hash
-  alias Astarte.FDO.Core.OwnershipVoucher.RendezvousInfo
-  alias Astarte.FDO.Core.PublicKey
   alias COSE.Keys.Symmetric
 
   @ciphers [
@@ -73,12 +71,6 @@ defmodule Astarte.DataAccess.FDO.TO2Session do
 
     field :owner_service_info, {:array, :binary}
     field :last_chunk_sent, :integer
-    field :replacement_guid, :binary
-
-    field :replacement_rv_info, CBOREncoded, using: RendezvousInfo
-
-    field :replacement_pub_key, CBOREncoded, using: PublicKey
-
     field :replacement_hmac, CBOREncoded, using: Hash
   end
 end