napseer/napseer-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix preregistered gateway vault bootstrap

Browse Source
This commit is contained in:
HumbleTurtle
2026-05-01 01:39:51 -03:00
parent 119f2134c5
commit 0fce72a439
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/scripts/napseer_mcp_server.py
+16 -6
View File
@@ -3801,15 +3801,15 @@ def save_auth(updates):
current_public = load_public_auth_file() current_public = load_public_auth_file()
cleaned = {key: value for key, value in updates.items() if value is not None} cleaned = {key: value for key, value in updates.items() if value is not None}
if vault_exists(): if vault_exists():
public_updates = {key: value for key, value in cleaned.items() if key in AUTH_FILE_KEYS} public_updates = {key: value for key, value in cleaned.items() if key in PUBLIC_AUTH_KEYS}
secret_updates = {key: value for key, value in cleaned.items() if key in GATEWAY_VAULT_KEYS} secret_updates = {key: value for key, value in cleaned.items() if key in SECRET_AUTH_KEYS or key in GATEWAY_VAULT_KEYS}
current_public.update(public_updates) current_public.update(public_updates)
write_public_auth(current_public) write_public_auth(current_public)
if secret_updates: if secret_updates:
require_unlocked("updating gateway vault") require_unlocked("updating gateway vault")
VAULT_SECRETS.update(secret_updates) VAULT_SECRETS.update(secret_updates)
write_vault_with_key(VAULT_KEY, {"version": 1, "updated_at": iso_now(), "secrets": VAULT_SECRETS}) write_vault_with_key(VAULT_KEY, {"version": 1, "updated_at": iso_now(), "secrets": VAULT_SECRETS})
AUTH = load_auth(public_override=current_public) AUTH = load_auth(public_override=current_public, secret_override=VAULT_SECRETS)
else: else:
current_public.update(cleaned) current_public.update(cleaned)
AUTH_PATH.parent.mkdir(exist_ok=True) AUTH_PATH.parent.mkdir(exist_ok=True)
@@ -4023,16 +4023,28 @@ def gateway_service_activate(args=None):
} }
def gateway_service_unlock_from_env():
if not vault_exists() or gateway_is_unlocked():
return False
passphrase = os.environ.get("NAPSEER_GATEWAY_PASSPHRASE") or os.environ.get("NAPSEER_GATEWAY_PASSKEY")
if not passphrase:
return False
gateway_unlock(passphrase)
return True
def gateway_service_run(args=None): def gateway_service_run(args=None):
args = args or {} args = args or {}
if not AUTH.get("service_registration_id") and ( if not AUTH.get("service_registration_id") and (
os.environ.get("NAPSEER_SERVICE_BOOTSTRAP_TOKEN") or os.environ.get("NAPSEER_GATEWAY_BOOTSTRAP_TOKEN") os.environ.get("NAPSEER_SERVICE_BOOTSTRAP_TOKEN") or os.environ.get("NAPSEER_GATEWAY_BOOTSTRAP_TOKEN")
): ):
gateway_service_preregister(args) gateway_service_preregister(args)
gateway_service_unlock_from_env()
deadline = time.time() + int(args.get("timeout_seconds") or os.environ.get("NAPSEER_SERVICE_ACTIVATION_TIMEOUT_SECONDS", "900")) deadline = time.time() + int(args.get("timeout_seconds") or os.environ.get("NAPSEER_SERVICE_ACTIVATION_TIMEOUT_SECONDS", "900"))
activated = False activated = False
while not TOKEN and time.time() < deadline: while not TOKEN and time.time() < deadline:
try: try:
gateway_service_unlock_from_env()
gateway_service_activate(args) gateway_service_activate(args)
activated = True activated = True
break break
@@ -4044,9 +4056,7 @@ def gateway_service_run(args=None):
if not TOKEN and not activated: if not TOKEN and not activated:
raise RuntimeError("gateway service was not accepted before activation timeout") raise RuntimeError("gateway service was not accepted before activation timeout")
if not gateway_is_unlocked(): if not gateway_is_unlocked():
passphrase = os.environ.get("NAPSEER_GATEWAY_PASSPHRASE") or os.environ.get("NAPSEER_GATEWAY_PASSKEY") gateway_service_unlock_from_env()
if passphrase:
gateway_unlock(passphrase)
result = start_local_ui({"open_browser": False, "port": int(args.get("port") or os.environ.get("NAPSEER_GATEWAY_PORT", "0"))}) result = start_local_ui({"open_browser": False, "port": int(args.get("port") or os.environ.get("NAPSEER_GATEWAY_PORT", "0"))})
print(json.dumps(result, indent=2)) print(json.dumps(result, indent=2))
try: try: