Merge pull request #728 from BeppeMarnell/#712-peer-delete-bug

API Peer delete bug #712 fix: fixed issue with delete endpoint return…
This commit is contained in:
Donald Zou 2025-05-02 20:33:26 +08:00 committed by GitHub
commit e083adc022
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -805,6 +805,9 @@ class WireguardConfiguration:
return ResponseObject(False, "Failed to save configuration through WireGuard") return ResponseObject(False, "Failed to save configuration through WireGuard")
self.getPeers() self.getPeers()
if numOfDeletedPeers == 0 and numOfFailedToDeletePeers == 0:
return ResponseObject(False, "No peer(s) to delete found", responseCode=404)
if numOfDeletedPeers == len(listOfPublicKeys): if numOfDeletedPeers == len(listOfPublicKeys):
return ResponseObject(True, f"Deleted {numOfDeletedPeers} peer(s)") return ResponseObject(True, f"Deleted {numOfDeletedPeers} peer(s)")
@ -2465,11 +2468,11 @@ def API_deletePeers(configName: str) -> ResponseObject:
peers = data['peers'] peers = data['peers']
if configName in WireguardConfigurations.keys(): if configName in WireguardConfigurations.keys():
if len(peers) == 0: if len(peers) == 0:
return ResponseObject(False, "Please specify one or more peers") return ResponseObject(False, "Please specify one or more peers", status_code=400)
configuration = WireguardConfigurations.get(configName) configuration = WireguardConfigurations.get(configName)
return configuration.deletePeers(peers) return configuration.deletePeers(peers)
return ResponseObject(False, "Configuration does not exist") return ResponseObject(False, "Configuration does not exist", status_code=404)
@app.post(f'{APP_PREFIX}/api/restrictPeers/<configName>') @app.post(f'{APP_PREFIX}/api/restrictPeers/<configName>')
def API_restrictPeers(configName: str) -> ResponseObject: def API_restrictPeers(configName: str) -> ResponseObject: