From 8d133db58e2050796140bfc51594a792b3f9115b Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 5 Jan 2016 13:11:46 -0800 Subject: [PATCH 1/3] Add App Identity example to assert identity to Google APIs. This sample is copied almost exactly from https://cloud.google.com/appengine/docs/java/appidentity/#asserting_identity_to_google_apis I also add a servlet for the sample code so that it can be more easily demonstrated and manually tested. --- appengine/appidentity/pom.xml | 10 +++ .../appengine/appidentity/UrlShortener.java | 78 +++++++++++++++++++ .../appidentity/UrlShortenerServlet.java | 73 +++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 8 ++ 4 files changed, 169 insertions(+) create mode 100644 appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java create mode 100644 appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml index 27559481a88..c0012f2c939 100644 --- a/appengine/appidentity/pom.xml +++ b/appengine/appidentity/pom.xml @@ -33,6 +33,11 @@ Copyright 2015 Google Inc. All Rights Reserved. appengine-api-1.0-sdk ${appengine.target.version} + + com.google.guava + guava + 19.0 + javax.servlet servlet-api @@ -40,6 +45,11 @@ Copyright 2015 Google Inc. All Rights Reserved. jar provided + + org.json + json + 20151123 + diff --git a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java new file mode 100644 index 00000000000..a15632a056e --- /dev/null +++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java @@ -0,0 +1,78 @@ +/** + * Copyright 2016 Google Inc. All Rights Reserved. + * + * 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. + */ +package com.example.appengine.appidentity; + +import com.google.appengine.api.appidentity.AppIdentityService; +import com.google.appengine.api.appidentity.AppIdentityServiceFactory; +import com.google.common.io.CharStreams; +import org.json.JSONObject; +import org.json.JSONTokener; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; + +@SuppressWarnings("serial") +class UrlShortener { + // [START asserting_identity_to_Google_APIs] + public String createShortUrl(String longUrl) throws Exception { + try { + ArrayList scopes = new ArrayList(); + scopes.add("https://www.googleapis.com/auth/urlshortener"); + AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService(); + AppIdentityService.GetAccessTokenResult accessToken = appIdentity.getAccessToken(scopes); + // The token asserts the identity reported by appIdentity.getServiceAccountName() + JSONObject request = new JSONObject(); + request.put("longUrl", longUrl); + + URL url = new URL("https://www.googleapis.com/urlshortener/v1/url?pp=1"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.addRequestProperty("Content-Type", "application/json"); + connection.addRequestProperty("Authorization", "Bearer " + accessToken.getAccessToken()); + + OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream()); + request.write(writer); + writer.close(); + + if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { + // Note: Should check the content-encoding. + // Any JSON parser can be used; this one is used for illustrative purposes. + JSONTokener response_tokens = new JSONTokener(connection.getInputStream()); + JSONObject response = new JSONObject(response_tokens); + return (String) response.get("id"); + } else { + try (InputStream s = connection.getErrorStream(); + InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8)) { + throw new RuntimeException(String.format( + "got error (%d) response %s from %s", + connection.getResponseCode(), + CharStreams.toString(r), + connection.toString())); + } + } + } catch (Exception e) { + // Error handling elided. + throw e; + } + } + // [END asserting_identity_to_Google_APIs] +} diff --git a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java new file mode 100644 index 00000000000..301ae8a3e61 --- /dev/null +++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java @@ -0,0 +1,73 @@ +/** + * Copyright 2016 Google Inc. All Rights Reserved. + * + * 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. + */ +package com.example.appengine.appidentity; + +import com.google.appengine.api.users.UserService; +import com.google.appengine.api.users.UserServiceFactory; + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URLDecoder; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@SuppressWarnings("serial") +public class UrlShortenerServlet extends HttpServlet { + private final UrlShortener shortener; + + public UrlShortenerServlet() { + shortener = new UrlShortener(); + } + + @Override + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { + PrintWriter w = resp.getWriter(); + w.println(""); + w.println("
"); + w.println(""); + w.println(""); + w.println(""); + w.println("
"); + } + + @Override + public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { + resp.setContentType("text/plain"); + String longUrl = req.getParameter("longUrl"); + if (longUrl == null) { + resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "missing longUrl parameter"); + return; + } + + String shortUrl; + PrintWriter w = resp.getWriter(); + try { + shortUrl = shortener.createShortUrl(longUrl); + } catch (Exception e) { + resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + w.println("error shortening URL: " + longUrl); + e.printStackTrace(w); + return; + } + + w.print("long URL: "); + w.println(longUrl); + w.print("short URL: "); + w.println(shortUrl); + } +} diff --git a/appengine/appidentity/src/main/webapp/WEB-INF/web.xml b/appengine/appidentity/src/main/webapp/WEB-INF/web.xml index 09472a93622..3ebbce0e290 100644 --- a/appengine/appidentity/src/main/webapp/WEB-INF/web.xml +++ b/appengine/appidentity/src/main/webapp/WEB-INF/web.xml @@ -7,8 +7,16 @@ appidentity com.example.appengine.appidentity.IdentityServlet + + urlshortener + com.example.appengine.appidentity.UrlShortenerServlet + appidentity / + + urlshortener + /shorten + From d289deb55ee53f54b2c12c0f5ca93d05d539932a Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Wed, 6 Jan 2016 15:23:57 -0800 Subject: [PATCH 2/3] Removed pointless try/catch from App Identity sample. Also, fixes typo (two spaces by Bearer). --- .../appengine/appidentity/UrlShortener.java | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java index a15632a056e..cecebe82d6a 100644 --- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java +++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java @@ -18,6 +18,7 @@ import com.google.appengine.api.appidentity.AppIdentityService; import com.google.appengine.api.appidentity.AppIdentityServiceFactory; import com.google.common.io.CharStreams; + import org.json.JSONObject; import org.json.JSONTokener; @@ -32,46 +33,46 @@ @SuppressWarnings("serial") class UrlShortener { // [START asserting_identity_to_Google_APIs] + /** + * Returns a shortened URL by calling the Google URL Shortener API. + * + *

Note: Error handling elided for simplicity. + */ public String createShortUrl(String longUrl) throws Exception { - try { - ArrayList scopes = new ArrayList(); - scopes.add("https://www.googleapis.com/auth/urlshortener"); - AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService(); - AppIdentityService.GetAccessTokenResult accessToken = appIdentity.getAccessToken(scopes); - // The token asserts the identity reported by appIdentity.getServiceAccountName() - JSONObject request = new JSONObject(); - request.put("longUrl", longUrl); + ArrayList scopes = new ArrayList(); + scopes.add("https://www.googleapis.com/auth/urlshortener"); + AppIdentityService appIdentity = AppIdentityServiceFactory.getAppIdentityService(); + AppIdentityService.GetAccessTokenResult accessToken = appIdentity.getAccessToken(scopes); + // The token asserts the identity reported by appIdentity.getServiceAccountName() + JSONObject request = new JSONObject(); + request.put("longUrl", longUrl); - URL url = new URL("https://www.googleapis.com/urlshortener/v1/url?pp=1"); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setDoOutput(true); - connection.setRequestMethod("POST"); - connection.addRequestProperty("Content-Type", "application/json"); - connection.addRequestProperty("Authorization", "Bearer " + accessToken.getAccessToken()); + URL url = new URL("https://www.googleapis.com/urlshortener/v1/url?pp=1"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setDoOutput(true); + connection.setRequestMethod("POST"); + connection.addRequestProperty("Content-Type", "application/json"); + connection.addRequestProperty("Authorization", "Bearer " + accessToken.getAccessToken()); - OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream()); - request.write(writer); - writer.close(); + OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream()); + request.write(writer); + writer.close(); - if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { - // Note: Should check the content-encoding. - // Any JSON parser can be used; this one is used for illustrative purposes. - JSONTokener response_tokens = new JSONTokener(connection.getInputStream()); - JSONObject response = new JSONObject(response_tokens); - return (String) response.get("id"); - } else { - try (InputStream s = connection.getErrorStream(); - InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8)) { - throw new RuntimeException(String.format( - "got error (%d) response %s from %s", - connection.getResponseCode(), - CharStreams.toString(r), - connection.toString())); - } + if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) { + // Note: Should check the content-encoding. + // Any JSON parser can be used; this one is used for illustrative purposes. + JSONTokener response_tokens = new JSONTokener(connection.getInputStream()); + JSONObject response = new JSONObject(response_tokens); + return (String) response.get("id"); + } else { + try (InputStream s = connection.getErrorStream(); + InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8)) { + throw new RuntimeException(String.format( + "got error (%d) response %s from %s", + connection.getResponseCode(), + CharStreams.toString(r), + connection.toString())); } - } catch (Exception e) { - // Error handling elided. - throw e; } } // [END asserting_identity_to_Google_APIs] From 4fc59908ff557e3e6a8e7955881287c1bc9ec175 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Thu, 7 Jan 2016 16:14:22 -0800 Subject: [PATCH 3/3] Fix App Identity sample HTML to match Google Style. Google style expects valid HTML, so I added the missing title and character encoding tags. Also, attributes should use double quotes, not single quotes. https://google.github.io/styleguide/htmlcssguide.xml --- .../appengine/appidentity/UrlShortenerServlet.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java index 301ae8a3e61..8bab40e8115 100644 --- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java +++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java @@ -38,10 +38,12 @@ public UrlShortenerServlet() { public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { PrintWriter w = resp.getWriter(); w.println(""); - w.println("

"); - w.println(""); - w.println(""); - w.println(""); + w.println(""); + w.println("Asserting Identity to Google APIs - App Engine App Identity Example"); + w.println(""); + w.println(""); + w.println(""); + w.println(""); w.println("
"); }