Merge pull request #75 from GoogleCloudPlatform/comments

Add comments to cloudstorage

managed_vms/cloudsql/src/main/java/com/example/managedvms/cloudsql/CloudSqlServlet.java

@@ -18,6 +18,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -40,6 +43,15 @@ public class CloudSqlServlet extends HttpServlet {
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
       ServletException {
+    // store only the first two octets of a users ip address
+    String userIp = req.getRemoteAddr();
+    InetAddress address = InetAddress.getByName(userIp);
+    if (address instanceof Inet6Address) {
+      userIp = userIp.substring(0, userIp.indexOf(":", 2)) + ":*:*:*:*:*:*";
+    } else if (address instanceof Inet4Address) {
+      userIp = userIp.substring(0, userIp.indexOf(".", 2)) + ".*.*";
+    }
+
     final String createTableSql = "CREATE TABLE IF NOT EXISTS visits ( visit_id INT NOT NULL "
         + "AUTO_INCREMENT, user_ip VARCHAR(46) NOT NULL, timestamp DATETIME NOT NULL, "
         + "PRIMARY KEY (visit_id) )";
@@ -49,18 +61,20 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     PrintWriter out = resp.getWriter();
     resp.setContentType("text/plain");
     String url = System.getenv("SQL_DATABASE_URL");
+
     try (Connection conn = DriverManager.getConnection(url);
         PreparedStatement statementCreateVisit = conn.prepareStatement(createVisitSql)) {
       conn.createStatement().executeUpdate(createTableSql);
-      statementCreateVisit.setString(1, req.getRemoteAddr());
+      statementCreateVisit.setString(1, userIp);
       statementCreateVisit.setTimestamp(2, new Timestamp(new Date().getTime()));
       statementCreateVisit.executeUpdate();
+
       try (ResultSet rs = conn.prepareStatement(selectSql).executeQuery()) {
         out.print("Last 10 visits:\n");
         while (rs.next()) {
-          String userIp = rs.getString("user_ip");
+          String savedIp = rs.getString("user_ip");
           String timeStamp = rs.getString("timestamp");
-          out.print("Time: " + timeStamp + " Addr: " + userIp + "\n");
+          out.print("Time: " + timeStamp + " Addr: " + savedIp + "\n");
         }
       }
     } catch (SQLException e) {

managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java

@@ -52,6 +52,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
       ServletException {
     final Part filePart = req.getPart("file");
     final String fileName = filePart.getSubmittedFileName();
+
+    // Modify access list to allow all users with link to read file
     List<Acl> acls = new ArrayList<>();
     acls.add(Acl.of(Acl.User.ofAllUsers(), Acl.Role.READER));
     // the inputstream is closed by default, so we don't need to close it here
@@ -60,6 +62,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
             BlobInfo.builder(BUCKET_NAME, fileName).acl(acls).build(),
             filePart.getInputStream());
     blobInfo = storage.get(BUCKET_NAME, fileName);
+
+    // return the public download link
     resp.getWriter().print(blobInfo.mediaLink());
   }
 }

managed_vms/datastore/pom.xml

@@ -14,7 +14,7 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-    <!-- [START dependencies] -->  
+    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.google.gcloud</groupId>
       <artifactId>gcloud-java-datastore</artifactId>
@@ -62,7 +62,11 @@
           <failsOnError>true</failsOnError>
         </configuration>
         <executions>
-          <execution><goals><goal>check</goal></goals></execution>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>

managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java

@@ -29,6 +29,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -44,17 +47,29 @@ public class DatastoreServlet extends HttpServlet {
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
       ServletException {
+    // store only the first two octets of a users ip address
+    String userIp = req.getRemoteAddr();
+    InetAddress address = InetAddress.getByName(userIp);
+    if (address instanceof Inet6Address) {
+      userIp = userIp.substring(0, userIp.indexOf(":", 2)) + ":*:*:*:*:*:*";
+    } else if (address instanceof Inet4Address) {
+      userIp = userIp.substring(0, userIp.indexOf(".", 2)) + ".*.*";
+    }
+
     Datastore datastore = DatastoreOptions.defaultInstance().service();
     KeyFactory keyFactory = datastore.newKeyFactory().kind("visit");
     IncompleteKey key = keyFactory.kind("visit").newKey();
+
     // Record a visit to the datastore, storing the IP and timestamp.
     FullEntity<IncompleteKey> curVisit = FullEntity.builder(key)
-        .set("user_ip", req.getRemoteAddr()).set("timestamp", DateTime.now()).build();
+        .set("user_ip", userIp).set("timestamp", DateTime.now()).build();
     datastore.add(curVisit);
+
     // Retrieve the last 10 visits from the datastore, ordered by timestamp.
     Query<Entity> query = Query.entityQueryBuilder().kind("visit")
         .orderBy(StructuredQuery.OrderBy.desc("timestamp")).limit(10).build();
     QueryResults<Entity> results = datastore.run(query);
+
     resp.setContentType("text/plain");
     PrintWriter out = resp.getWriter();
     out.print("Last 10 visits:\n");