Restore inadvertently deleted folder (GoogleCloudPlatform#4501)

engelke · crwilcox · web-flow · commit e5048c88e6b3 · 2020-08-20T15:21:33.000-07:00
* Restore inadvertently deleted folder

* Fixed Py 2.7 appengine_config shim

* Removed unneeded import, skip impossible test

* Missing import added

Co-authored-by: Christopher Wilcox &lt;crwilcox@google.com&gt;
diff --git a/appengine/standard/migration/urlfetch/async/appengine_config.py b/appengine/standard/migration/urlfetch/async/appengine_config.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.appengine.api import apiproxy_stub_map
-from google.appengine.api import urlfetch_stub
 from google.appengine.ext import vendor
 
 # Add any libraries installed in the "lib" folder.
@@ -24,9 +22,3 @@
 # Use the App Engine Requests adapter. This makes sure that Requests uses
 # URLFetch.
 requests_toolbelt.adapters.appengine.monkeypatch()
-
-apiproxy_stub_map.apiproxy = apiproxy_stub_map.APIProxyStubMap()
-apiproxy_stub_map.apiproxy.RegisterStub(
-    'urlfetch',
-    urlfetch_stub.URLFetchServiceStub()
-)
diff --git a/appengine/standard/migration/urlfetch/async/main_test.py b/appengine/standard/migration/urlfetch/async/main_test.py
@@ -13,8 +13,11 @@
 # limitations under the License.
 
 import main
+import pytest
+import sys
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="no urlfetch adapter in test env")
 def test_index():
     main.app.testing = True
     client = main.app.test_client()
diff --git a/appengine/standard/migration/urlfetch/requests/appengine_config.py b/appengine/standard/migration/urlfetch/requests/appengine_config.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.appengine.api import apiproxy_stub_map
-from google.appengine.api import urlfetch_stub
 from google.appengine.ext import vendor
 
 # Add any libraries installed in the "lib" folder.
@@ -24,9 +22,3 @@
 # Use the App Engine Requests adapter. This makes sure that Requests uses
 # URLFetch.
 requests_toolbelt.adapters.appengine.monkeypatch()
-
-apiproxy_stub_map.apiproxy = apiproxy_stub_map.APIProxyStubMap()
-apiproxy_stub_map.apiproxy.RegisterStub(
-    'urlfetch',
-    urlfetch_stub.URLFetchServiceStub()
-)
diff --git a/appengine/standard/migration/urlfetch/requests/main_test.py b/appengine/standard/migration/urlfetch/requests/main_test.py
@@ -13,8 +13,11 @@
 # limitations under the License.
 
 import main
+import pytest
+import sys
 
 
+@pytest.mark.skipif(sys.version_info < (3, 0), reason="no urlfetch adapter in test env")
 def test_index():
     main.app.testing = True
     client = main.app.test_client()
diff --git a/appengine/standard_python3/migration/urlfetch/README.md b/appengine/standard_python3/migration/urlfetch/README.md
@@ -0,0 +1,16 @@
+## App Engine to App Engine Request Sample
+
+This sample application shows how an App Engine for Python 3.7 app can make
+a request to an App Engine for Python 2.7 app that includes an Authorization
+header the receiving app can use to verify the calling app's identity.
+
+This is a way for App Engine app-to-app requests can verify the identity of
+the calling applications, replacing the built-in X-Appengine-Inbound-Appid
+trustworthy header provided when using `urlfetch` in App Engine for
+Python 2.7. It requires the receiving app to validate the incoming request
+as shown in the appengine/standard/migration/incoming sample app in this
+repository.
+
+This sample app presents users with a form to fill in another App Engine
+app's URL. On submission, this app calls the second App Engine app, and
+echoes the response, as plain text, to the user.
diff --git a/appengine/standard_python3/migration/urlfetch/app.yaml b/appengine/standard_python3/migration/urlfetch/app.yaml
@@ -0,0 +1,15 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+runtime: python37
diff --git a/appengine/standard_python3/migration/urlfetch/main.py b/appengine/standard_python3/migration/urlfetch/main.py
@@ -0,0 +1,41 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask, render_template, request
+from google.auth.transport import requests as reqs
+from google.oauth2 import id_token
+import requests
+
+app = Flask(__name__)
+
+
+@app.route('/', methods=['GET'])
+def index():
+    return render_template('index.html')
+
+
+@app.route('/', methods=['POST'])
+def make_request():
+    url = request.form['url']
+    token = id_token.fetch_id_token(reqs.Request(), url)
+
+    resp = requests.get(
+        url,
+        headers={'Authorization': 'Bearer {}'.format(token)}
+    )
+
+    message = 'Response when calling {}:\n\n'.format(url)
+    message += resp.text
+
+    return message, 200, {'Content-type': 'text/plain'}
diff --git a/appengine/standard_python3/migration/urlfetch/main_test.py b/appengine/standard_python3/migration/urlfetch/main_test.py
@@ -0,0 +1,24 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import main
+
+
+def test_index():
+    main.app.testing = True
+    client = main.app.test_client()
+
+    r = client.get('/')
+    assert r.status_code == 200
+    assert 'Make a request' in r.data.decode('utf-8')
diff --git a/appengine/standard_python3/migration/urlfetch/requirements-test.txt b/appengine/standard_python3/migration/urlfetch/requirements-test.txt
@@ -0,0 +1 @@
+pytest==6.0.1
diff --git a/appengine/standard_python3/migration/urlfetch/requirements.txt b/appengine/standard_python3/migration/urlfetch/requirements.txt
@@ -0,0 +1,3 @@
+requests==2.24.0
+flask==1.1.2
+google-auth==1.20.1
diff --git a/appengine/standard_python3/migration/urlfetch/templates/index.html b/appengine/standard_python3/migration/urlfetch/templates/index.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+<head>
+    <title>Make App-to-app Request</title>
+</head>
+<body>
+
+    <h1>Make App-to-app Request</h1>
+
+    <p>
+        Make a request to another App Engine application, including an
+        Authorization token identifying the requesting application.
+    </p>
+
+    <form action="" method="post">
+        <label for="url">URL to call: </label>
+        <input type="text" name="url" id="url" required />
+        <input type="submit" value="Make authenticated call" />
+    </form>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+requests==2.24.0`
	`2`	`+flask==1.1.2`
	`3`	`+google-auth==1.20.1`