yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

S310: fix

Browse Source
This commit is contained in:
Jörg Thalheim
2025-08-20 16:10:00 +02:00
parent 0a70ed6268
commit 4852e79c3c
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nixosModules/clanCore/zerotier/generate.py
View File

@@ -84,8 +84,9 @@ class ZerotierController:
headers["Content-Type"] = "application/json" headers["Content-Type"] = "application/json"
headers["X-ZT1-AUTH"] = self.authtoken headers["X-ZT1-AUTH"] = self.authtoken
url = f"http://127.0.0.1:{self.port}{path}" url = f"http://127.0.0.1:{self.port}{path}"
req = urllib.request.Request(url, headers=headers, method=method, data=body) # Safe: only connecting to localhost zerotier API
resp = urllib.request.urlopen(req) req = urllib.request.Request(url, headers=headers, method=method, data=body) # noqa: S310
resp = urllib.request.urlopen(req) # noqa: S310
return json.load(resp) return json.load(resp)
def status(self) -> dict[str, Any]: def status(self) -> dict[str, Any]:

20
pkgs/clan-app/clan_app/deps/http/test_http_api.py
View File

@@ -151,14 +151,14 @@ class TestHttpApiServer:
try: try:
# Test root endpoint # Test root endpoint
response = urlopen("http://127.0.0.1:8081/") response = urlopen("http://127.0.0.1:8081/") # noqa: S310
data: dict = json.loads(response.read().decode()) data: dict = json.loads(response.read().decode())
assert data["body"]["status"] == "success" assert data["body"]["status"] == "success"
assert data["body"]["data"]["message"] == "Clan API Server" assert data["body"]["data"]["message"] == "Clan API Server"
assert data["body"]["data"]["version"] == "1.0.0" assert data["body"]["data"]["version"] == "1.0.0"
# Test methods endpoint # Test methods endpoint
response = urlopen("http://127.0.0.1:8081/api/methods") response = urlopen("http://127.0.0.1:8081/api/methods") # noqa: S310
data = json.loads(response.read().decode()) data = json.loads(response.read().decode())
assert data["body"]["status"] == "success" assert data["body"]["status"] == "success"
assert "test_method" in data["body"]["data"]["methods"] assert "test_method" in data["body"]["data"]["methods"]
@@ -171,7 +171,7 @@ class TestHttpApiServer:
data=json.dumps(request_data).encode(), data=json.dumps(request_data).encode(),
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
response = urlopen(req) response = urlopen(req) # noqa: S310
data = json.loads(response.read().decode()) data = json.loads(response.read().decode())
# Response should be BackendResponse format # Response should be BackendResponse format
@@ -194,7 +194,7 @@ class TestHttpApiServer:
try: try:
# Test 404 error # Test 404 error
res = urlopen("http://127.0.0.1:8081/nonexistent") res = urlopen("http://127.0.0.1:8081/nonexistent") # noqa: S310
assert res.status == 200 assert res.status == 200
body = json.loads(res.read().decode())["body"] body = json.loads(res.read().decode())["body"]
assert body["status"] == "error" assert body["status"] == "error"
@@ -207,7 +207,7 @@ class TestHttpApiServer:
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
res = urlopen(req) res = urlopen(req) # noqa: S310
assert res.status == 200 assert res.status == 200
body = json.loads(res.read().decode())["body"] body = json.loads(res.read().decode())["body"]
assert body["status"] == "error" assert body["status"] == "error"
@@ -219,7 +219,7 @@ class TestHttpApiServer:
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
res = urlopen(req) res = urlopen(req) # noqa: S310
assert res.status == 200 assert res.status == 200
body = json.loads(res.read().decode())["body"] body = json.loads(res.read().decode())["body"]
assert body["status"] == "error" assert body["status"] == "error"
@@ -240,7 +240,7 @@ class TestHttpApiServer:
return "OPTIONS" return "OPTIONS"
req: Request = OptionsRequest("http://127.0.0.1:8081/api/call/test_method") req: Request = OptionsRequest("http://127.0.0.1:8081/api/call/test_method")
response = urlopen(req) response = urlopen(req) # noqa: S310
# Check CORS headers # Check CORS headers
headers = response.info() headers = response.info()
@@ -290,7 +290,7 @@ class TestIntegration:
data=json.dumps(request_data).encode(), data=json.dumps(request_data).encode(),
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
response = urlopen(req) response = urlopen(req) # noqa: S310
data: dict = json.loads(response.read().decode()) data: dict = json.loads(response.read().decode())
# Verify response in BackendResponse format # Verify response in BackendResponse format
@@ -341,7 +341,7 @@ class TestIntegration:
data=json.dumps(request_data).encode(), data=json.dumps(request_data).encode(),
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
response = urlopen(req) response = urlopen(req) # noqa: S310
data: dict = json.loads(response.read().decode()) data: dict = json.loads(response.read().decode())
# thread.join() # thread.join()
@@ -365,7 +365,7 @@ class TestIntegration:
data=json.dumps(request_data).encode(), data=json.dumps(request_data).encode(),
headers={"Content-Type": "application/json"}, headers={"Content-Type": "application/json"},
) )
response = urlopen(req) response = urlopen(req) # noqa: S310
data: dict = json.loads(response.read().decode()) data: dict = json.loads(response.read().decode())
assert "body" in data assert "body" in data