aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/access/policy.rs18
-rw-r--r--src/config/mod.rs4
2 files changed, 14 insertions, 8 deletions
diff --git a/src/access/policy.rs b/src/access/policy.rs
index 54e70d0..23e445d 100644
--- a/src/access/policy.rs
+++ b/src/access/policy.rs
@@ -69,13 +69,7 @@ pub(crate) fn first(
};
let value: JsonValue = serde_json::from_str(given)
.map_err(|error| format!("bootstrap-policy isn't JSON: {error}"))?;
- let mut doc = crate::document::Document::new();
- let mut write = doc.transaction();
- store::write_path(&mut write, &path(), &value)
- .map_err(|error| format!("bootstrap-policy: {error}"))?;
- let policy = of(&write);
- write.rollback();
- match policy {
+ match as_written(&value).map_err(|error| format!("bootstrap-policy: {error}"))? {
Policy::Unknown(why) => Err(format!("bootstrap-policy: one this node doesn't know: {why}")),
Policy::Open => Err("bootstrap-policy: no policy".to_owned()),
policy if policy.strict() && bootstrap_keys.is_empty() => Err(
@@ -86,6 +80,16 @@ pub(crate) fn first(
}
}
+/// The policy `value` is, written at the policy's place, as every node reads it there.
+pub(crate) fn as_written(value: &JsonValue) -> Result<Policy, String> {
+ let mut doc = crate::document::Document::new();
+ let mut write = doc.transaction();
+ store::write_path(&mut write, &path(), value).map_err(|error| error.to_string())?;
+ let policy = of(&write);
+ write.rollback();
+ Ok(policy)
+}
+
/// The policy `doc` holds, read in typed JSON: what continuum writes there reads as it
/// is, plain JSON or an envelope, and anything else (a text, a counter, bytes) as itself,
/// tagged, so that a policy holding one where it says what it is reads as one nobody
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4100764..14bd984 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -928,7 +928,9 @@ impl Settings {
// Its content would be a change of its own before the policy's: a swarm
// strict from its start has none, so it starts empty.
Ok(Some(policy))
- if self.remake.is_some() && crate::access::policy::read(&policy).strict() =>
+ if self.remake.is_some()
+ && crate::access::policy::as_written(&policy)
+ .is_ok_and(|policy| policy.strict()) =>
{
bail!(
"bootstrap-policy: a strict swarm starts empty, not from remake; one started from content turns strict through a strict remake"