From 4174a2a0b7ff87e755dd556006bc74297a1756d3 Mon Sep 17 00:00:00 2001 From: Kimberly Date: Fri, 15 Mar 2019 16:46:34 -0400 Subject: [PATCH 1/3] Adjusted server logic for picture --- .../java/com/google/codeu/servlets/MessageServlet.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/codeu/servlets/MessageServlet.java b/src/main/java/com/google/codeu/servlets/MessageServlet.java index 0361119..572308c 100644 --- a/src/main/java/com/google/codeu/servlets/MessageServlet.java +++ b/src/main/java/com/google/codeu/servlets/MessageServlet.java @@ -76,9 +76,13 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr } String recipient = request.getParameter("recipient"); String user = userService.getCurrentUser().getEmail(); - String text = Jsoup.clean(request.getParameter("text"), Whitelist.none()); - - Message message = new Message(user, text, recipient); + String userText = Jsoup.clean(request.getParameter("text"), Whitelist.none()); + + String regex = "(https?://\\S+\\.(png|jpg))"; + String replacement = ""; + String textWithImagesReplaced = userText.replaceAll(regex, replacement); + + Message message = new Message(user, textWithImagesReplaced); datastore.storeMessage(message); response.sendRedirect("/user-page.html?user=" + recipient); From 10b5d4cfbf18180a4b389546a2a52672b7a4cf77 Mon Sep 17 00:00:00 2001 From: Kimberly Date: Fri, 15 Mar 2019 17:25:44 -0400 Subject: [PATCH 2/3] Updated regular expression --- src/main/java/com/google/codeu/servlets/MessageServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/codeu/servlets/MessageServlet.java b/src/main/java/com/google/codeu/servlets/MessageServlet.java index 572308c..5d2ea22 100644 --- a/src/main/java/com/google/codeu/servlets/MessageServlet.java +++ b/src/main/java/com/google/codeu/servlets/MessageServlet.java @@ -78,7 +78,8 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr String user = userService.getCurrentUser().getEmail(); String userText = Jsoup.clean(request.getParameter("text"), Whitelist.none()); - String regex = "(https?://\\S+\\.(png|jpg))"; + String regex = "(https?://([^\\s.]+.?[^\\s.]**)+/([^\\s.]+.?[^\\s.]**)+.(png|jpg))"; + String replacement = ""; String textWithImagesReplaced = userText.replaceAll(regex, replacement); From 20d58cea420fe5c5f1a5836c62a2c59a34ddf1db Mon Sep 17 00:00:00 2001 From: Kimberly Date: Fri, 15 Mar 2019 17:36:22 -0400 Subject: [PATCH 3/3] Updated server image logic --- src/main/java/com/google/codeu/servlets/MessageServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/codeu/servlets/MessageServlet.java b/src/main/java/com/google/codeu/servlets/MessageServlet.java index 5d2ea22..7eb4da1 100644 --- a/src/main/java/com/google/codeu/servlets/MessageServlet.java +++ b/src/main/java/com/google/codeu/servlets/MessageServlet.java @@ -78,7 +78,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr String user = userService.getCurrentUser().getEmail(); String userText = Jsoup.clean(request.getParameter("text"), Whitelist.none()); - String regex = "(https?://([^\\s.]+.?[^\\s.]**)+/([^\\s.]+.?[^\\s.]**)+.(png|jpg))"; + String regex = "(https?://(\\w+[/|.|-]?)+\\.(bmp|png|jpg|gif|jpeg|tiff)).*"; String replacement = ""; String textWithImagesReplaced = userText.replaceAll(regex, replacement);