Skip to content

Fix internet check failure #799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 16, 2025
Merged

Fix internet check failure #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb685e9
Upgrade diagnostic VM to use an ethereum url that don't return 307
olethanh Apr 15, 2025
773fe88
Internet check : Accept code other than 200 as proper result
olethanh Apr 15, 2025
8d6dd94
Revert compat fix for pydantic 2 as runtime is on pydantic 1
olethanh Apr 15, 2025
3567e31
Make the diagnostic example code compatible with pydantic 1 and 2
olethanh Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/example_fastapi/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import PlainTextResponse
from pip._internal.operations.freeze import freeze
from pydantic import BaseModel, HttpUrl
from pydantic import BaseModel
from starlette.responses import JSONResponse

from aleph.sdk.chains.remote import RemoteAccount
Expand Down Expand Up @@ -198,7 +198,7 @@ async def connect_ipv6():
return {"result": False, "reason": str(error.args[0])}


async def check_url(internet_host: HttpUrl, timeout_seconds: int = 5, socket_family=socket.AF_INET):
async def check_url(internet_host: str, timeout_seconds: int = 5, socket_family=socket.AF_INET):
"""Check the connectivity of a single URL."""
timeout = aiohttp.ClientTimeout(total=timeout_seconds)
tcp_connector = aiohttp.TCPConnector(family=socket_family)
Expand All @@ -215,10 +215,10 @@ async def check_url(internet_host: HttpUrl, timeout_seconds: int = 5, socket_fam
@app.get("/internet")
async def read_internet():
"""Check Internet connectivity of the system, requiring IP connectivity, domain resolution and HTTPS/TLS."""
internet_hosts: list[HttpUrl] = [
HttpUrl(url="https://aleph.im/"),
HttpUrl(url="https://ethereum.org"),
HttpUrl(url="https://ipfs.io/"),
internet_hosts: list[str] = [
"https://aleph.im/",
"https://ethereum.org/en/",
"https://ipfs.io/",
]
timeout_seconds = 5

Expand Down
5 changes: 3 additions & 2 deletions src/aleph/vm/orchestrator/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,15 @@ async def check_ipv6(session: ClientSession, vm_id: ItemHash) -> bool:
return False


async def check_internet(session: ClientSession, vm_id: ItemHash) -> bool:
async def check_internet(session: ClientSession, vm_id: ItemHash) -> bool | None:
"""Check that the VM has internet connectivity. This requires DNS, IP, HTTP and TLS to work."""
try:
response: dict = await get_json_from_vm(session, vm_id, "/internet")

# The diagnostic VM returns HTTP 200 with {"result": False} when cannot connect to the internet.
# else it forwards the return code if its own test endpoint.
return response.get("result") == HTTPOk.status_code
status_code: bool | None | int = response.get("result")
return status_code is not False and isinstance(status_code, int) and status_code < 400
except ClientResponseError:
return False

Expand Down