diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 05c6d3ef5..27850e867 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -73,6 +73,7 @@ logger = logging.getLogger(__name__)
HTTP_STATUS_SUCCESS = '200 Success'
HTTP_STATUS_SERVER_ERROR = '500 Internal Server Error'
+HTTP_STATUS_SERVICE_UNAVAILABLE = "503 Service Unavailable"
_not_found_template = """
@@ -122,6 +123,18 @@ _unauthorized_template = """
"""
+_service_unavailable_template = """
+
+503 Service Unavailable
+
+
+Service Unavailable
+
+%(message)s
+
+
+"""
+
_success_template = """
200 Success
@@ -188,6 +201,20 @@ class HTTP_Status(plugable.Plugin):
output = _unauthorized_template % dict(message=escape(message))
return [output.encode('utf-8')]
+ def service_unavailable(self, environ, start_response, message):
+ """
+ Return a 503 Service Unavailable
+ """
+ status = HTTP_STATUS_SERVICE_UNAVAILABLE
+ response_headers = [('Content-Type', 'text/html; charset=utf-8')]
+
+ logger.error('%s: %s', status, message)
+
+ start_response(status, response_headers)
+ output = _service_unavailable_template % dict(message=escape(message))
+ return [output.encode('utf-8')]
+
+
def read_input(environ):
"""
Read the request body from environ['wsgi.input'].
@@ -858,6 +885,15 @@ class jsonserver_session(jsonserver, KerberosSession):
self.create_context(ccache=ccache_name)
except ACIError as e:
return self.unauthorized(environ, start_response, str(e), 'denied')
+ except errors.DatabaseError as e:
+ # account is disable but user has a valid ticket
+ msg = str(e)
+ if "account inactivated" in msg.lower():
+ return self.unauthorized(
+ environ, start_response, str(e), "account disabled"
+ )
+ else:
+ return self.service_unavailable(environ, start_response, msg)
try:
response = super(jsonserver_session, self).__call__(environ, start_response)