boxd 0.3.0.dev1003__tar.gz → 0.3.0.dev1041__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {boxd-0.3.0.dev1003/src/boxd.egg-info → boxd-0.3.0.dev1041}/PKG-INFO +1 -1
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/pyproject.toml +1 -1
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_client.py +10 -4
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_credentials.py +25 -5
- boxd-0.3.0.dev1041/src/boxd/_generated/api_pb2.py +696 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_regions.py +174 -9
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_requests.py +13 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_transport.py +103 -9
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_urls.py +59 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/machines.py +121 -56
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041/src/boxd.egg-info}/PKG-INFO +1 -1
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd.egg-info/SOURCES.txt +2 -0
- boxd-0.3.0.dev1041/tests/test_create_in_one_call.py +136 -0
- boxd-0.3.0.dev1041/tests/test_raw_key.py +302 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_regions.py +359 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_transport.py +1 -1
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_urls.py +44 -1
- boxd-0.3.0.dev1003/src/boxd/_generated/api_pb2.py +0 -696
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/LICENSE +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/README.md +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/setup.cfg +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/__init__.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_generated/__init__.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_generated/api_pb2_grpc.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_mappers.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_streaming.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/_version_check.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/errors.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/models.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/py.typed +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/__init__.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/account.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/credentials.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/disks.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/domains.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/fs.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/orgs.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/regions.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/snapshots.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/teams.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/resources/vars.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd/spec.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd.egg-info/dependency_links.txt +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd.egg-info/requires.txt +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/src/boxd.egg-info/top_level.txt +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_credentials.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_delete_self.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_fs.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_mappers.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_namespaces.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_python_versions.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_requests.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_spec.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_streaming.py +0 -0
- {boxd-0.3.0.dev1003 → boxd-0.3.0.dev1041}/tests/test_version_check.py +0 -0
|
@@ -72,16 +72,19 @@ class Boxd:
|
|
|
72
72
|
exchange_url=exchange_url_for(resolved or DEFAULT_BASE_URL),
|
|
73
73
|
)
|
|
74
74
|
|
|
75
|
-
def connect(url: str | None) -> SyncTransport:
|
|
75
|
+
def connect(url: str | None, *, derived: bool = False) -> SyncTransport:
|
|
76
76
|
# Every region's endpoint, and home's, share the one credential.
|
|
77
77
|
return SyncTransport(
|
|
78
78
|
base_url=url,
|
|
79
79
|
credentials=credentials,
|
|
80
80
|
timeout=timeout,
|
|
81
81
|
max_retries=max_retries,
|
|
82
|
+
derived=derived,
|
|
82
83
|
)
|
|
83
84
|
|
|
84
|
-
self._transport = SyncRouter(
|
|
85
|
+
self._transport = SyncRouter(
|
|
86
|
+
connect(resolved), region=region, connect=connect, credentials=credentials
|
|
87
|
+
)
|
|
85
88
|
|
|
86
89
|
self.machines = Machines(self._transport)
|
|
87
90
|
self.snapshots = Snapshots(self._transport)
|
|
@@ -143,16 +146,19 @@ class AsyncBoxd:
|
|
|
143
146
|
exchange_url=exchange_url_for(resolved or DEFAULT_BASE_URL),
|
|
144
147
|
)
|
|
145
148
|
|
|
146
|
-
def connect(url: str | None) -> AsyncTransport:
|
|
149
|
+
def connect(url: str | None, *, derived: bool = False) -> AsyncTransport:
|
|
147
150
|
# Every region's endpoint, and home's, share the one credential.
|
|
148
151
|
return AsyncTransport(
|
|
149
152
|
base_url=url,
|
|
150
153
|
credentials=credentials,
|
|
151
154
|
timeout=timeout,
|
|
152
155
|
max_retries=max_retries,
|
|
156
|
+
derived=derived,
|
|
153
157
|
)
|
|
154
158
|
|
|
155
|
-
self._transport = AsyncRouter(
|
|
159
|
+
self._transport = AsyncRouter(
|
|
160
|
+
connect(resolved), region=region, connect=connect, credentials=credentials
|
|
161
|
+
)
|
|
156
162
|
|
|
157
163
|
self.machines = AsyncMachines(self._transport)
|
|
158
164
|
self.snapshots = AsyncSnapshots(self._transport)
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
"""Credential resolution: explicit token, API
|
|
1
|
+
"""Credential resolution: explicit token, API key, or in-VM metadata.
|
|
2
2
|
|
|
3
|
-
The gRPC API
|
|
4
|
-
|
|
5
|
-
and
|
|
3
|
+
The gRPC API takes ``Authorization: Bearer <JWT>``, and a ``bxd_`` API key as
|
|
4
|
+
the bearer itself. A key goes as itself over TLS, or to a loopback address
|
|
5
|
+
(:meth:`_CredentialsBase.raw_key`); otherwise, and once a server refuses it as
|
|
6
|
+
one from before raw keys does (the transport's ``_refuses_raw_key``), it is
|
|
7
|
+
exchanged for a JWT that is kept fresh, as every client did before.
|
|
6
8
|
|
|
7
9
|
Resolution order, first match wins:
|
|
8
10
|
|
|
9
11
|
1. explicit ``token`` — used as-is, never refreshed
|
|
10
|
-
2. explicit ``api_key`` — exchanged for a JWT
|
|
12
|
+
2. explicit ``api_key`` — sent as itself, or exchanged for a JWT
|
|
11
13
|
3. ``BOXD_TOKEN``, then ``BOXD_API_KEY`` — same handling
|
|
12
14
|
4. in-VM metadata adapter — no credentials required
|
|
13
15
|
5. otherwise :class:`AuthenticationError` (reason ``"missing_credentials"``)
|
|
@@ -289,6 +291,24 @@ class _CredentialsBase:
|
|
|
289
291
|
self._expires_at: float = 0.0
|
|
290
292
|
# Base URL learned from the metadata adapter (in-VM mode only).
|
|
291
293
|
self.discovered_base_url: str | None = None
|
|
294
|
+
# A server refused the key itself as an older one does: exchange it
|
|
295
|
+
# from now on, for the life of the client, every endpoint included.
|
|
296
|
+
self._raw_key_refused = False
|
|
297
|
+
|
|
298
|
+
def raw_key(self, *, allowed: bool) -> str | None:
|
|
299
|
+
"""The API key, when a call should carry it as the bearer itself.
|
|
300
|
+
|
|
301
|
+
``allowed`` says the endpoint is reached over TLS or on a loopback
|
|
302
|
+
address. ``None`` means use :meth:`token` (a token, an in-VM
|
|
303
|
+
credential, or the session exchanged for the key).
|
|
304
|
+
"""
|
|
305
|
+
if self.mode != "exchange" or not allowed or self._raw_key_refused:
|
|
306
|
+
return None
|
|
307
|
+
return self._api_key
|
|
308
|
+
|
|
309
|
+
def raw_key_refused(self) -> None:
|
|
310
|
+
"""A server refused the key itself: exchange it from now on."""
|
|
311
|
+
self._raw_key_refused = True
|
|
292
312
|
|
|
293
313
|
@property
|
|
294
314
|
def mode(self) -> str:
|