Update pub/sub - appengine push request sample (GoogleCloudPlatform#10747)

jwdjj · jessiccaa · web-flow · commit a44aa59d5815 · 2023-11-20T12:56:55.000-08:00
* Modify sample for app engine - pub/sub push message

* Modify sample for app engine - pub/sub push message

* Update main.py

Change regional tag - per prefix naming convention

* Fix linting error

---------

Co-authored-by: Jessica &lt;jesssica@google.com&gt;
diff --git a/appengine/standard_python3/pubsub/main.py b/appengine/standard_python3/pubsub/main.py
@@ -64,7 +64,6 @@ def index():
 
 
 # [START gae_standard_pubsub_auth_push]
-# [START push]
 @app.route("/push-handlers/receive_messages", methods=["POST"])
 def receive_messages_handler():
     # Verify that the request originates from the application.
@@ -107,9 +106,23 @@ def receive_messages_handler():
     return "OK", 200
 
 
-# [END push]
 # [END gae_standard_pubsub_auth_push]
 
+# [START gae_standard_pubsub_push]
+@app.route("/pubsub/push", methods=["POST"])
+def receive_pubsub_messages_handler():
+    # Verify that the request originates from the application.
+    if request.args.get("token", "") != current_app.config["PUBSUB_VERIFICATION_TOKEN"]:
+        return "Invalid request", 400
+
+    envelope = json.loads(request.data.decode("utf-8"))
+    payload = base64.b64decode(envelope["message"]["data"])
+    MESSAGES.append(payload)
+    # Returning any 2xx status indicates successful receipt of the message.
+    return "OK", 200
+
+# [END gae_standard_pubsub_push]
+
 
 @app.errorhandler(500)
 def server_error(e):
diff --git a/appengine/standard_python3/pubsub/main_test.py b/appengine/standard_python3/pubsub/main_test.py
@@ -100,6 +100,27 @@ def test_push_endpoint(monkeypatch, client, fake_token):
     )
     assert r.status_code == 200
 
+    # Push request without JWT token validation
+    url = (
+        "/pubsub/push?token="
+        + os.environ["PUBSUB_VERIFICATION_TOKEN"]
+    )
+
+    r = client.post(
+        url,
+        data=json.dumps(
+            {
+                "message": {
+                    "data": base64.b64encode("Test message".encode("utf-8")).decode(
+                        "utf-8"
+                    )
+                }
+            }
+        ),
+    )
+
+    assert r.status_code == 200
+
     # Make sure the message is visible on the home page.
     r = client.get("/")
     assert r.status_code == 200
@@ -114,3 +135,11 @@ def test_push_endpoint_errors(client):
     # invalid token
     r = client.post("/push-handlers/receive_messages?token=bad")
     assert r.status_code == 400
+
+    # no token
+    r = client.post("/pubsub/push")
+    assert r.status_code == 400
+
+    # invalid token
+    r = client.post("/pubsub/push?token=bad")
+    assert r.status_code == 400
