feat: Add option to use http basic auth for api routes
All checks were successful
Build Docker / Build Images (map[dockerfile:Dockerfile.hsd tag_suffix:-hsd target:hsd]) (push) Successful in 3m2s
Build Docker / Build Images (map[dockerfile:Dockerfile tag_suffix: target:default]) (push) Successful in 3m8s
Tests and Linting / Tests-Linting (3.11) (push) Successful in 3m12s
Tests and Linting / Tests-Linting (3.13) (push) Successful in 3m19s
Tests and Linting / Tests-Linting (3.10) (push) Successful in 3m24s

This shoudl make it easier to use curl to access info
This commit is contained in:
2025-09-16 16:42:09 +10:00
parent aa52911823
commit 15d919ca97
2 changed files with 28 additions and 13 deletions

View File

@@ -119,6 +119,8 @@ def check_account(cookie: str | None):
return False return False
account = cookie.split(":")[0] account = cookie.split(":")[0]
if len(account) < 1:
return False
# Check if the account is valid # Check if the account is valid
info = hsw.getAccountInfo(account, 'default') info = hsw.getAccountInfo(account, 'default')
if 'error' in info: if 'error' in info:
@@ -1571,6 +1573,12 @@ def getMempoolBids():
def rescan(): def rescan():
try: try:
response = hsw.walletRescan(0) response = hsw.walletRescan(0)
if 'success' in response and response['success'] is False:
return {
"error": {
"message": "Rescan already in progress"
}
}
return response return response
except Exception as e: except Exception as e:
return { return {

37
main.py
View File

@@ -1608,12 +1608,16 @@ def plugin_function(ptype,plugin,function):
@app.route('/api/v1/hsd/<function>', methods=["GET"]) @app.route('/api/v1/hsd/<function>', methods=["GET"])
def api_hsd(function): def api_hsd(function):
# Check if the user is logged in # Check if the user is logged in
if request.cookies.get("account") is None: account = None
return jsonify({"error": "Not logged in"}) if request.cookies.get("account") is not None:
account = account_module.check_account(request.cookies.get("account"))
# Allow login using http basic auth
if account is None and request.authorization is not None:
account = account_module.check_account(f"{request.authorization.username}:{request.authorization.password}")
account = account_module.check_account(request.cookies.get("account"))
if not account: if not account:
return jsonify({"error": "Invalid account"}) return jsonify({"error": "Not logged in"})
if function == "sync": if function == "sync":
return jsonify({"result": account_module.getNodeSync()}) return jsonify({"result": account_module.getNodeSync()})
@@ -1709,17 +1713,20 @@ def api_hsd_mobile(function):
@app.route('/api/v1/wallet/<function>', methods=["GET"]) @app.route('/api/v1/wallet/<function>', methods=["GET"])
def api_wallet(function): def api_wallet(function):
# Check if the user is logged in # Check if the user is logged in
if request.cookies.get("account") is None: account = None
password = None
if request.cookies.get("account") is not None:
account = account_module.check_account(request.cookies.get("account"))
password = request.cookies.get("account","").split(":")[1]
# Allow login using http basic auth
if account is None and request.authorization is not None:
account = account_module.check_account(f"{request.authorization.username}:{request.authorization.password}")
password = request.authorization.password
if not account:
return jsonify({"error": "Not logged in"}) return jsonify({"error": "Not logged in"})
account = account_module.check_account(request.cookies.get("account"))
if not account:
return jsonify({"error": "Invalid account"})
password = request.cookies.get("account","").split(":")[1]
if not account:
return jsonify({"error": "Invalid account"})
if function == "sync": if function == "sync":
return jsonify({"result": account_module.getWalletStatus()}) return jsonify({"result": account_module.getWalletStatus()})
@@ -2021,8 +2028,8 @@ def get_alerts(account:str) -> list:
wallet_status = account_module.getWalletStatus() wallet_status = account_module.getWalletStatus()
if wallet_status != "Ready": if wallet_status != "Ready":
alerts.append({ alerts.append({
"name": "Wallet", "name": "Wallet Not Synced",
"output": f"The wallet is not synced ({wallet_status}). Please wait for it to sync." "output": "Please wait for it to sync."
}) })
# Try to read from notifications sqlite database # Try to read from notifications sqlite database
if os.path.exists("user_data/notifications.db"): if os.path.exists("user_data/notifications.db"):