cloacina 0.6.1

A Rust library for resilient task execution and orchestration.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
/*
 *  Copyright 2025-2026 Colliery Software
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */

//! Package signing and signature storage.
//!
//! This module provides:
//! - [`PackageSigner`] trait for signing packages
//! - [`DbPackageSigner`] database-backed implementation
//! - [`DetachedSignature`] format for standalone signature files

use super::audit;
use crate::crypto::{compute_key_fingerprint, sign_package as crypto_sign, verify_signature};
use crate::dal::unified::models::{NewUnifiedPackageSignature, UnifiedPackageSignature};
use crate::dal::unified::DAL;
use crate::database::schema::unified::package_signatures;
use crate::database::universal_types::{UniversalBinary, UniversalTimestamp, UniversalUuid};
use async_trait::async_trait;
use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
use diesel::prelude::*;
use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::path::Path;
use thiserror::Error;

/// Errors that can occur during package signing operations.
#[derive(Debug, Error)]
pub enum PackageSignError {
    #[error("Failed to read package file: {0}")]
    FileReadError(#[from] std::io::Error),

    #[error("Signing failed: {0}")]
    SigningFailed(String),

    #[error("Key not found: {0}")]
    KeyNotFound(UniversalUuid),

    #[error("Key has been revoked")]
    KeyRevoked,

    #[error("Database error: {0}")]
    Database(String),

    #[error("Signature not found for package hash: {0}")]
    SignatureNotFound(String),

    #[error("Verification failed: {0}")]
    VerificationFailed(String),

    #[error("Invalid signature file format: {0}")]
    InvalidSignatureFile(String),
}

/// A package signature with all metadata.
#[derive(Debug, Clone)]
pub struct PackageSignatureInfo {
    /// SHA256 hex hash of the package binary
    pub package_hash: String,
    /// SHA256 hex fingerprint of the signing key
    pub key_fingerprint: String,
    /// 64-byte Ed25519 signature
    pub signature: Vec<u8>,
    /// When the package was signed
    pub signed_at: UniversalTimestamp,
}

/// Detached signature file format.
///
/// This is a JSON-serializable format for standalone `.sig` files
/// that can be distributed alongside packages.
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct DetachedSignature {
    /// Format version (currently 1)
    pub version: u32,
    /// Signature algorithm (currently "ed25519")
    pub algorithm: String,
    /// SHA256 hex hash of the package binary
    pub package_hash: String,
    /// SHA256 hex fingerprint of the signing key
    pub key_fingerprint: String,
    /// Base64-encoded 64-byte signature
    pub signature: String,
    /// ISO8601 timestamp of when the signature was created
    pub signed_at: String,
}

impl DetachedSignature {
    /// Current signature format version.
    pub const VERSION: u32 = 1;

    /// Algorithm identifier for Ed25519.
    pub const ALGORITHM: &'static str = "ed25519";

    /// Create a detached signature from signature info.
    pub fn from_signature_info(info: &PackageSignatureInfo) -> Self {
        Self {
            version: Self::VERSION,
            algorithm: Self::ALGORITHM.to_string(),
            package_hash: info.package_hash.clone(),
            key_fingerprint: info.key_fingerprint.clone(),
            signature: BASE64.encode(&info.signature),
            signed_at: info.signed_at.to_rfc3339(),
        }
    }

    /// Parse a detached signature from JSON.
    pub fn from_json(json: &str) -> Result<Self, PackageSignError> {
        serde_json::from_str(json)
            .map_err(|e| PackageSignError::InvalidSignatureFile(e.to_string()))
    }

    /// Serialize to JSON.
    pub fn to_json(&self) -> Result<String, PackageSignError> {
        serde_json::to_string_pretty(self)
            .map_err(|e| PackageSignError::InvalidSignatureFile(e.to_string()))
    }

    /// Get the raw signature bytes.
    pub fn signature_bytes(&self) -> Result<Vec<u8>, PackageSignError> {
        BASE64
            .decode(&self.signature)
            .map_err(|e| PackageSignError::InvalidSignatureFile(e.to_string()))
    }

    /// Write the detached signature to a file.
    pub fn write_to_file(&self, path: &Path) -> Result<(), PackageSignError> {
        let json = self.to_json()?;
        std::fs::write(path, json)?;
        Ok(())
    }

    /// Read a detached signature from a file.
    pub fn read_from_file(path: &Path) -> Result<Self, PackageSignError> {
        let json = std::fs::read_to_string(path)?;
        Self::from_json(&json)
    }
}

/// Trait for signing packages and managing signatures.
#[async_trait]
pub trait PackageSigner: Send + Sync {
    /// Sign a package file using a key from the database.
    ///
    /// # Arguments
    ///
    /// * `package_path` - Path to the package file to sign
    /// * `key_id` - ID of the signing key in the database
    /// * `master_key` - AES-256 key for decrypting the signing key
    /// * `store_signature` - Whether to store the signature in the database
    ///
    /// # Returns
    ///
    /// The signature information.
    async fn sign_package_with_db_key(
        &self,
        package_path: &Path,
        key_id: UniversalUuid,
        master_key: &[u8],
        store_signature: bool,
    ) -> Result<PackageSignatureInfo, PackageSignError>;

    /// Sign a package file using a raw key (for offline signing).
    ///
    /// # Arguments
    ///
    /// * `package_path` - Path to the package file to sign
    /// * `private_key` - 32-byte Ed25519 private key
    /// * `public_key` - 32-byte Ed25519 public key (for fingerprint)
    ///
    /// # Returns
    ///
    /// The signature information.
    fn sign_package_with_raw_key(
        &self,
        package_path: &Path,
        private_key: &[u8],
        public_key: &[u8],
    ) -> Result<PackageSignatureInfo, PackageSignError>;

    /// Sign package data directly (already in memory).
    fn sign_package_data(
        &self,
        package_data: &[u8],
        private_key: &[u8],
        public_key: &[u8],
    ) -> Result<PackageSignatureInfo, PackageSignError>;

    /// Store a signature in the database.
    async fn store_signature(
        &self,
        signature: &PackageSignatureInfo,
    ) -> Result<UniversalUuid, PackageSignError>;

    /// Find a signature by package hash.
    async fn find_signature(
        &self,
        package_hash: &str,
    ) -> Result<Option<PackageSignatureInfo>, PackageSignError>;

    /// Find all signatures for a package hash.
    async fn find_signatures(
        &self,
        package_hash: &str,
    ) -> Result<Vec<PackageSignatureInfo>, PackageSignError>;

    /// Verify a package against a stored signature.
    ///
    /// # Arguments
    ///
    /// * `package_path` - Path to the package file to verify
    /// * `org_id` - Organization to check trusted keys for
    ///
    /// # Returns
    ///
    /// The signature info if verification succeeds.
    async fn verify_package(
        &self,
        package_path: &Path,
        org_id: UniversalUuid,
    ) -> Result<PackageSignatureInfo, PackageSignError>;

    /// Verify a package against a detached signature file.
    fn verify_package_with_detached_signature(
        &self,
        package_path: &Path,
        signature: &DetachedSignature,
        public_key: &[u8],
    ) -> Result<(), PackageSignError>;
}

/// Database-backed package signer implementation.
#[derive(Clone)]
pub struct DbPackageSigner {
    dal: DAL,
}

impl DbPackageSigner {
    /// Create a new database-backed package signer.
    pub fn new(dal: DAL) -> Self {
        Self { dal }
    }

    /// Compute the SHA256 hash of a file.
    fn compute_file_hash(path: &Path) -> Result<String, PackageSignError> {
        let data = std::fs::read(path)?;
        Self::compute_data_hash(&data)
    }

    /// Compute the SHA256 hash of data.
    fn compute_data_hash(data: &[u8]) -> Result<String, PackageSignError> {
        let mut hasher = Sha256::new();
        hasher.update(data);
        Ok(hex::encode(hasher.finalize()))
    }

    /// Convert database model to SignatureInfo.
    fn to_signature_info(sig: UnifiedPackageSignature) -> PackageSignatureInfo {
        PackageSignatureInfo {
            package_hash: sig.package_hash,
            key_fingerprint: sig.key_fingerprint,
            signature: sig.signature.into_inner(),
            signed_at: sig.signed_at,
        }
    }
}

#[async_trait]
impl PackageSigner for DbPackageSigner {
    async fn sign_package_with_db_key(
        &self,
        package_path: &Path,
        key_id: UniversalUuid,
        master_key: &[u8],
        store_signature: bool,
    ) -> Result<PackageSignatureInfo, PackageSignError> {
        use super::db_key_manager::DbKeyManager;
        use super::key_manager::KeyManager;

        let path_str = package_path.display().to_string();

        // Get the signing key from the database
        let key_manager = DbKeyManager::new(self.dal.clone());
        let (public_key, private_key) = key_manager
            .get_signing_key(key_id, master_key)
            .await
            .map_err(|e| {
                audit::log_package_sign_failed(&path_str, &e.to_string());
                match e {
                    super::key_manager::KeyError::NotFound(_) => {
                        PackageSignError::KeyNotFound(key_id)
                    }
                    super::key_manager::KeyError::Revoked(_) => PackageSignError::KeyRevoked,
                    e => PackageSignError::SigningFailed(e.to_string()),
                }
            })?;

        // Sign the package
        let signature = self
            .sign_package_with_raw_key(package_path, &private_key, &public_key)
            .inspect_err(|e| {
                audit::log_package_sign_failed(&path_str, &e.to_string());
            })?;

        // Audit log: package signed successfully
        audit::log_package_signed(
            &path_str,
            &signature.package_hash,
            &signature.key_fingerprint,
        );

        // Optionally store in database
        if store_signature {
            self.store_signature(&signature).await?;
        }

        Ok(signature)
    }

    fn sign_package_with_raw_key(
        &self,
        package_path: &Path,
        private_key: &[u8],
        public_key: &[u8],
    ) -> Result<PackageSignatureInfo, PackageSignError> {
        let package_data = std::fs::read(package_path)?;
        self.sign_package_data(&package_data, private_key, public_key)
    }

    fn sign_package_data(
        &self,
        package_data: &[u8],
        private_key: &[u8],
        public_key: &[u8],
    ) -> Result<PackageSignatureInfo, PackageSignError> {
        // Compute package hash
        let package_hash = Self::compute_data_hash(package_data)?;

        // Sign the hash
        let hash_bytes = hex::decode(&package_hash)
            .map_err(|e| PackageSignError::SigningFailed(e.to_string()))?;

        let signature = crypto_sign(&hash_bytes, private_key)
            .map_err(|e| PackageSignError::SigningFailed(e.to_string()))?;

        // Compute key fingerprint
        let fingerprint = compute_key_fingerprint(public_key);

        Ok(PackageSignatureInfo {
            package_hash,
            key_fingerprint: fingerprint,
            signature,
            signed_at: UniversalTimestamp::now(),
        })
    }

    async fn store_signature(
        &self,
        signature: &PackageSignatureInfo,
    ) -> Result<UniversalUuid, PackageSignError> {
        let id = UniversalUuid::new_v4();

        let new_sig = NewUnifiedPackageSignature {
            id,
            package_hash: signature.package_hash.clone(),
            key_fingerprint: signature.key_fingerprint.clone(),
            signature: UniversalBinary::new(signature.signature.clone()),
            signed_at: signature.signed_at,
            // org_id populated by upload-handler verification path in T-0568.
            // T-0566 plumbs the column; T1 leaves construction sites at None
            // so the existing signing flow continues to work unchanged.
            org_id: None,
        };

        #[cfg(all(feature = "postgres", feature = "sqlite"))]
        {
            match self.dal.backend() {
                crate::database::BackendType::Postgres => {
                    self.store_signature_postgres(new_sig).await?
                }
                crate::database::BackendType::Sqlite => {
                    self.store_signature_sqlite(new_sig).await?
                }
            }
        }
        #[cfg(all(feature = "postgres", not(feature = "sqlite")))]
        {
            self.store_signature_postgres(new_sig).await?
        }
        #[cfg(all(feature = "sqlite", not(feature = "postgres")))]
        {
            self.store_signature_sqlite(new_sig).await?
        }

        Ok(id)
    }

    async fn find_signature(
        &self,
        package_hash: &str,
    ) -> Result<Option<PackageSignatureInfo>, PackageSignError> {
        crate::dispatch_backend!(
            self.dal.backend(),
            self.find_signature_postgres(package_hash).await,
            self.find_signature_sqlite(package_hash).await
        )
    }

    async fn find_signatures(
        &self,
        package_hash: &str,
    ) -> Result<Vec<PackageSignatureInfo>, PackageSignError> {
        crate::dispatch_backend!(
            self.dal.backend(),
            self.find_signatures_postgres(package_hash).await,
            self.find_signatures_sqlite(package_hash).await
        )
    }

    async fn verify_package(
        &self,
        package_path: &Path,
        org_id: UniversalUuid,
    ) -> Result<PackageSignatureInfo, PackageSignError> {
        use super::db_key_manager::DbKeyManager;
        use super::key_manager::KeyManager;

        // Compute package hash
        let package_hash = Self::compute_file_hash(package_path)?;

        // Find signatures for this package
        let signatures = self.find_signatures(&package_hash).await?;
        if signatures.is_empty() {
            return Err(PackageSignError::SignatureNotFound(package_hash));
        }

        // Check if any signature is from a trusted key
        let key_manager = DbKeyManager::new(self.dal.clone());
        let hash_bytes = hex::decode(&package_hash)
            .map_err(|e| PackageSignError::VerificationFailed(e.to_string()))?;

        for sig in signatures {
            // Check if this key is trusted
            if let Ok(Some(trusted_key)) = key_manager
                .find_trusted_key(org_id, &sig.key_fingerprint)
                .await
            {
                // Verify the signature
                if verify_signature(&hash_bytes, &sig.signature, &trusted_key.public_key).is_ok() {
                    return Ok(sig);
                }
            }
        }

        Err(PackageSignError::VerificationFailed(
            "No valid signature from a trusted key".to_string(),
        ))
    }

    fn verify_package_with_detached_signature(
        &self,
        package_path: &Path,
        signature: &DetachedSignature,
        public_key: &[u8],
    ) -> Result<(), PackageSignError> {
        // Verify algorithm
        if signature.algorithm != DetachedSignature::ALGORITHM {
            return Err(PackageSignError::InvalidSignatureFile(format!(
                "Unsupported algorithm: {}",
                signature.algorithm
            )));
        }

        // Compute package hash
        let package_hash = Self::compute_file_hash(package_path)?;

        // Verify hash matches
        if package_hash != signature.package_hash {
            return Err(PackageSignError::VerificationFailed(
                "Package hash does not match signature".to_string(),
            ));
        }

        // Verify key fingerprint matches
        let expected_fingerprint = compute_key_fingerprint(public_key);
        if expected_fingerprint != signature.key_fingerprint {
            return Err(PackageSignError::VerificationFailed(
                "Key fingerprint does not match signature".to_string(),
            ));
        }

        // Verify signature
        let hash_bytes = hex::decode(&package_hash)
            .map_err(|e| PackageSignError::VerificationFailed(e.to_string()))?;
        let sig_bytes = signature.signature_bytes()?;

        verify_signature(&hash_bytes, &sig_bytes, public_key)
            .map_err(|_| PackageSignError::VerificationFailed("Invalid signature".to_string()))?;

        Ok(())
    }
}

// PostgreSQL implementation
#[cfg(feature = "postgres")]
impl DbPackageSigner {
    async fn store_signature_postgres(
        &self,
        new_sig: NewUnifiedPackageSignature,
    ) -> Result<(), PackageSignError> {
        let conn = self
            .dal
            .database
            .get_postgres_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        conn.interact(move |conn| {
            diesel::insert_into(package_signatures::table)
                .values(&new_sig)
                .execute(conn)
        })
        .await
        .map_err(|e| PackageSignError::Database(e.to_string()))?
        .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(())
    }

    async fn find_signature_postgres(
        &self,
        package_hash: &str,
    ) -> Result<Option<PackageSignatureInfo>, PackageSignError> {
        let conn = self
            .dal
            .database
            .get_postgres_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        let hash = package_hash.to_string();

        let sig: Option<UnifiedPackageSignature> = conn
            .interact(move |conn| {
                package_signatures::table
                    .filter(package_signatures::package_hash.eq(&hash))
                    .first(conn)
                    .optional()
            })
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(sig.map(Self::to_signature_info))
    }

    async fn find_signatures_postgres(
        &self,
        package_hash: &str,
    ) -> Result<Vec<PackageSignatureInfo>, PackageSignError> {
        let conn = self
            .dal
            .database
            .get_postgres_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        let hash = package_hash.to_string();

        let sigs: Vec<UnifiedPackageSignature> = conn
            .interact(move |conn| {
                package_signatures::table
                    .filter(package_signatures::package_hash.eq(&hash))
                    .load(conn)
            })
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(sigs.into_iter().map(Self::to_signature_info).collect())
    }
}

// SQLite implementation
#[cfg(feature = "sqlite")]
impl DbPackageSigner {
    async fn store_signature_sqlite(
        &self,
        new_sig: NewUnifiedPackageSignature,
    ) -> Result<(), PackageSignError> {
        let conn = self
            .dal
            .database
            .get_sqlite_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        conn.interact(move |conn| {
            diesel::insert_into(package_signatures::table)
                .values(&new_sig)
                .execute(conn)
        })
        .await
        .map_err(|e| PackageSignError::Database(e.to_string()))?
        .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(())
    }

    async fn find_signature_sqlite(
        &self,
        package_hash: &str,
    ) -> Result<Option<PackageSignatureInfo>, PackageSignError> {
        let conn = self
            .dal
            .database
            .get_sqlite_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        let hash = package_hash.to_string();

        let sig: Option<UnifiedPackageSignature> = conn
            .interact(move |conn| {
                package_signatures::table
                    .filter(package_signatures::package_hash.eq(&hash))
                    .first(conn)
                    .optional()
            })
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(sig.map(Self::to_signature_info))
    }

    async fn find_signatures_sqlite(
        &self,
        package_hash: &str,
    ) -> Result<Vec<PackageSignatureInfo>, PackageSignError> {
        let conn = self
            .dal
            .database
            .get_sqlite_connection()
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        let hash = package_hash.to_string();

        let sigs: Vec<UnifiedPackageSignature> = conn
            .interact(move |conn| {
                package_signatures::table
                    .filter(package_signatures::package_hash.eq(&hash))
                    .load(conn)
            })
            .await
            .map_err(|e| PackageSignError::Database(e.to_string()))?
            .map_err(|e| PackageSignError::Database(e.to_string()))?;

        Ok(sigs.into_iter().map(Self::to_signature_info).collect())
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::crypto::generate_signing_keypair;
    use tempfile::NamedTempFile;

    #[test]
    fn test_sign_and_verify_with_raw_key() {
        // Create a temporary file to sign
        let temp_file = NamedTempFile::new().unwrap();
        std::fs::write(temp_file.path(), b"test package content").unwrap();

        // Generate a keypair
        let keypair = generate_signing_keypair();

        // Create a signer (we can't use DbPackageSigner without a database)
        // but we can test the raw key signing functions
        let package_data = std::fs::read(temp_file.path()).unwrap();
        let package_hash = DbPackageSigner::compute_data_hash(&package_data).unwrap();

        // Sign
        let hash_bytes = hex::decode(&package_hash).unwrap();
        let signature = crate::crypto::sign_package(&hash_bytes, &keypair.private_key).unwrap();

        // Verify
        let result = crate::crypto::verify_signature(&hash_bytes, &signature, &keypair.public_key);
        assert!(result.is_ok());
    }

    #[test]
    fn test_detached_signature_roundtrip() {
        let info = PackageSignatureInfo {
            package_hash: "abc123".to_string(),
            key_fingerprint: "def456".to_string(),
            signature: vec![0u8; 64],
            signed_at: UniversalTimestamp::now(),
        };

        let detached = DetachedSignature::from_signature_info(&info);

        // Roundtrip through JSON
        let json = detached.to_json().unwrap();
        let parsed = DetachedSignature::from_json(&json).unwrap();

        assert_eq!(parsed.version, DetachedSignature::VERSION);
        assert_eq!(parsed.algorithm, DetachedSignature::ALGORITHM);
        assert_eq!(parsed.package_hash, info.package_hash);
        assert_eq!(parsed.key_fingerprint, info.key_fingerprint);
        assert_eq!(parsed.signature_bytes().unwrap(), info.signature);
    }

    #[test]
    fn test_detached_signature_file_io() {
        let info = PackageSignatureInfo {
            package_hash: "abc123".to_string(),
            key_fingerprint: "def456".to_string(),
            signature: vec![0u8; 64],
            signed_at: UniversalTimestamp::now(),
        };

        let detached = DetachedSignature::from_signature_info(&info);

        // Write to file
        let temp_file = NamedTempFile::new().unwrap();
        detached.write_to_file(temp_file.path()).unwrap();

        // Read back
        let loaded = DetachedSignature::read_from_file(temp_file.path()).unwrap();
        assert_eq!(loaded.package_hash, info.package_hash);
    }

    #[test]
    fn test_compute_data_hash_deterministic() {
        let data = b"hello world";
        let hash1 = DbPackageSigner::compute_data_hash(data).unwrap();
        let hash2 = DbPackageSigner::compute_data_hash(data).unwrap();
        assert_eq!(hash1, hash2);
    }

    #[test]
    fn test_compute_data_hash_different_inputs() {
        let hash1 = DbPackageSigner::compute_data_hash(b"aaa").unwrap();
        let hash2 = DbPackageSigner::compute_data_hash(b"bbb").unwrap();
        assert_ne!(hash1, hash2);
    }

    #[test]
    fn test_compute_data_hash_empty_input() {
        let result = DbPackageSigner::compute_data_hash(b"");
        assert!(result.is_ok());
        assert!(!result.unwrap().is_empty());
    }

    #[test]
    fn test_compute_data_hash_large_payload() {
        let data = vec![0xFFu8; 10 * 1024 * 1024]; // 10 MB
        let result = DbPackageSigner::compute_data_hash(&data);
        assert!(result.is_ok());
    }

    #[test]
    fn test_compute_file_hash_matches_data_hash() {
        let temp_file = NamedTempFile::new().unwrap();
        let content = b"test content for hash comparison";
        std::fs::write(temp_file.path(), content).unwrap();

        let file_hash = DbPackageSigner::compute_file_hash(temp_file.path()).unwrap();
        let data_hash = DbPackageSigner::compute_data_hash(content).unwrap();
        assert_eq!(file_hash, data_hash);
    }

    #[test]
    fn test_compute_file_hash_nonexistent_file() {
        let result = DbPackageSigner::compute_file_hash(std::path::Path::new("/nonexistent/file"));
        assert!(result.is_err());
    }

    #[test]
    fn test_detached_signature_invalid_json() {
        let result = DetachedSignature::from_json("not valid json");
        assert!(result.is_err());
    }

    #[test]
    fn test_detached_signature_version_and_algorithm() {
        let info = PackageSignatureInfo {
            package_hash: "hash".to_string(),
            key_fingerprint: "fp".to_string(),
            signature: vec![1, 2, 3],
            signed_at: UniversalTimestamp::now(),
        };
        let detached = DetachedSignature::from_signature_info(&info);
        assert_eq!(detached.version, DetachedSignature::VERSION);
        assert_eq!(detached.algorithm, DetachedSignature::ALGORITHM);
    }

    #[test]
    fn test_detached_signature_corrupted_base64() {
        let info = PackageSignatureInfo {
            package_hash: "hash".to_string(),
            key_fingerprint: "fp".to_string(),
            signature: vec![1, 2, 3],
            signed_at: UniversalTimestamp::now(),
        };
        let mut detached = DetachedSignature::from_signature_info(&info);
        detached.signature = "not!valid!base64!!!".to_string();
        let result = detached.signature_bytes();
        assert!(result.is_err());
    }

    #[test]
    fn test_sign_verify_roundtrip_different_data() {
        let keypair = generate_signing_keypair();

        for content in &[
            b"small".as_slice(),
            b"medium content here",
            &vec![0xAB; 1024],
        ] {
            let hash = DbPackageSigner::compute_data_hash(content).unwrap();
            let hash_bytes = hex::decode(&hash).unwrap();
            let signature = crate::crypto::sign_package(&hash_bytes, &keypair.private_key).unwrap();
            let result =
                crate::crypto::verify_signature(&hash_bytes, &signature, &keypair.public_key);
            assert!(
                result.is_ok(),
                "verification failed for content of len {}",
                content.len()
            );
        }
    }

    #[test]
    fn test_sign_verify_wrong_key_fails() {
        let keypair1 = generate_signing_keypair();
        let keypair2 = generate_signing_keypair();

        let data = b"test data";
        let hash = DbPackageSigner::compute_data_hash(data).unwrap();
        let hash_bytes = hex::decode(&hash).unwrap();
        let signature = crate::crypto::sign_package(&hash_bytes, &keypair1.private_key).unwrap();

        // Verify with wrong key should fail
        let result = crate::crypto::verify_signature(&hash_bytes, &signature, &keypair2.public_key);
        assert!(result.is_err());
    }

    #[test]
    fn test_sign_verify_tampered_data_fails() {
        let keypair = generate_signing_keypair();

        let data = b"original data";
        let hash = DbPackageSigner::compute_data_hash(data).unwrap();
        let hash_bytes = hex::decode(&hash).unwrap();
        let signature = crate::crypto::sign_package(&hash_bytes, &keypair.private_key).unwrap();

        // Verify with tampered hash should fail
        let tampered_hash = DbPackageSigner::compute_data_hash(b"tampered data").unwrap();
        let tampered_bytes = hex::decode(&tampered_hash).unwrap();
        let result =
            crate::crypto::verify_signature(&tampered_bytes, &signature, &keypair.public_key);
        assert!(result.is_err());
    }

    // ── Database-backed PackageSigner tests ──────────────────────────

    #[cfg(feature = "sqlite")]
    mod db_tests {
        use super::*;
        use crate::dal::unified::DAL;
        use crate::database::Database;
        use crate::security::db_key_manager::DbKeyManager;
        use crate::security::key_manager::KeyManager;

        async fn unique_dal() -> DAL {
            let url = format!(
                "file:pkgsign_test_{}?mode=memory&cache=shared",
                uuid::Uuid::new_v4()
            );
            let db = Database::new(&url, "", 5);
            db.run_migrations()
                .await
                .expect("migrations should succeed");
            DAL::new(db)
        }

        fn master_key() -> [u8; 32] {
            [0u8; 32]
        }

        #[tokio::test]
        async fn test_sign_package_data_with_raw_key() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let data = b"package binary content";
            let sig_info = signer
                .sign_package_data(data, &keypair.private_key, &keypair.public_key)
                .unwrap();

            assert!(!sig_info.package_hash.is_empty());
            assert_eq!(sig_info.signature.len(), 64);
            assert!(!sig_info.key_fingerprint.is_empty());
        }

        #[tokio::test]
        async fn test_sign_package_with_raw_key_file() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"file based content").unwrap();

            let sig_info = signer
                .sign_package_with_raw_key(
                    temp_file.path(),
                    &keypair.private_key,
                    &keypair.public_key,
                )
                .unwrap();

            assert!(!sig_info.package_hash.is_empty());
            assert_eq!(sig_info.signature.len(), 64);
        }

        #[tokio::test]
        async fn test_store_and_find_signature() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let data = b"storable package";
            let sig_info = signer
                .sign_package_data(data, &keypair.private_key, &keypair.public_key)
                .unwrap();

            let _sig_id = signer.store_signature(&sig_info).await.unwrap();

            let found = signer.find_signature(&sig_info.package_hash).await.unwrap();
            assert!(found.is_some());
            let found = found.unwrap();
            assert_eq!(found.package_hash, sig_info.package_hash);
            assert_eq!(found.key_fingerprint, sig_info.key_fingerprint);
        }

        #[tokio::test]
        async fn test_find_signature_not_found() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);

            let found = signer.find_signature("nonexistent_hash").await.unwrap();
            assert!(found.is_none());
        }

        #[tokio::test]
        async fn test_find_signatures_multiple() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let kp1 = generate_signing_keypair();
            let kp2 = generate_signing_keypair();

            let data = b"multi-signed package";
            let sig1 = signer
                .sign_package_data(data, &kp1.private_key, &kp1.public_key)
                .unwrap();
            let sig2 = signer
                .sign_package_data(data, &kp2.private_key, &kp2.public_key)
                .unwrap();

            signer.store_signature(&sig1).await.unwrap();
            signer.store_signature(&sig2).await.unwrap();

            let sigs = signer.find_signatures(&sig1.package_hash).await.unwrap();
            assert_eq!(sigs.len(), 2);
        }

        #[tokio::test]
        async fn test_sign_package_with_db_key() {
            let dal = unique_dal().await;
            let km = DbKeyManager::new(dal.clone());
            let signer = DbPackageSigner::new(dal);
            let org_id = UniversalUuid::new_v4();
            let mk = master_key();

            let key_info = km
                .create_signing_key(org_id, "signer-key", &mk)
                .await
                .unwrap();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"db-key-signed package").unwrap();

            let sig_info = signer
                .sign_package_with_db_key(temp_file.path(), key_info.id, &mk, false)
                .await
                .unwrap();

            assert!(!sig_info.package_hash.is_empty());
            assert_eq!(sig_info.signature.len(), 64);
        }

        #[tokio::test]
        async fn test_sign_package_with_db_key_and_store() {
            let dal = unique_dal().await;
            let km = DbKeyManager::new(dal.clone());
            let signer = DbPackageSigner::new(dal);
            let org_id = UniversalUuid::new_v4();
            let mk = master_key();

            let key_info = km
                .create_signing_key(org_id, "store-key", &mk)
                .await
                .unwrap();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"stored signature content").unwrap();

            let sig_info = signer
                .sign_package_with_db_key(temp_file.path(), key_info.id, &mk, true)
                .await
                .unwrap();

            // Verify the signature was stored
            let found = signer.find_signature(&sig_info.package_hash).await.unwrap();
            assert!(found.is_some());
        }

        #[tokio::test]
        async fn test_sign_package_with_db_key_revoked_fails() {
            let dal = unique_dal().await;
            let km = DbKeyManager::new(dal.clone());
            let signer = DbPackageSigner::new(dal);
            let org_id = UniversalUuid::new_v4();
            let mk = master_key();

            let key_info = km
                .create_signing_key(org_id, "revoked-signer", &mk)
                .await
                .unwrap();
            km.revoke_signing_key(key_info.id).await.unwrap();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"content").unwrap();

            let result = signer
                .sign_package_with_db_key(temp_file.path(), key_info.id, &mk, false)
                .await;
            assert!(matches!(result, Err(PackageSignError::KeyRevoked)));
        }

        #[tokio::test]
        async fn test_sign_package_with_db_key_not_found() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"content").unwrap();

            let result = signer
                .sign_package_with_db_key(
                    temp_file.path(),
                    UniversalUuid::new_v4(),
                    &[0u8; 32],
                    false,
                )
                .await;
            assert!(matches!(result, Err(PackageSignError::KeyNotFound(_))));
        }

        #[tokio::test]
        async fn test_verify_package_with_detached_signature() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let temp_file = NamedTempFile::new().unwrap();
            let content = b"detached-sig verification content";
            std::fs::write(temp_file.path(), content).unwrap();

            let sig_info = signer
                .sign_package_with_raw_key(
                    temp_file.path(),
                    &keypair.private_key,
                    &keypair.public_key,
                )
                .unwrap();

            let detached = DetachedSignature::from_signature_info(&sig_info);

            let result = signer.verify_package_with_detached_signature(
                temp_file.path(),
                &detached,
                &keypair.public_key,
            );
            assert!(result.is_ok());
        }

        #[tokio::test]
        async fn test_verify_package_detached_tampered_fails() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"original content").unwrap();

            let sig_info = signer
                .sign_package_with_raw_key(
                    temp_file.path(),
                    &keypair.private_key,
                    &keypair.public_key,
                )
                .unwrap();

            let detached = DetachedSignature::from_signature_info(&sig_info);

            // Tamper with the file
            std::fs::write(temp_file.path(), b"tampered content").unwrap();

            let result = signer.verify_package_with_detached_signature(
                temp_file.path(),
                &detached,
                &keypair.public_key,
            );
            assert!(matches!(
                result,
                Err(PackageSignError::VerificationFailed(_))
            ));
        }

        #[tokio::test]
        async fn test_verify_package_detached_wrong_key_fails() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair1 = generate_signing_keypair();
            let keypair2 = generate_signing_keypair();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"signed content").unwrap();

            let sig_info = signer
                .sign_package_with_raw_key(
                    temp_file.path(),
                    &keypair1.private_key,
                    &keypair1.public_key,
                )
                .unwrap();
            let detached = DetachedSignature::from_signature_info(&sig_info);

            let result = signer.verify_package_with_detached_signature(
                temp_file.path(),
                &detached,
                &keypair2.public_key,
            );
            assert!(matches!(
                result,
                Err(PackageSignError::VerificationFailed(_))
            ));
        }

        #[tokio::test]
        async fn test_verify_package_detached_wrong_algorithm() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let keypair = generate_signing_keypair();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"content").unwrap();

            let sig_info = signer
                .sign_package_with_raw_key(
                    temp_file.path(),
                    &keypair.private_key,
                    &keypair.public_key,
                )
                .unwrap();
            let mut detached = DetachedSignature::from_signature_info(&sig_info);
            detached.algorithm = "rsa".to_string();

            let result = signer.verify_package_with_detached_signature(
                temp_file.path(),
                &detached,
                &keypair.public_key,
            );
            assert!(matches!(
                result,
                Err(PackageSignError::InvalidSignatureFile(_))
            ));
        }

        #[tokio::test]
        async fn test_verify_package_trusted_key() {
            let dal = unique_dal().await;
            let km = DbKeyManager::new(dal.clone());
            let signer = DbPackageSigner::new(dal);
            let org_id = UniversalUuid::new_v4();
            let mk = master_key();

            // Create a signing key and sign a package
            let key_info = km
                .create_signing_key(org_id, "verify-key", &mk)
                .await
                .unwrap();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"verifiable content").unwrap();

            let sig_info = signer
                .sign_package_with_db_key(temp_file.path(), key_info.id, &mk, true)
                .await
                .unwrap();

            // Trust the signing key's public key for verification
            km.trust_public_key(org_id, &key_info.public_key, Some("self-trust"))
                .await
                .unwrap();

            // Verify the package
            let result = signer.verify_package(temp_file.path(), org_id).await;
            assert!(result.is_ok());
            let verified = result.unwrap();
            assert_eq!(verified.package_hash, sig_info.package_hash);
        }

        #[tokio::test]
        async fn test_verify_package_no_signature_fails() {
            let dal = unique_dal().await;
            let signer = DbPackageSigner::new(dal);
            let org_id = UniversalUuid::new_v4();

            let temp_file = NamedTempFile::new().unwrap();
            std::fs::write(temp_file.path(), b"unsigned content").unwrap();

            let result = signer.verify_package(temp_file.path(), org_id).await;
            assert!(matches!(
                result,
                Err(PackageSignError::SignatureNotFound(_))
            ));
        }
    }
}