Skip to content

fix(node): anchor the real old_sha and issue a per-ref certificate #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beardthelion wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −24
Open

fix(node): anchor the real old_sha and issue a per-ref certificate #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions crates/gitlawb-node/src/api/repos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,23 +566,27 @@ pub async fn git_receive_pack(
let _ = state.db.update_trust_score(did, new_score).await;
}

let ref_name = ref_updates
.first()
.map(|u| u.ref_name.as_str())
.unwrap_or("refs/heads/main");
let old_sha = ref_updates
.first()
.map(|u| u.old_sha.as_str())
.unwrap_or("0000000000000000000000000000000000000000");

// Issue a signed ref-update certificate
match cert::issue_ref_certificate(&state, &record.id, ref_name, old_sha, &commit_hash, did)
// Issue a signed certificate for every ref this push advanced, each
// carrying that ref's real old→new transition. A multi-ref push must
// not collapse to a single cert covering only the first ref.
for update in &ref_updates {
match cert::issue_ref_certificate(
&state,
&record.id,
&update.ref_name,
&update.old_sha,
&update.new_sha,
did,
)
.await
{
Ok(c) => {
tracing::info!(cert_id = %c.id, repo = %record.name, pusher = %did, "issued ref certificate")
{
Ok(c) => {
tracing::info!(cert_id = %c.id, repo = %record.name, ref_name = %update.ref_name, pusher = %did, "issued ref certificate")
}
Err(e) => {
tracing::warn!(err = %e, ref_name = %update.ref_name, "failed to issue ref certificate")
}
}
Err(e) => tracing::warn!(err = %e, "failed to issue ref certificate"),
}
}

Expand Down Expand Up @@ -784,7 +788,7 @@ pub async fn git_receive_pack(
);
let ref_updates_clone = ref_updates
.iter()
.map(|u| (u.ref_name.clone(), u.new_sha.clone()))
.map(|u| (u.ref_name.clone(), u.old_sha.clone(), u.new_sha.clone()))
.collect::<Vec<_>>();
let p2p_handle = state.p2p.clone();
let pusher_did_clone = pusher_did.clone().unwrap_or_default();
Expand Down Expand Up @@ -819,7 +823,7 @@ pub async fn git_receive_pack(
let cid_map: std::collections::HashMap<String, String> = pinned.into_iter().collect();

// Record branch→CID for each ref update and publish gossip
for (ref_name, new_sha) in &ref_updates_clone {
for (ref_name, _old_sha, new_sha) in &ref_updates_clone {
let cid = cid_map.get(new_sha).map(|s| s.as_str());

if let Some(cid_str) = cid {
Expand Down Expand Up @@ -865,8 +869,8 @@ pub async fn git_receive_pack(
let notify_url = format!("{peer_url}{path}");
let body = serde_json::json!({
"repo": repo_slug.clone(),
"ref_name": ref_updates_clone.first().map(|(r, _)| r).unwrap_or(&String::new()),
"new_sha": ref_updates_clone.first().map(|(_, s)| s).unwrap_or(&String::new()),
"ref_name": ref_updates_clone.first().map(|(r, _, _)| r).unwrap_or(&String::new()),
"new_sha": ref_updates_clone.first().map(|(_, _, s)| s).unwrap_or(&String::new()),
"node_did": node_did_str.clone(),
"pusher_did": pusher_did_clone.clone(),
"old_sha": "0000000000000000000000000000000000000000",
Expand Down Expand Up @@ -915,12 +919,12 @@ pub async fn git_receive_pack(
repo: repo_slug.clone(),
ref_name: ref_updates_clone
.first()
.map(|(r, _)| r.clone())
.map(|(r, _, _)| r.clone())
.unwrap_or_default(),
old_sha: "0000000000000000000000000000000000000000".to_string(),
new_sha: ref_updates_clone
.first()
.map(|(_, s)| s.clone())
.map(|(_, _, s)| s.clone())
.unwrap_or_default(),
pusher_did: pusher_did_clone.clone(),
node_did: node_did_str.clone(),
Expand All @@ -930,13 +934,13 @@ pub async fn git_receive_pack(
// Arweave permanent anchoring — fire for each ref update.
// Suppressed for repos the public cannot read (public permanent ledger).
if announce && !irys_url.is_empty() {
for (ref_name, new_sha) in &ref_updates_clone {
for (ref_name, old_sha, new_sha) in &ref_updates_clone {
let cid = cid_map.get(new_sha).cloned();
let anchor = crate::arweave::RefAnchor {
repo: repo_slug.clone(),
owner_did: owner_did_for_arweave.clone(),
ref_name: ref_name.clone(),
old_sha: "0".repeat(64),
old_sha: old_sha.clone(),
new_sha: new_sha.clone(),
cid: cid.clone(),
timestamp: now_ts.clone(),
Expand All @@ -951,7 +955,7 @@ pub async fn git_receive_pack(
repo: &repo_slug,
owner_did: &owner_did_for_arweave,
ref_name,
old_sha: "0".repeat(64).as_str(),
old_sha,
new_sha,
cid: cid.as_deref(),
irys_tx_id: &tx_id,
Expand Down
38 changes: 38 additions & 0 deletions crates/gitlawb-node/src/arweave.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,44 @@ mod tests {
_mock.assert_async().await;
}

#[tokio::test]
async fn test_anchor_body_carries_real_old_sha() {
// The anchored body must serialize the real old→new transition the
// node was handed, never a zero placeholder. Regression guard for the
// push handler that used to hardcode `old_sha` to 64 zeros (#26).
let mut server = mockito::Server::new_async().await;
let real_old = "1111111111111111111111111111111111111111";
let real_new = "2222222222222222222222222222222222222222";
let _mock = server
.mock("POST", "/upload")
.match_body(mockito::Matcher::AllOf(vec![
mockito::Matcher::PartialJsonString(format!(r#"{{"old_sha":"{real_old}"}}"#)),
mockito::Matcher::PartialJsonString(format!(r#"{{"new_sha":"{real_new}"}}"#)),
]))
.with_status(200)
.with_header("content-type", "application/json")
.with_body(r#"{"id":"TX_REAL_OLD_SHA","timestamp":1710000000000,"version":"1.0.0"}"#)
.create_async()
.await;

let client = reqwest::Client::new();
let anchor = RefAnchor {
repo: "alice/myrepo".into(),
owner_did: "did:key:z6Mk...".into(),
ref_name: "refs/heads/main".into(),
old_sha: real_old.into(),
new_sha: real_new.into(),
cid: None,
timestamp: "2026-03-14T00:00:00Z".into(),
node_did: "did:key:z6Mknnd...".into(),
};

let result = anchor_ref_update(&client, &server.url(), &anchor).await;
assert_eq!(result.unwrap(), "TX_REAL_OLD_SHA");
// The mock only matches when the posted JSON carries both real SHAs.
_mock.assert_async().await;
}

#[test]
fn test_arweave_url() {
let url = arweave_url("7xGpIoHUQ8j9GhD3Y2mKzP1NsVtXwRcFe4bEaLnMuOk");
Expand Down
Loading