Using google-auth library (GoogleCloudPlatform#4413)

dinagraves · web-flow · commit 2024091c39da · 2020-07-31T15:54:34.000-07:00
* Using google-auth library

* Fixing linting
diff --git a/run/markdown-preview/editor/render.py b/run/markdown-preview/editor/render.py
@@ -14,9 +14,11 @@
 
 # [START run_secure_request]
 import os
-import sys
 import urllib
 
+import google.auth.transport.requests
+import google.oauth2.id_token
+
 
 def new_request(data):
     """
@@ -33,28 +35,15 @@ def new_request(data):
 
     req = urllib.request.Request(url, data=data.encode())
 
+    credentials, project = google.auth.default()
+
     if not unauthenticated:
-        token = get_token(url)
-        req.add_header("Authorization", f"Bearer {token}")
+        auth_req = google.auth.transport.requests.Request()
+        target_audience = url
 
-    sys.stdout.flush()
+        id_token = google.oauth2.id_token.fetch_id_token(auth_req, target_audience)
+        req.add_header("Authorization", f"Bearer {id_token}")
 
     response = urllib.request.urlopen(req)
     return response.read()
-
-
-def get_token(url):
-    """
-    Retrieves the IAM ID Token credential for the url.
-    """
-    token_url = (
-        f"http://metadata.google.internal/computeMetadata/v1/instance/"
-        f"service-accounts/default/identity?audience={url}"
-    )
-    token_req = urllib.request.Request(
-        token_url, headers={"Metadata-Flavor": "Google"}
-    )
-    token_response = urllib.request.urlopen(token_req)
-    token = token_response.read()
-    return token.decode()
 # [END run_secure_request]
diff --git a/run/markdown-preview/editor/requirements.txt b/run/markdown-preview/editor/requirements.txt
@@ -1,2 +1,4 @@
 Flask==1.1.1
-gunicorn==20.0.4
+gunicorn==20.0.4
+google-auth==1.20.0
+requests==2.24.0
