commit - ea4c5435a6cbb363a3aef79a90b4ad84001097b45798b0873efbbb86eed97c89
commit + 876c0ca2533c98617af0d98ce58f3541d05be3ea93e04de9b0bedd89cf6407a5
blob - 2fbcebb9ab1795626e53604b2955ee51c91f1493db52aa4c07878d201cd0da38
blob + 3cfb3b34a0fd6cfd2e2f1d99817913e4d49656aec77bd2042689784ec3f84530
--- gotd/repo_write.c
+++ gotd/repo_write.c
}
static const struct got_error *
+protect_refs_from_moving(void)
+{
+ const struct got_error *err = NULL;
+ struct repo_write_client *client = &repo_write_client;
+ struct gotd_ref_update *ref_update;
+ struct got_pathlist_entry *pe;
+ const char *refname;
+
+ STAILQ_FOREACH(ref_update, &client->ref_updates, entry) {
+ if (ref_update->delete_ref)
+ continue;
+
+ if (got_object_id_cmp(&ref_update->old_id,
+ &ref_update->new_id) == 0)
+ continue;
+
+ refname = got_ref_get_name(ref_update->ref);
+
+ RB_FOREACH(pe, got_pathlist_head,
+ repo_write.protected_tag_namespaces) {
+ err = protect_ref_namespace(refname, pe->path);
+ if (err)
+ return err;
+ }
+
+ RB_FOREACH(pe, got_pathlist_head,
+ repo_write.protected_branch_namespaces) {
+ err = protect_ref_namespace(refname, pe->path);
+ if (err)
+ return err;
+ }
+
+ RB_FOREACH(pe, got_pathlist_head, repo_write.protected_branches)
+ {
+ if (strcmp(refname, pe->path) == 0) {
+ return got_error_fmt(GOT_ERR_REF_PROTECTED,
+ "%s", refname);
+ }
+ }
+ }
+
+ return NULL;
+}
+
+static const struct got_error *
install_packfile(struct gotd_imsgev *iev)
{
struct repo_write_client *client = &repo_write_client;
*/
repo_write.repo->pack_path_mtime.tv_sec = 0;
repo_write.repo->pack_path_mtime.tv_nsec = 0;
+ } else {
+ /*
+ * Clients sending empty pack files might be
+ * attempting to move a protected reference.
+ */
+ err = protect_refs_from_moving();
+ if (err)
+ break;
}
err = update_refs(iev);
if (err) {
blob - a0ff561aa0ec40a0bef6de9131cba4cb241168527fc6d3437fab51f77a07e8c6
blob + 4f6a87937aa1c30474eda7c5dfbde054f0e5f78b945fa25e2984c08adfbcefec
--- regress/gotd/repo_write_protected.sh
+++ regress/gotd/repo_write_protected.sh
got checkout $testroot/repo-clone $testroot/wt >/dev/null
- for i in 1 2 3; do
+ for i in 1 2; do
echo "more alpha" >> $testroot/wt/alpha
(cd $testroot/wt && got commit -m "more" >/dev/null)
done