Merge pull request 'fix: edge-control: deregister has no ownership check — any authorized SSH key can take over any project (#1091)' (#1101) from fix/issue-1091-ownership-check into main

bin/disinto

@@ -2885,12 +2885,23 @@ disinto_edge() {
         edge_host="${EDGE_HOST:-edge.disinto.ai}"
       fi
 
+      # Read tunnel pubkey for ownership proof
+      local secrets_dir="${FACTORY_ROOT}/secrets"
+      local tunnel_pubkey="${secrets_dir}/tunnel_key.pub"
+      if [ ! -f "$tunnel_pubkey" ]; then
+        echo "Error: tunnel keypair not found at ${tunnel_pubkey}" >&2
+        echo "Cannot prove ownership without the tunnel public key." >&2
+        exit 1
+      fi
+      local pubkey
+      pubkey=$(tr -d '\n' < "$tunnel_pubkey")
+
       # SSH to edge host and deregister
       echo "Deregistering tunnel for ${project} on ${edge_host}..."
       local response
       response=$(ssh -o StrictHostKeyChecking=accept-new -o BatchMode=yes \
         "disinto-register@${edge_host}" \
-        "deregister ${project}" 2>&1) || {
+        "deregister ${project} ${pubkey}" 2>&1) || {
         echo "Error: failed to deregister tunnel" >&2
         echo "Response: ${response}" >&2
         exit 1

tools/edge-control/register.sh

@@ -11,7 +11,7 @@
 #
 # Usage (via SSH):
 #   ssh disinto-register@edge "register <project> <pubkey>"
-#   ssh disinto-register@edge "deregister <project>"
+#   ssh disinto-register@edge "deregister <project> <pubkey>"
 #   ssh disinto-register@edge "list"
 #
 # Output: JSON on stdout
@@ -90,7 +90,7 @@ usage() {
   cat <<EOF
 Usage:
   register <project> <pubkey>       Register a new tunnel
-  deregister <project>              Remove a tunnel
+  deregister <project> <pubkey>     Remove a tunnel (requires owner pubkey)
   list                              List all registered tunnels
 
 Example:
@@ -231,9 +231,15 @@ do_register() {
 }
 
 # Deregister a tunnel
-# Usage: do_deregister <project>
+# Usage: do_deregister <project> <pubkey>
 do_deregister() {
   local project="$1"
+  local caller_pubkey="$2"
+
+  if [ -z "$caller_pubkey" ]; then
+    echo '{"error":"deregister requires <project> <pubkey>"}'
+    exit 1
+  fi
 
   # Record who is deregistering before removal
   local deregistered_by="$CALLER"
@@ -247,13 +253,16 @@ do_deregister() {
     exit 1
   fi
 
-  pubkey_fp=$(get_project_info "$project" | jq -r '.pubkey // empty' 2>/dev/null) || pubkey_fp=""
+  # Verify caller owns this project — pubkey must match stored value
-  if [ -n "$pubkey_fp" ]; then
+  local stored_pubkey
-    pubkey_fp=$(ssh-keygen -lf /dev/stdin <<<"$pubkey_fp" 2>/dev/null | awk '{print $2}') || pubkey_fp="unknown"
+  stored_pubkey=$(get_project_info "$project" | jq -r '.pubkey // empty' 2>/dev/null) || stored_pubkey=""
-  else
+  if [ "$caller_pubkey" != "$stored_pubkey" ]; then
-    pubkey_fp="unknown"
+    echo '{"error":"pubkey mismatch"}'
+    exit 1
   fi
 
+  pubkey_fp=$(ssh-keygen -lf /dev/stdin <<<"$stored_pubkey" 2>/dev/null | awk '{print $2}') || pubkey_fp="unknown"
+
   # Remove from registry
   free_port "$project" >/dev/null
 
@@ -335,13 +344,17 @@ main() {
       do_register "$project" "$pubkey"
       ;;
     deregister)
-      # deregister <project>
+      # deregister <project> <pubkey>
-      local project="$args"
+      local project="${args%% *}"
-      if [ -z "$project" ]; then
+      local pubkey="${args#* }"
-        echo '{"error":"deregister requires <project>"}'
+      if [ "$pubkey" = "$args" ]; then
+        pubkey=""
+      fi
+      if [ -z "$project" ] || [ -z "$pubkey" ]; then
+        echo '{"error":"deregister requires <project> <pubkey>"}'
         exit 1
       fi
-      do_deregister "$project"
+      do_deregister "$project" "$pubkey"
       ;;
     list)
       do_list