markqvist/Reticulum
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepared rngit push protocol extension

Browse source
This commit is contained in:
Mark Qvist 2026-04-28 18:05:24 +02:00
parent c596dab806
commit 9c892dc1a4
1 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

60
RNS/Utilities/rngit/server.py
View file

@ -569,35 +569,43 @@ class ReticulumGitNode():
local_ref = data.get("local_ref", "") local_ref = data.get("local_ref", "")
remote_ref = data.get("remote_ref", "") remote_ref = data.get("remote_ref", "")
force = data.get("force", False) force = data.get("force", False)
bundle_data = data.get("bundle", b"") bundle_data = data.get("bundle", None)
operations = data.get("operations", None)
if not local_ref or not remote_ref: return self.RES_INVALID_REQ.to_bytes(1, "big") + b"Missing ref specification" if bundle_data:
try: if not local_ref or not remote_ref: return self.RES_INVALID_REQ.to_bytes(1, "big") + b"Missing ref specification"
RNS.log(f"Push {local_ref}:{remote_ref} to {group_name}/{repository_name}", RNS.LOG_DEBUG) try:
RNS.log(f"Push {local_ref}:{remote_ref} to {group_name}/{repository_name}", RNS.LOG_DEBUG)
with TemporaryDirectory() as tmpdir:
bundle_path = os.path.join(tmpdir, "push.bundle")
if isinstance(bundle_data, str): bundle_data = bundle_data.encode("utf-8") with TemporaryDirectory() as tmpdir:
with open(bundle_path, "wb") as f: f.write(bundle_data) bundle_path = os.path.join(tmpdir, "push.bundle")
execv = ["git", "bundle", "verify", bundle_path]
result = subprocess.run(execv, cwd=repository_path, capture_output=True, check=False)
if result.returncode != 0: return self.RES_REMOTE_FAIL.to_bytes(1, "big") + result.stderr
execv = ["git", "fetch", bundle_path, f"{local_ref}:{remote_ref}"]
if force: execv.append("--force")
result = subprocess.run(execv, cwd=repository_path, capture_output=True, check=False)
if result.returncode != 0: return self.RES_REMOTE_FAIL.to_bytes(1, "big") + result.stderr
return b"\x00"
except Exception as e: if isinstance(bundle_data, str): bundle_data = bundle_data.encode("utf-8")
RNS.log(f"Error while handling push request for {group_name}/{repository_name}: {e}", RNS.LOG_ERROR) with open(bundle_path, "wb") as f: f.write(bundle_data)
return self.RES_REMOTE_FAIL.to_bytes(1, "big") + str(e).encode("utf-8")
execv = ["git", "bundle", "verify", bundle_path]
result = subprocess.run(execv, cwd=repository_path, capture_output=True, check=False)
if result.returncode != 0: return self.RES_REMOTE_FAIL.to_bytes(1, "big") + result.stderr
execv = ["git", "fetch", bundle_path, f"{local_ref}:{remote_ref}"]
if force: execv.append("--force")
result = subprocess.run(execv, cwd=repository_path, capture_output=True, check=False)
if result.returncode != 0: return self.RES_REMOTE_FAIL.to_bytes(1, "big") + result.stderr
return b"\x00"
except Exception as e:
RNS.log(f"Error while handling push request for {group_name}/{repository_name}: {e}", RNS.LOG_ERROR)
return self.RES_REMOTE_FAIL.to_bytes(1, "big") + str(e).encode("utf-8")
elif operations:
# TODO: Implement
pass
else: self.RES_INVALID_REQ.to_bytes(1, "big") + b"Invalid request data"
def handle_delete(self, path, data, request_id, remote_identity, requested_at): def handle_delete(self, path, data, request_id, remote_identity, requested_at):
RNS.log(f"Delete request from remote {remote_identity}", RNS.LOG_DEBUG) RNS.log(f"Delete request from remote {remote_identity}", RNS.LOG_DEBUG)