From 50c2efbce397a9806b8a8e3c3d333c3294ac7b99 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Tue, 22 Feb 2022 11:23:46 -0500 Subject: [PATCH] use symbolic constants for http status codes --- src/_zkapauthorizer/resource.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/_zkapauthorizer/resource.py b/src/_zkapauthorizer/resource.py index 4b882e5..de0e612 100644 --- a/src/_zkapauthorizer/resource.py +++ b/src/_zkapauthorizer/resource.py @@ -27,7 +27,7 @@ from typing import Callable from twisted.internet.defer import Deferred from attr import Factory, define, field from twisted.logger import Logger -from twisted.web.http import BAD_REQUEST +from twisted.web.http import ACCEPTED, BAD_REQUEST, CONFLICT, INTERNAL_SERVER_ERROR from twisted.web.resource import ErrorPage, IResource, NoResource, Resource from twisted.web.server import NOT_DONE_YET from zope.interface import Attribute @@ -188,21 +188,21 @@ class RecoverResource(Resource): try: body = loads(request.content.read()) except: - request.setResponseCode(400) + request.setResponseCode(BAD_REQUEST) return b"could not parse json" if body.keys() != {"recovery-capability"}: - request.setResponseCode(400) + request.setResponseCode(BAD_REQUEST) return b"json did not have expected properties" cap_str = body["recovery-capability"] if not isinstance(cap_str, str): - request.setResponseCode(400) + request.setResponseCode(BAD_REQUEST) return b"recovery-capability must be a read-only dircap string" cap = from_string(cap_str) if not isinstance(cap, ReadonlyDirectoryURI): - request.setResponseCode(400) + request.setResponseCode(BAD_REQUEST) return b"recovery-capability must be a read-only dircap string" try: @@ -213,14 +213,14 @@ class RecoverResource(Resource): ), ) except NotEmpty: - request.setResponseCode(409) + request.setResponseCode(CONFLICT) return b"there is existing local state" except: self._log.error("recovery failed") - request.setResponseCode(500) + request.setResponseCode(INTERNAL_SERVER_ERROR) return b"" - request.setResponseCode(202) + request.setResponseCode(ACCEPTED) return b"" -- GitLab