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
use crate::revoke::RevokeError::IncorrectSignature;
use crate::trust::{EXPIRATION_LEN, PK_LEN};
use ed25519_dalek::SignatureError;
use fluence_identity::key_pair::KeyPair;
use fluence_identity::public_key::PublicKey;
use fluence_identity::signature::Signature;
use serde::{Deserialize, Serialize};
use std::time::Duration;
use thiserror::Error as ThisError;
#[derive(ThisError, Debug)]
pub enum RevokeError {
#[error("Signature is incorrect: {0}")]
IncorrectSignature(#[source] SignatureError),
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Revoke {
pub pk: PublicKey,
pub revoked_at: Duration,
pub revoked_by: PublicKey,
signature: Signature,
}
impl Revoke {
#[allow(dead_code)]
fn new(
pk: PublicKey,
revoked_by: PublicKey,
revoked_at: Duration,
signature: Signature,
) -> Self {
Self {
pk,
revoked_at,
revoked_by,
signature,
}
}
#[allow(dead_code)]
pub fn create(revoker: &KeyPair, to_revoke: PublicKey, revoked_at: Duration) -> Self {
let msg = Revoke::signature_bytes(&to_revoke, revoked_at);
let signature = revoker.sign(&msg);
Revoke::new(to_revoke, revoker.public_key(), revoked_at, signature)
}
fn signature_bytes(pk: &PublicKey, revoked_at: Duration) -> Vec<u8> {
let mut msg = Vec::with_capacity(PK_LEN + EXPIRATION_LEN);
msg.extend_from_slice(&pk.to_bytes());
msg.extend_from_slice(&(revoked_at.as_secs() as u64).to_le_bytes());
msg
}
pub fn verify(revoke: &Revoke) -> Result<(), RevokeError> {
let msg = Revoke::signature_bytes(&revoke.pk, revoke.revoked_at);
revoke
.revoked_by
.verify_strict(msg.as_slice(), &revoke.signature)
.map_err(IncorrectSignature)
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_gen_revoke_and_validate() {
let revoker = KeyPair::generate();
let to_revoke = KeyPair::generate();
let duration = Duration::new(100, 0);
let revoke = Revoke::create(&revoker, to_revoke.public_key(), duration);
assert_eq!(Revoke::verify(&revoke).is_ok(), true);
}
#[test]
fn test_validate_corrupted_revoke() {
let revoker = KeyPair::generate();
let to_revoke = KeyPair::generate();
let duration = Duration::new(100, 0);
let revoke = Revoke::create(&revoker, to_revoke.public_key(), duration);
let duration2 = Duration::new(95, 0);
let corrupted_revoke = Revoke::new(
to_revoke.public_key(),
revoker.public_key(),
duration2,
revoke.signature,
);
assert_eq!(Revoke::verify(&corrupted_revoke).is_ok(), false);
}
}