feat(certificates): assign unique IDs (UUIDv7) to private keys

secutils-dev · Oct 20, 2023 · 43bda11 · 43bda11
1 parent c379980
commit 43bda11
Show file tree

Hide file tree

Showing 19 changed files with 598 additions and 204 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,3 @@
+
+[target.'cfg(all())']
+rustflags = ["--cfg", "uuid_unstable"]
diff --git a/.sqlx/query-1bd19d483286948d51edd7bdb4244ec2ca01252c862839e1270da51511a3fdb6.json b/.sqlx/query-1bd19d483286948d51edd7bdb4244ec2ca01252c862839e1270da51511a3fdb6.json
diff --git a/...23ec230201a7beb8093f6ad4917209577a0d.json → ...0e2593eff25be4d6e0aeb889c184edf99028.json b/...23ec230201a7beb8093f6ad4917209577a0d.json → ...0e2593eff25be4d6e0aeb889c184edf99028.json
diff --git a/.sqlx/query-37dbb4adec8bc3fbaf74b83e0364b221ffb61c5e7ddeaf80e066a58e07215611.json b/.sqlx/query-37dbb4adec8bc3fbaf74b83e0364b221ffb61c5e7ddeaf80e066a58e07215611.json
diff --git a/.sqlx/query-5110c1863c5f4d3900bb865218a372986ea22847dcaacf2e9f5fb98e6960a2ba.json b/.sqlx/query-5110c1863c5f4d3900bb865218a372986ea22847dcaacf2e9f5fb98e6960a2ba.json
diff --git a/...1d415e5eb9e1c9ecd3c6d2e9c740c4436896.json → ...9efaf4bd6bea5229a2fd4cb9557540b5282c.json b/...1d415e5eb9e1c9ecd3c6d2e9c740c4436896.json → ...9efaf4bd6bea5229a2fd4cb9557540b5282c.json
diff --git a/.sqlx/query-e71ad284df67d3402fad13846bccc96d1e25e23b44b5c32b8e324db34de43ba9.json b/.sqlx/query-e71ad284df67d3402fad13846bccc96d1e25e23b44b5c32b8e324db34de43ba9.json
diff --git a/...0a3bdd9209b4a7212739f3fff99af0fc57ae.json → ...7f40b3a23a9f33ee0792bc388fc0300e70c1.json b/...0a3bdd9209b4a7212739f3fff99af0fc57ae.json → ...7f40b3a23a9f33ee0792bc388fc0300e70c1.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,7 @@ tokio-cron-scheduler = "0.9.4"
 trust-dns-resolver = "0.23.1"
 url = "2.4.1"
 urlencoding = "2.1.3"
-uuid = "1.4.1"
+uuid = "1.5.0"
 webauthn-rs = "0.4.8"
 zip = "0.6.6"
 
@@ -102,6 +102,7 @@ default = [
     "tokio/rt-multi-thread",
     "tokio/macros",
     "url/serde",
+    "uuid/v7",
     "webauthn-rs/danger-allow-state-serialisation"
 ]
 

diff --git a/migrations/20231019195044_certificates_private_keys.sql b/migrations/20231019195044_certificates_private_keys.sql
@@ -15,11 +15,12 @@ WHERE
 -- Create table to store private keys.
 CREATE TABLE IF NOT EXISTS user_data_certificates_private_keys
 (
+    id              BLOB PRIMARY KEY,
     name            TEXT NOT NULL COLLATE NOCASE,
     alg             BLOB NOT NULL,
     pkcs8           BLOB NOT NULL,
     encrypted       INTEGER NOT NULL,
     created_at      INTEGER NOT NULL,
     user_id         INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    PRIMARY KEY     (name, user_id)
+    UNIQUE          (name, user_id)
 ) STRICT;
diff --git a/src/utils/api_ext.rs b/src/utils/api_ext.rs
@@ -90,8 +90,8 @@ mod tests {
                         },
                         Util {
                             id: 11,
-                            handle: "certificates__templates",
-                            name: "Templates",
+                            handle: "certificates__certificate_templates",
+                            name: "Certificate templates",
                             keywords: Some(
                                 "digital certificates x509 X.509 ssl tls openssl public private key encryption self-signed pki templates",
                             ),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		[target.'cfg(all())']
		rustflags = ["--cfg", "uuid_unstable"]