PYTHON-5260 Clean up OCSP Server (#642)

Author: blink1073

.evergreen/ocsp/mock_ocsp_responder.py

@@ -634,6 +634,7 @@ def init(port=8080, debug=False, host=None):
 
 @app.route("/", methods=["GET"])
 def _handle_root():
+    logger.debug("Handled root get")
     return "ocsp-responder"
 
 
@@ -645,10 +646,14 @@ def _handle_get(u_path):
     An OCSP GET request contains the DER-in-base64 encoded OCSP request in the
     HTTP request URL.
     """
+    logger.debug("Handling get %s...", u_path)
     if "Host" not in request.headers:
-        raise ValueError("Required 'Host' header not present")
+        message = "Required 'Host' header not present"
+        logger.error(message)
+        raise ValueError(message)
     der = base64.b64decode(u_path)
     ocsp_request = responder.parse_ocsp_request(der)
+    logger.debug("Handling get %s... done.", u_path)
     return responder.build_http_response(ocsp_request)
 
 
@@ -659,7 +664,11 @@ def _handle_post():
     An OCSP POST request contains the DER encoded OCSP request in the HTTP
     request body.
     """
+    logger.debug("Handling post to /status...")
     if "Host" not in request.headers:
-        raise ValueError("Required 'Host' header not present")
+        message = "Required 'Host' header not present"
+        logger.error(message)
+        raise ValueError(message)
     ocsp_request = responder.parse_ocsp_request(request.data)
+    logger.debug("Handling post to /status... done.")
     return responder.build_http_response(ocsp_request)

.evergreen/ocsp/ocsp_mock.py

@@ -65,10 +65,10 @@ def main():
     )
 
     args = parser.parse_args()
-    if args.verbose:
-        logging.basicConfig(level=logging.DEBUG)
+    level = logging.DEBUG if args.verbose else logging.INFO
+    logging.basicConfig(level=level, format="%(asctime)s %(levelname)-8s %(message)s")
 
-    print("Initializing OCSP Responder")
+    mock_ocsp_responder.logger.info("Initializing OCSP Responder")
     mock_ocsp_responder.init_responder(
         issuer_cert=args.ca_file,
         responder_cert=args.ocsp_responder_cert,
@@ -78,6 +78,7 @@ def main():
     )
 
     serve(mock_ocsp_responder.app, host=args.bind_ip, port=args.port)
+    mock_ocsp_responder.logger.info("Shutting down OCSP Responder")
 
 
 if __name__ == "__main__":

.evergreen/ocsp/setup.sh

@@ -25,7 +25,8 @@ bash teardown.sh
 echo "Starting OCSP server ${OCSP_ALGORITHM}-${SERVER_TYPE}..."
 
 CA_FILE="${OCSP_ALGORITHM}/ca.pem"
-ARGS="-p 8100 -v"
+PORT=8100
+ARGS="-p $PORT -v"
 
 case $SERVER_TYPE in
   valid)
@@ -67,7 +68,22 @@ $COMMAND ocsp_mock.py \
   $ARGS > ocsp_mock_server.log 2>&1 &
 echo "$!" > ocsp.pid
 
-sleep 1
+await_server() {
+    echo "Waiting on $1 server on port $2"
+    for _ in $(seq 10); do
+        # Exit code 7: "Failed to connect to host".
+        if curl -s "localhost:$2"; test $? -ne 7; then
+            echo "Waiting on $1 server on port $2...done"
+            return 0
+        else
+            echo "Could not connect, sleeping."
+            sleep 2
+        fi
+    done
+    echo "Could not detect '$1' server on port $2"
+    exit 1
+}
+await_server ocsp_mock.py $PORT
 cat ocsp_mock_server.log
 
 echo "Starting OCSP server ${OCSP_ALGORITHM}-${SERVER_TYPE}... done."