aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/event.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/event.rs')
-rw-r--r--src/federation/event.rs25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/federation/event.rs b/src/federation/event.rs
index 00c7018..864bedb 100644
--- a/src/federation/event.rs
+++ b/src/federation/event.rs
@@ -5,7 +5,6 @@ use super::jcs::{self, Json};
use super::keys;
use super::store::Id;
use super::version::{self, Version};
-use crate::access::sshsig::PublicKey;
/// The most bytes an event may have.
pub(crate) const LARGEST: usize = 256 * 1024;
@@ -22,6 +21,21 @@ pub(crate) fn signed(
deps: &[Id],
does: (&str, Json),
) -> Vec<u8> {
+ signed_by(party, key, deps, does, |bytes| {
+ Ok(keys::sign(signer, bytes))
+ })
+ .expect("a key at hand signs")
+}
+
+/// An event `party` signs, its key spelled `key`, on `deps`, doing `does`: its bytes, as
+/// JCS, with the signature `sign` makes of them without `sig`, where it makes one.
+pub(crate) fn signed_by(
+ party: &str,
+ key: &str,
+ deps: &[Id],
+ does: (&str, Json),
+ sign: impl FnOnce(&[u8]) -> Result<String, String>,
+) -> Result<Vec<u8>, String> {
let mut members = vec![
("deps".to_owned(), ids(deps)),
("party".to_owned(), Json::Str(party.to_owned())),
@@ -29,11 +43,8 @@ pub(crate) fn signed(
(does.0.to_owned(), does.1),
];
let unsigned = Json::object(members.clone()).expect("names once each");
- members.push((
- "sig".to_owned(),
- Json::Str(keys::sign(signer, &unsigned.bytes())),
- ));
- Json::object(members).expect("names once each").bytes()
+ members.push(("sig".to_owned(), Json::Str(sign(&unsigned.bytes())?)));
+ Ok(Json::object(members).expect("names once each").bytes())
}
/// What writing `value` at `path` does.
@@ -229,7 +240,7 @@ impl Event {
}
/// The key a signed event is signed with.
- pub(crate) fn public(signed: &Signed) -> PublicKey {
+ pub(crate) fn public(signed: &Signed) -> keys::Key {
keys::key(&signed.key).expect("an event's key was read as one")
}
}