Merge branch 'main' into Release-8.0.0

Author: AdamL-Microsoft

src/ApiService/IntegrationTests/IntegrationTests.csproj

@@ -8,8 +8,8 @@
     <PackageReference Include="FluentAssertions" Version="6.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/ApiService/IntegrationTests/packages.lock.json

@@ -39,20 +39,20 @@
       },
       "xunit": {
         "type": "Direct",
-        "requested": "[2.4.1, )",
-        "resolved": "2.4.1",
-        "contentHash": "XNR3Yz9QTtec16O0aKcO6+baVNpXmOnPUxDkCY97J+8krUYxPvXT1szYYEUdKk4sB8GOI2YbAjRIOm8ZnXRfzQ==",
+        "requested": "[2.4.2, )",
+        "resolved": "2.4.2",
+        "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==",
         "dependencies": {
-          "xunit.analyzers": "0.10.0",
-          "xunit.assert": "[2.4.1]",
-          "xunit.core": "[2.4.1]"
+          "xunit.analyzers": "1.0.0",
+          "xunit.assert": "2.4.2",
+          "xunit.core": "[2.4.2]"
         }
       },
       "xunit.runner.visualstudio": {
         "type": "Direct",
-        "requested": "[2.4.3, )",
-        "resolved": "2.4.3",
-        "contentHash": "kZZSmOmKA8OBlAJaquPXnJJLM9RwQ27H7BMVqfMLUcTi9xHinWGJiWksa3D4NEtz0wZ/nxd2mogObvBgJKCRhQ=="
+        "requested": "[2.4.5, )",
+        "resolved": "2.4.5",
+        "contentHash": "OwHamvBdUKgqsXfBzWiCW/O98BTx81UKzx2bieIOQI7CZFE5NEQZGi8PBQGIKawDW96xeRffiNf20SjfC0x9hw=="
       },
       "Azure.Core": {
         "type": "Transitive",
@@ -2441,42 +2441,42 @@
       },
       "xunit.analyzers": {
         "type": "Transitive",
-        "resolved": "0.10.0",
-        "contentHash": "4/IDFCJfIeg6bix9apmUtIMwvOsiwqdEexeO/R2D4GReIGPLIRODTpId/l4LRSrAJk9lEO3Zx1H0Zx6uohJDNg=="
+        "resolved": "1.0.0",
+        "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ=="
       },
       "xunit.assert": {
         "type": "Transitive",
-        "resolved": "2.4.1",
-        "contentHash": "O/Oe0BS5RmSsM+LQOb041TzuPo5MdH2Rov+qXGS37X+KFG1Hxz7kopYklM5+1Y+tRGeXrOx5+Xne1RuqLFQoyQ==",
+        "resolved": "2.4.2",
+        "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==",
         "dependencies": {
           "NETStandard.Library": "1.6.1"
         }
       },
       "xunit.core": {
         "type": "Transitive",
-        "resolved": "2.4.1",
-        "contentHash": "Zsj5OMU6JasNGERXZy8s72+pcheG6Q15atS5XpZXqAtULuyQiQ6XNnUsp1gyfC6WgqScqMvySiEHmHcOG6Eg0Q==",
+        "resolved": "2.4.2",
+        "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==",
         "dependencies": {
-          "xunit.extensibility.core": "[2.4.1]",
-          "xunit.extensibility.execution": "[2.4.1]"
+          "xunit.extensibility.core": "[2.4.2]",
+          "xunit.extensibility.execution": "[2.4.2]"
         }
       },
       "xunit.extensibility.core": {
         "type": "Transitive",
-        "resolved": "2.4.1",
-        "contentHash": "yKZKm/8QNZnBnGZFD9SewkllHBiK0DThybQD/G4PiAmQjKtEZyHi6ET70QPU9KtSMJGRYS6Syk7EyR2EVDU4Kg==",
+        "resolved": "2.4.2",
+        "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==",
         "dependencies": {
           "NETStandard.Library": "1.6.1",
           "xunit.abstractions": "2.0.3"
         }
       },
       "xunit.extensibility.execution": {
         "type": "Transitive",
-        "resolved": "2.4.1",
-        "contentHash": "7e/1jqBpcb7frLkB6XDrHCGXAbKN4Rtdb88epYxCSRQuZDRW8UtTfdTEVpdTl8s4T56e07hOBVd4G0OdCxIY2A==",
+        "resolved": "2.4.2",
+        "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==",
         "dependencies": {
           "NETStandard.Library": "1.6.1",
-          "xunit.extensibility.core": "[2.4.1]"
+          "xunit.extensibility.core": "[2.4.2]"
         }
       },
       "apiservice": {

src/agent/Cargo.lock

@@ -12,8 +12,6 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
     o = Onefuzz()
     o.config(
         endpoint=os.environ.get("ONEFUZZ_ENDPOINT"),
-        override_authority=os.environ.get("ONEFUZZ_AUTHORITY"),
-        client_id=os.environ.get("ONEFUZZ_CLIENT_ID"),
     )
     info = o.info.get()
     return func.HttpResponse(info.json())

src/cli/examples/azure-functions-example/info/__init__.py

@@ -40,11 +40,7 @@
 
 UUID_EXPANSION = TypeVar("UUID_EXPANSION", UUID, str)
 
-DEFAULT = BackendConfig(
-    authority="",
-    client_id="",
-    tenant_domain="",
-)
+DEFAULT = BackendConfig(endpoint="")
 
 # This was generated randomly and should be preserved moving forwards
 ONEFUZZ_GUID_NAMESPACE = uuid.UUID("27f25e3f-6544-4b69-b309-9b096c5a9cbc")
@@ -1310,7 +1306,7 @@ def get_config(self, pool_name: primitives.PoolName) -> models.AgentConfig:
             raise Exception("Missing AgentConfig in response")
 
         config = pool.config
-        if not pool.managed:
+        if not pool.managed and self.onefuzz._backend.config.authority:
             config.client_credentials = models.ClientCredentials(  # nosec
                 client_id=uuid.UUID(int=0),
                 client_secret="<client_secret>",
@@ -1894,19 +1890,14 @@ def login(self) -> str:
     def config(
         self,
         endpoint: Optional[str] = None,
-        override_authority: Optional[str] = None,
-        client_id: Optional[str] = None,
-        override_tenant_domain: Optional[str] = None,
         enable_feature: Optional[PreviewFeature] = None,
         reset: Optional[bool] = None,
     ) -> BackendConfig:
         """Configure onefuzz CLI"""
         self.logger.debug("set config")
 
         if reset:
-            self._backend.config = BackendConfig(
-                authority="", client_id="", tenant_domain=""
-            )
+            self._backend.config = BackendConfig(endpoint="")
 
         if endpoint is not None:
             # The normal path for calling the API always uses the oauth2 workflow,
@@ -1922,17 +1913,12 @@ def config(
                     "Missing HTTP Authentication"
                 )
             self._backend.config.endpoint = endpoint
-        if client_id is not None:
-            self._backend.config.client_id = client_id
-        if override_authority is not None:
-            self._backend.config.authority = override_authority
+
         if enable_feature:
             self._backend.enable_feature(enable_feature.name)
-        if override_tenant_domain is not None:
-            self._backend.config.tenant_domain = override_tenant_domain
+
         self._backend.app = None
         self._backend.save_config()
-
         data = self._backend.config.copy(deep=True)
 
         if not data.endpoint:

src/cli/onefuzz/api.py

@@ -12,7 +12,6 @@
 import tempfile
 import time
 from dataclasses import asdict, is_dataclass
-from datetime import datetime, timedelta
 from enum import Enum
 from typing import (
     Any,
@@ -33,7 +32,7 @@
 import requests
 from azure.storage.blob import ContainerClient
 from onefuzztypes import responses
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 from requests import Response
 from tenacity import RetryCallState, retry
 from tenacity.retry import retry_if_exception_type
@@ -93,20 +92,26 @@ def check_application_error(response: requests.Response) -> None:
 
 
 class BackendConfig(BaseModel):
-    authority: str
-    client_id: str
-    endpoint: Optional[str]
-    features: Set[str] = Field(default_factory=set)
-    tenant_domain: str
-    expires_on: datetime = datetime.utcnow() + timedelta(hours=24)
+    authority: Optional[str]
+    client_id: Optional[str]
+    endpoint: str
+    features: Optional[Set[str]]
+    tenant_domain: Optional[str]
 
     def get_multi_tenant_domain(self) -> Optional[str]:
-        if "https://login.microsoftonline.com/common" in self.authority:
+        if (
+            self.authority
+            and "https://login.microsoftonline.com/common" in self.authority
+        ):
             return self.tenant_domain
         else:
             return None
 
 
+class CacheConfig(BaseModel):
+    endpoint: Optional[str]
+
+
 class Backend:
     def __init__(
         self,
@@ -129,10 +134,14 @@ def __init__(
         atexit.register(self.save_cache)
 
     def enable_feature(self, name: str) -> None:
+        if not self.config.features:
+            self.config.features = Set[str]()
         self.config.features.add(name)
 
     def is_feature_enabled(self, name: str) -> bool:
-        return name in self.config.features
+        if self.config.features:
+            return name in self.config.features
+        return False
 
     def load_config(self) -> None:
         if os.path.exists(self.config_path):
@@ -143,7 +152,8 @@ def load_config(self) -> None:
     def save_config(self) -> None:
         os.makedirs(os.path.dirname(self.config_path), exist_ok=True)
         with open(self.config_path, "w") as handle:
-            handle.write(self.config.json(indent=4, exclude_none=True))
+            endpoint_cache = {"endpoint": f"{self.config.endpoint}"}
+            handle.write(json.dumps(endpoint_cache, indent=4, sort_keys=True))
 
     def init_cache(self) -> None:
         # Ensure the token_path directory exists
@@ -331,15 +341,13 @@ def config_params(
         endpoint_params = responses.Config.parse_obj(response.json())
 
         # Will override values in storage w/ provided values for SP use
-        if self.config.client_id == "":
+        if not self.config.client_id:
             self.config.client_id = endpoint_params.client_id
-        if self.config.authority == "":
+        if not self.config.authority:
             self.config.authority = endpoint_params.authority
-        if self.config.tenant_domain == "":
+        if not self.config.tenant_domain:
             self.config.tenant_domain = endpoint_params.tenant_domain
 
-        self.save_config()
-
     def request(
         self,
         method: str,
@@ -353,17 +361,9 @@ def request(
         if not endpoint:
             raise Exception("endpoint not configured")
 
-        # If file expires, remove and force user to reset
-        if datetime.utcnow() > self.config.expires_on:
-            os.remove(self.config_path)
-            self.config = BackendConfig(
-                endpoint=endpoint, authority="", client_id="", tenant_domain=""
-            )
-
         url = endpoint + "/api/" + path
-
-        if self.config.client_id == "" or (
-            self.config.authority == "" and self.config.tenant_domain == ""
+        if not self.config.client_id or (
+            not self.config.authority and not self.config.tenant_domain
         ):
             self.config_params()
         headers = self.headers()