From 1438e5e6cccee92aed01bb6b560b93229f4127c0 Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:33:42 +0530 Subject: [PATCH 1/9] Update build.gradle --- web/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/build.gradle b/web/build.gradle index 97d53fa..dabb3ec 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -15,6 +15,8 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1' + api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1' } test { From 3a26c6bee2bb475fe79ce90fd40a957f3356f200 Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:36:53 +0530 Subject: [PATCH 2/9] Update Server.java --- web/src/main/java/com/example/server/Server.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/src/main/java/com/example/server/Server.java b/web/src/main/java/com/example/server/Server.java index aaaccd1..f8df3b1 100644 --- a/web/src/main/java/com/example/server/Server.java +++ b/web/src/main/java/com/example/server/Server.java @@ -7,10 +7,15 @@ import java.io.IOException; import java.sql.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class Server extends HttpServlet { static final String DB_URL = "jdbc:mysql://localhost/users"; static Connection conn; + + private static final Logger logger = LogManager.getLogger(Server.class); @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -20,6 +25,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se resp.addCookie(c); resp.setHeader("Access-Control-Allow-Origin", "*"); + logger.info("user session id: " + req.getSession.getId()); + Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); int ticketNumber = Integer.parseInt(req.getParameter("ticket")); try { From a6fb8d762dd850de017f6f353f5d05d193f2e419 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 08:07:03 +0000 Subject: [PATCH 3/9] Format code with google-java-format --- .../main/java/com/example/server/Server.java | 95 ++++++++++--------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/web/src/main/java/com/example/server/Server.java b/web/src/main/java/com/example/server/Server.java index f8df3b1..d88f45b 100644 --- a/web/src/main/java/com/example/server/Server.java +++ b/web/src/main/java/com/example/server/Server.java @@ -1,69 +1,70 @@ package com.example.server; + +import java.io.IOException; +import java.sql.*; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.sql.*; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class Server extends HttpServlet { - static final String DB_URL = "jdbc:mysql://localhost/users"; - static Connection conn; - - private static final Logger logger = LogManager.getLogger(Server.class); + static final String DB_URL = "jdbc:mysql://localhost/users"; + static Connection conn; - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Cookie c = new Cookie("uid", req.getSession().getId()); - // For older browsers? - c.setSecure(false); - resp.addCookie(c); - resp.setHeader("Access-Control-Allow-Origin", "*"); + private static final Logger logger = LogManager.getLogger(Server.class); - logger.info("user session id: " + req.getSession.getId()); - - Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); - int ticketNumber = Integer.parseInt(req.getParameter("ticket")); - try { - Statement s = conn.createStatement(); - s.execute("SELECT userName, isWin FROM users WHERE uid = " + ticketNumber + ";"); - ResultSet r = s.getResultSet(); + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Cookie c = new Cookie("uid", req.getSession().getId()); + // For older browsers? + c.setSecure(false); + resp.addCookie(c); + resp.setHeader("Access-Control-Allow-Origin", "*"); - if (r.getBoolean("isWin") && b) { - resp.getWriter().write("You win, " + r.getString("userName")); - } else { - resp.getWriter().write("You lose, " + r.getString("userName")); - } - } catch (SQLException throwables) { - throwables.printStackTrace(); - } - resp.setStatus(200); - } + logger.info("user session id: " + req.getSession.getId()); - @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - super.doPost(req, resp); - } + Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); + int ticketNumber = Integer.parseInt(req.getParameter("ticket")); + try { + Statement s = conn.createStatement(); + s.execute("SELECT userName, isWin FROM users WHERE uid = " + ticketNumber + ";"); + ResultSet r = s.getResultSet(); - @Override - public void destroy() { - super.destroy(); + if (r.getBoolean("isWin") && b) { + resp.getWriter().write("You win, " + r.getString("userName")); + } else { + resp.getWriter().write("You lose, " + r.getString("userName")); + } + } catch (SQLException throwables) { + throwables.printStackTrace(); } + resp.setStatus(200); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + super.doPost(req, resp); + } - @Override - public void init() throws ServletException { - super.init(); + @Override + public void destroy() { + super.destroy(); + } - try { - conn = DriverManager.getConnection(DB_URL, "user", ""); - } catch (SQLException throwables) { - throwables.printStackTrace(); - } + @Override + public void init() throws ServletException { + super.init(); + try { + conn = DriverManager.getConnection(DB_URL, "user", ""); + } catch (SQLException throwables) { + throwables.printStackTrace(); } + } } From 50c82b07dd31061f444d83b5468af023e54299a3 Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:39:16 +0530 Subject: [PATCH 4/9] Update Server.java --- web/src/main/java/com/example/server/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/com/example/server/Server.java b/web/src/main/java/com/example/server/Server.java index d88f45b..df8fcb1 100644 --- a/web/src/main/java/com/example/server/Server.java +++ b/web/src/main/java/com/example/server/Server.java @@ -26,7 +26,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) resp.addCookie(c); resp.setHeader("Access-Control-Allow-Origin", "*"); - logger.info("user session id: " + req.getSession.getId()); + logger.info("user session id: " + req.getSession().getId()); Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); int ticketNumber = Integer.parseInt(req.getParameter("ticket")); From ec0c22a91875da4001ecbe65fa40b5f4074b37f8 Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:40:18 +0530 Subject: [PATCH 5/9] Update Server.java --- web/src/main/java/com/example/server/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/com/example/server/Server.java b/web/src/main/java/com/example/server/Server.java index df8fcb1..e3b9929 100644 --- a/web/src/main/java/com/example/server/Server.java +++ b/web/src/main/java/com/example/server/Server.java @@ -26,7 +26,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) resp.addCookie(c); resp.setHeader("Access-Control-Allow-Origin", "*"); - logger.info("user session id: " + req.getSession().getId()); + logger.info("user agent: " + req.getHeader("user-agent")); Boolean b = Boolean.parseBoolean(req.getParameter("winCondition")); int ticketNumber = Integer.parseInt(req.getParameter("ticket")); From 9fca07a7c9ac008d6b61c27dbc131e2bacbf6fe9 Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:42:42 +0530 Subject: [PATCH 6/9] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7e171f5..6975c9c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ group 'org.example' version '1.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_8 + targetCompatibility = JavaVersion.VERSION_8 } repositories { From 3806ec1ad43dd92cd954425747da66ebda106acd Mon Sep 17 00:00:00 2001 From: raghav-deepsource <71248328+raghav-deepsource@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:43:16 +0530 Subject: [PATCH 7/9] Update .deepsource.toml --- .deepsource.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.deepsource.toml b/.deepsource.toml index a31a5bc..ace3296 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -9,7 +9,7 @@ name = "java" enabled = true [analyzers.meta] - runtime_version = "11" + runtime_version = "8" [[analyzers]] name = "secrets" @@ -17,4 +17,4 @@ enabled = true [[transformers]] name = "google-java-format" -enabled = true \ No newline at end of file +enabled = true From c5cd2c6206792fda63091f72ea37349cb1312487 Mon Sep 17 00:00:00 2001 From: Raghav Shankar Date: Mon, 13 Dec 2021 15:15:42 +0530 Subject: [PATCH 8/9] fix failing analysis --- build.gradle | 4 ++-- web/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6975c9c..7e171f5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,8 @@ group 'org.example' version '1.0-SNAPSHOT' java { - sourceCompatibility = JavaVersion.VERSION_8 - targetCompatibility = JavaVersion.VERSION_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } repositories { diff --git a/web/build.gradle b/web/build.gradle index dabb3ec..409332d 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1' - api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1' + implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1' } test { From 603f989de26a0cf6bac30054da4ee364e30b44dc Mon Sep 17 00:00:00 2001 From: Raghav Shankar Date: Mon, 13 Dec 2021 15:22:45 +0530 Subject: [PATCH 9/9] fix failing analysis --- .deepsource.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.deepsource.toml b/.deepsource.toml index ace3296..d409a65 100644 --- a/.deepsource.toml +++ b/.deepsource.toml @@ -9,7 +9,7 @@ name = "java" enabled = true [analyzers.meta] - runtime_version = "8" + runtime_version = "11" [[analyzers]] name = "secrets"