From 25d1e1059e6ad28050147dc2257e6a12846396a9 Mon Sep 17 00:00:00 2001
From: Bert Blommers <info@bertblommers.nl>
Date: Wed, 22 Apr 2020 14:07:19 +0100
Subject: [PATCH] STS - Only check request-body of eligible requests for
 Actions

---
 moto/server.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/moto/server.py b/moto/server.py
index 7987a629d..498f6c504 100644
--- a/moto/server.py
+++ b/moto/server.py
@@ -139,12 +139,16 @@ class DomainDispatcherApplication(object):
     def get_action_from_body(self, environ):
         body = None
         try:
-            request_body_size = int(environ.get("CONTENT_LENGTH", 0))
-            if "wsgi.input" in environ:
+            # AWS requests use querystrings as the body (Action=x&Data=y&...)
+            simple_form = environ["CONTENT_TYPE"].startswith(
+                "application/x-www-form-urlencoded"
+            )
+            request_body_size = int(environ["CONTENT_LENGTH"])
+            if simple_form and request_body_size:
                 body = environ["wsgi.input"].read(request_body_size).decode("utf-8")
-                body_dict = dict(x.split("=") for x in str(body).split("&"))
+                body_dict = dict(x.split("=") for x in body.split("&"))
                 return body_dict["Action"]
-        except ValueError:
+        except (KeyError, ValueError):
             pass
         finally:
             if body: