ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-16 20:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't retry on service-level errors (#1129)

Browse Source
This commit is contained in:
bmc-msft
2021-08-11 11:34:54 -04:00
committed by GitHub
parent 36292ca385
commit d2332b8519
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/cli/onefuzz/backend.py
View File

@ -60,6 +60,31 @@ def _temporary_umask(new_umask: int) -> Generator[None, None, None]:
os.umask(prev_umask) os.umask(prev_umask)
def check_msal_error(value: Dict[str, Any], expected: List[str]) -> None:
if "error" in value:
if "error_description" in value:
raise Exception(
"error: %s\n%s" % (value["error"], value["error_description"])
)
raise Exception("error: %s" % (value["error"]))
for entry in expected:
if entry not in value:
raise Exception("interactive login missing value: %s - %s" % (entry, value))
def check_application_error(response: requests.Response) -> None:
if response.status_code == 401:
try:
as_json = json.loads(response.content)
if isinstance(as_json, dict) and "code" in as_json and "errors" in as_json:
raise Exception(
f"request failed: application error - {as_json['code']} {as_json['errors']}"
)
except json.decoder.JSONDecodeError:
pass
class BackendConfig(BaseModel): class BackendConfig(BaseModel):
authority: str authority: str
client_id: str client_id: str
@ -191,20 +216,6 @@ class Backend:
if access_token: if access_token:
return access_token return access_token
def check_msal_error(value: Dict[str, Any], expected: List[str]) -> None:
if "error" in value:
if "error_description" in value:
raise Exception(
"error: %s\n%s" % (value["error"], value["error_description"])
)
raise Exception("error: %s" % (value["error"]))
for entry in expected:
if entry not in value:
raise Exception(
"interactive login missing value: %s - %s" % (entry, value)
)
LOGGER.info("Attempting interactive device login") LOGGER.info("Attempting interactive device login")
print("Please login", flush=True) print("Please login", flush=True)
@ -260,6 +271,8 @@ class Backend:
if response.status_code not in retry_codes: if response.status_code not in retry_codes:
break break
check_application_error(response)
LOGGER.info("request bad status code: %s", response.status_code) LOGGER.info("request bad status code: %s", response.status_code)
except requests.exceptions.ConnectionError as err: except requests.exceptions.ConnectionError as err:
LOGGER.info("request connection error: %s", err) LOGGER.info("request connection error: %s", err)