Error: File '/opt/ssrfinput.txt' not found!
"); + return; + } - String inputLine; - while ((inputLine = in.readLine()) != null){ - System.out.println(inputLine); - response.getWriter().print(inputLine);} - in.close(); + try (BufferedReader reader = new BufferedReader(new FileReader(file))) { + String line; + while ((line = reader.readLine()) != null) { + out.println("Processing URL: " + line + "
"); + useUrlOpenConnection(request, response, line); + Thread.sleep(2000); // Simulate delay + } } catch (Exception e) { - response.getWriter().println("Exception!!"); - response.getWriter().print(e.getMessage()); - + out.println("Error while reading the file: " + e.getMessage() + "
"); } } - public void UseUrlOpenConnectionhttps(javax.servlet.http.HttpServletRequest request, - javax.servlet.http.HttpServletResponse response, String ssrfURL) throws javax.servlet.ServletException, IOException { - - String hostname = "www.verisign.com"; - - - String hostname2 = "time.nist.gov"; - - String UrlToOpen = ssrfURL.replaceFirst("HTTPS://", ""); - UrlToOpen = UrlToOpen.replaceFirst("https://", ""); - + private void useUrlOpenConnection(HttpServletRequest request, HttpServletResponse response, String url) throws IOException { + PrintWriter out = response.getWriter(); + out.println("" + inputLine + "
"); + } } - in.close(); - out.close(); - socket.close(); - } catch (Exception e) { - e.printStackTrace(); + out.println("Error during URL.openConnection: " + e.getMessage() + "
"); } + } + + private void useUrlOpenConnectionHttps(HttpServletRequest request, HttpServletResponse response, String url) throws IOException { + PrintWriter out = response.getWriter(); + out.println("Error during HTTPS socket communication.
"); + } + + try (BufferedReader socketIn = new BufferedReader(new InputStreamReader(socket.getInputStream()))) { + String inputLine; + while ((inputLine = socketIn.readLine()) != null) { + out.println("" + inputLine + "
"); + } + } + } + } catch (Exception e) { + out.println("Error during HTTPS Connection: " + e.getMessage() + "
"); + } } - public static void main(String... args) { - System.out.println("Welocome to the java app"); - } } diff --git a/src/main/java/com/endor/AppServlet.java.bak b/src/main/java/com/endor/AppServlet.java.bak new file mode 100644 index 0000000..01e14cd --- /dev/null +++ b/src/main/java/com/endor/AppServlet.java.bak @@ -0,0 +1,178 @@ +package com.endor; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.net.URL; + +// import org.springframework.mock.web.MockHttpServletRequest; + +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; + +// create a diff + +@javax.servlet.annotation.WebServlet(name = "AppServlet", urlPatterns = "/AppServlet") +public class AppServlet extends javax.servlet.http.HttpServlet { + protected void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, IOException { + doGet(request, response); + } + + protected void doGet(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, IOException { + //response.getWriter().println("Hello world"); + PrintWriter out = null; + try { + out = response.getWriter(); + } catch (Exception e) { + e.printStackTrace(); + } + HtmlUtil.printHtmlHeader(response); + HtmlUtil.startBody(response); + HtmlUtil.printMenu(response); + HtmlUtil.printCurrentTitle("SSRF", response); + + String form = ""; + out.println(form); + + + String loopback = request.getParameter("isloopback"); + String ssrfUrl = request.getParameter("ssrf"); + String httpsssrfUrl = request.getParameter("httpsssrf"); + + System.out.printf("loopback : %s\n",loopback); + System.out.printf("ssrfUrl : %s\n",ssrfUrl); + System.out.printf("httpsssrfUrl : %s\n",httpsssrfUrl); + + if (loopback == null && ssrfUrl.equalsIgnoreCase("file")) { + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader("/opt/ssrfinput.txt")); + System.out.println("ssrfinput.txt file opened successfully"); + } + catch (IOException e) { + System.out.println("Failed to open Input file"); + e.printStackTrace(); + } + try { + String line = reader.readLine(); + while (null != line) { + System.out.println("SSRF being called with :" + line); + UseUrlOpenConnection(request, response, line); + line = reader.readLine(); + Thread.sleep(2000); + } + reader.close(); + } + catch (Exception ex){ + ex.getStackTrace(); + } + } else if(loopback == null && ssrfUrl !=null && ssrfUrl.length() > 0) { + UseUrlOpenConnection(request, response, ssrfUrl); +// String countStr = request.getParameter("loop"); +// int count = Integer.parseInt(countStr); +// for (int i =0; i< count;i++) { +// restCall(request, response, i); +// } + } else if (loopback == null && 0 == httpsssrfUrl.toUpperCase().indexOf("HTTPS://")) { + System.out.println("Inside https://, calling UseUrlOpenConnectionhttps()"); + UseUrlOpenConnectionhttps(request, response, httpsssrfUrl); + + } + + System.out.println("Executed URLOpen"); + + } + + public void UseUrlOpenConnection(javax.servlet.http.HttpServletRequest request, + javax.servlet.http.HttpServletResponse response, String ssrfURL) throws javax.servlet.ServletException, IOException { + try { + response.getWriter().println("Inside Url.openStream"); + String url = "https://www.oracle.com/"; + if (ssrfURL != null && ssrfURL.length() > 0) { + url = ssrfURL; + } + URL oracle = new URL(url); + + BufferedReader in = new BufferedReader( + new InputStreamReader(oracle.openStream())); + + String inputLine; + while ((inputLine = in.readLine()) != null){ + System.out.println(inputLine); + response.getWriter().print(inputLine);} + in.close(); + } catch (Exception e) { + response.getWriter().println("Exception!!"); + response.getWriter().print(e.getMessage()); + + } + } + + public void UseUrlOpenConnectionhttps(javax.servlet.http.HttpServletRequest request, + javax.servlet.http.HttpServletResponse response, String ssrfURL) throws javax.servlet.ServletException, IOException { + + String hostname = "www.verisign.com"; + + + String hostname2 = "time.nist.gov"; + + String UrlToOpen = ssrfURL.replaceFirst("HTTPS://", ""); + UrlToOpen = UrlToOpen.replaceFirst("https://", ""); + + try { + System.out.printf("Opening SSL socket for host : %s\n", UrlToOpen); + SSLSocketFactory factory = + (SSLSocketFactory)SSLSocketFactory.getDefault(); + SSLSocket socket = + (SSLSocket)factory.createSocket(UrlToOpen, 443); + + /* + * send http request + + */ + socket.startHandshake(); + + PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()))); + + out.println("GET / HTTP/1.0"); + out.println(); + out.flush(); + + /* + * Make sure there were no surprises + */ + if (out.checkError()) + System.out.println( + "SSLSocketClient: java.io.PrintWriter error"); + + /* read response */ + BufferedReader in = new BufferedReader( + new InputStreamReader( + socket.getInputStream())); + + String inputLine; + while ((inputLine = in.readLine()) != null) { + System.out.println(inputLine); + response.getWriter().print(inputLine); + } + in.close(); + out.close(); + socket.close(); + + } catch (Exception e) { + e.printStackTrace(); + } + + } + public static void main(String... args) { + System.out.println("Welocome to the java app"); + + } +} diff --git a/src/main/java/com/endor/AsyncEchoUpgradeServlet.java b/src/main/java/com/endor/AsyncEchoUpgradeServlet.java index c679803..a5b4b4f 100644 --- a/src/main/java/com/endor/AsyncEchoUpgradeServlet.java +++ b/src/main/java/com/endor/AsyncEchoUpgradeServlet.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.AsyncContext; -import javax.servlet.ReadListener; -import javax.servlet.ServletException; -import javax.servlet.WriteListener; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.*; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.WriteListener; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.*; import java.io.IOException; import java.util.ArrayDeque; import java.util.Queue; diff --git a/src/main/java/com/endor/AsyncServlet.java b/src/main/java/com/endor/AsyncServlet.java index 789dc6a..c33318b 100644 --- a/src/main/java/com/endor/AsyncServlet.java +++ b/src/main/java/com/endor/AsyncServlet.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.AsyncContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.sql.*; @@ -15,7 +15,7 @@ public class AsyncServlet extends HttpServlet { /* ... Same variables and init method as in SyncServlet ... */ - protected void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, IOException { + protected void doPost(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response) throws jakarta.servlet.ServletException, IOException { doGet(request, response); } diff --git a/src/main/java/com/endor/BooksServlet.java b/src/main/java/com/endor/BooksServlet.java index 73168c4..5a26a08 100644 --- a/src/main/java/com/endor/BooksServlet.java +++ b/src/main/java/com/endor/BooksServlet.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.security.InvalidParameterException; @@ -642,7 +642,7 @@ public boolean executeSQLHelper(String methodName, String name, String pass) { StringBuffer sbuf = new StringBuffer(); String query = new String(); - query = "select FIRST, LAST from CUSTOMERS WHERE LAST=\'" + name + "\' AND PASSWORD= \'" + pass + "\'"; + query = "select FIRST, LAST from CUSTOMERS WHERE LAST=name AND PASSWORD=password"; if (methodName.equalsIgnoreCase("executeQuerySQL")) { @@ -1543,7 +1543,7 @@ public boolean StoredProcDirectParaAsync(String name, String pass) { //PreparedStatement stmt = null; CallableStatement c = null; try { - String Proc_query = "{CALL sql_login('" + name +"',"+ pass + "')}"; + String Proc_query = "{CALL sql_login('name and pass')}"; System.out.println("Created Procedure query string : " + Proc_query); c = conn.prepareCall(Proc_query); } catch (SQLException e) { diff --git a/src/main/java/com/endor/BotTest.java b/src/main/java/com/endor/BotTest.java index 370eb6d..5379b71 100644 --- a/src/main/java/com/endor/BotTest.java +++ b/src/main/java/com/endor/BotTest.java @@ -1,12 +1,12 @@ package com.endor; -import javax.servlet.AsyncContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.sql.*; @@ -17,7 +17,7 @@ public class BotTest extends HttpServlet { /* ... Same variables and init method as in SyncServlet ... */ boolean isPost = false; - protected void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, IOException { + protected void doPost(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response) throws jakarta.servlet.ServletException, IOException { isPost = true; System.out.println("In Post request method"); doGet(request, response); diff --git a/src/main/java/com/endor/CSPFilter.java b/src/main/java/com/endor/CSPFilter.java index 348f168..1e1d2d4 100644 --- a/src/main/java/com/endor/CSPFilter.java +++ b/src/main/java/com/endor/CSPFilter.java @@ -3,14 +3,14 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet Filter implementation class CSPFilter diff --git a/src/main/java/com/endor/CookieTest.java b/src/main/java/com/endor/CookieTest.java index 7e372f7..d117e3e 100644 --- a/src/main/java/com/endor/CookieTest.java +++ b/src/main/java/com/endor/CookieTest.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/endor/Deserialize1.java b/src/main/java/com/endor/Deserialize1.java index 21e5d41..0db072b 100644 --- a/src/main/java/com/endor/Deserialize1.java +++ b/src/main/java/com/endor/Deserialize1.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/endor/ElExpression.java b/src/main/java/com/endor/ElExpression.java index 077d8a0..86b967b 100644 --- a/src/main/java/com/endor/ElExpression.java +++ b/src/main/java/com/endor/ElExpression.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.PrintWriter; @WebServlet("/elExpression") diff --git a/src/main/java/com/endor/EncryptionServlet.java b/src/main/java/com/endor/EncryptionServlet.java index 4cf4585..428d207 100644 --- a/src/main/java/com/endor/EncryptionServlet.java +++ b/src/main/java/com/endor/EncryptionServlet.java @@ -1,11 +1,11 @@ package com.endor; import javax.crypto.*; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.security.*; diff --git a/src/main/java/com/endor/ExecuteServlet.java b/src/main/java/com/endor/ExecuteServlet.java index e5ebf86..ff58e3d 100644 --- a/src/main/java/com/endor/ExecuteServlet.java +++ b/src/main/java/com/endor/ExecuteServlet.java @@ -1,10 +1,10 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/endor/ExtraServlet.java b/src/main/java/com/endor/ExtraServlet.java index 977a32f..0dc6dcb 100644 --- a/src/main/java/com/endor/ExtraServlet.java +++ b/src/main/java/com/endor/ExtraServlet.java @@ -11,12 +11,12 @@ import java.sql.Statement; import java.sql.Types; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** diff --git a/src/main/java/com/endor/FileUploadServlet.java b/src/main/java/com/endor/FileUploadServlet.java index 9d6eda9..bcc5034 100644 --- a/src/main/java/com/endor/FileUploadServlet.java +++ b/src/main/java/com/endor/FileUploadServlet.java @@ -1,12 +1,12 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import java.io.*; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/com/endor/GetInputStreamInnerTest.java b/src/main/java/com/endor/GetInputStreamInnerTest.java index bb5c2a6..88c9b12 100644 --- a/src/main/java/com/endor/GetInputStreamInnerTest.java +++ b/src/main/java/com/endor/GetInputStreamInnerTest.java @@ -1,12 +1,12 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.sql.*; @@ -123,7 +123,7 @@ public boolean executeSQLHelper(String name, String pass) { try { StringBuffer sbuf = new StringBuffer(); String query = new String(); - query = "select FIRST, LAST from CUSTOMERS WHERE LAST=\'" + name + "\' AND PASSWORD= \'" + pass + "\'"; + query = "select FIRST, LAST from CUSTOMERS WHERE LAST=name AND PASSWORD=pass"; System.out.println("Multileg PreparedStatementQUERY:" + query); PreparedStatement stmt = conn.prepareStatement(query); ResultSet rs = stmt.executeQuery(); @@ -170,8 +170,8 @@ public boolean getCustomersStoredProc(String name, String pass) { query = "{call verifyuser(?,?,?)}"; c = conn.prepareCall(query); - c.setString(1, name); - c.setString(2, pass); + c.setString(1, "test"); + c.setString(2, "test"); c.registerOutParameter(3, Types.INTEGER); System.out.println("Multihub DB stored Proc being called"); System.out.println(query); diff --git a/src/main/java/com/endor/GetInputStreamTest.java b/src/main/java/com/endor/GetInputStreamTest.java index 2dfc795..be13f9b 100644 --- a/src/main/java/com/endor/GetInputStreamTest.java +++ b/src/main/java/com/endor/GetInputStreamTest.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/endor/HelloController.java b/src/main/java/com/endor/HelloController.java new file mode 100644 index 0000000..9f26cda --- /dev/null +++ b/src/main/java/com/endor/HelloController.java @@ -0,0 +1,14 @@ +// package com.example.springboot; + +// import org.springframework.web.bind.annotation.GetMapping; +// import org.springframework.web.bind.annotation.RestController; + +// @RestController +// public class HelloController { + +// @GetMapping("/") +// public String index() { +// return "Greetings from Spring Boot!"; +// } + +// } \ No newline at end of file diff --git a/src/main/java/com/endor/HtmlUtil.java b/src/main/java/com/endor/HtmlUtil.java index 0004ee7..193a0fb 100644 --- a/src/main/java/com/endor/HtmlUtil.java +++ b/src/main/java/com/endor/HtmlUtil.java @@ -1,6 +1,6 @@ package com.endor; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.PrintWriter; public class HtmlUtil { diff --git a/src/main/java/com/endor/HttpTrace.java b/src/main/java/com/endor/HttpTrace.java index 5f66184..7a626fe 100644 --- a/src/main/java/com/endor/HttpTrace.java +++ b/src/main/java/com/endor/HttpTrace.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Servlet implementation class HttpTrace diff --git a/src/main/java/com/endor/Login.java b/src/main/java/com/endor/Login.java index 307ff32..84895c0 100644 --- a/src/main/java/com/endor/Login.java +++ b/src/main/java/com/endor/Login.java @@ -4,13 +4,13 @@ import java.io.PrintWriter; import java.util.HashMap; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @WebServlet("/clothing-shop/login") public class Login extends HttpServlet { diff --git a/src/main/java/com/endor/LoginSuccess.java b/src/main/java/com/endor/LoginSuccess.java index 9865b38..eb7d236 100644 --- a/src/main/java/com/endor/LoginSuccess.java +++ b/src/main/java/com/endor/LoginSuccess.java @@ -3,12 +3,12 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @WebServlet("/clothing-shop/LoginSuccess") public class LoginSuccess extends HttpServlet { diff --git a/src/main/java/com/endor/Logout.java b/src/main/java/com/endor/Logout.java index c50bb94..088e87b 100644 --- a/src/main/java/com/endor/Logout.java +++ b/src/main/java/com/endor/Logout.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServlet; import java.io.IOException; @WebServlet("/clothing-shop/logout") diff --git a/src/main/java/com/endor/NewSQLExitServlet.java b/src/main/java/com/endor/NewSQLExitServlet.java index a8025db..ec0ad40 100644 --- a/src/main/java/com/endor/NewSQLExitServlet.java +++ b/src/main/java/com/endor/NewSQLExitServlet.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.sql.Connection; diff --git a/src/main/java/com/endor/OSCommandServlet.java b/src/main/java/com/endor/OSCommandServlet.java index 2339661..bb8d5f6 100644 --- a/src/main/java/com/endor/OSCommandServlet.java +++ b/src/main/java/com/endor/OSCommandServlet.java @@ -1,14 +1,14 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -@WebServlet(name = "ExecuteServlet") +@WebServlet(name = "ExecuteServletAlt") public class OSCommandServlet extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); diff --git a/src/main/java/com/endor/RecordServlet.java b/src/main/java/com/endor/RecordServlet.java index 2d192aa..ec2459c 100644 --- a/src/main/java/com/endor/RecordServlet.java +++ b/src/main/java/com/endor/RecordServlet.java @@ -11,13 +11,13 @@ import java.sql.SQLException; import java.sql.Types; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @WebServlet("/clothing-shop/RecordServlet") diff --git a/src/main/java/com/endor/SecurePage.java b/src/main/java/com/endor/SecurePage.java index fb34bbb..92c88fa 100644 --- a/src/main/java/com/endor/SecurePage.java +++ b/src/main/java/com/endor/SecurePage.java @@ -1,10 +1,10 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/endor/TypeSniff.java b/src/main/java/com/endor/TypeSniff.java index c97480a..c4f1a22 100644 --- a/src/main/java/com/endor/TypeSniff.java +++ b/src/main/java/com/endor/TypeSniff.java @@ -3,16 +3,16 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Servlet implementation class TypeSniff diff --git a/src/main/java/com/endor/XmlXXE.java b/src/main/java/com/endor/XmlXXE.java index 4b98f90..a971589 100644 --- a/src/main/java/com/endor/XmlXXE.java +++ b/src/main/java/com/endor/XmlXXE.java @@ -1,11 +1,11 @@ package com.endor; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/src/main/java/com/endor/stringsub.java b/src/main/java/com/endor/stringsub.java index 3e510b1..116313c 100644 --- a/src/main/java/com/endor/stringsub.java +++ b/src/main/java/com/endor/stringsub.java @@ -4,7 +4,8 @@ public class stringsub { public static void main(String... args) { final StringSubstitutor interpolator = StringSubstitutor.createInterpolator(); - String out = interpolator.replace("${script:javascript:java.lang.Runtime.getRuntime().exec('touch ./foo')}"); + // String out = interpolator.replace("${script:javascript:java.lang.Runtime.getRuntime().exec('touch ./foo')}"); + String out = "bababooy"; System.out.println(out); } } diff --git a/src/main/java/com/endor/wrapper/RequestWrapper1.java b/src/main/java/com/endor/wrapper/RequestWrapper1.java index 7f58d9b..f528b6f 100644 --- a/src/main/java/com/endor/wrapper/RequestWrapper1.java +++ b/src/main/java/com/endor/wrapper/RequestWrapper1.java @@ -1,7 +1,7 @@ package com.endor.wrapper; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestWrapper; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; public class RequestWrapper1 extends ServletRequestWrapper { diff --git a/src/main/java/com/endor/wrapper/WrapperFilter.java b/src/main/java/com/endor/wrapper/WrapperFilter.java index 385905a..66c8153 100644 --- a/src/main/java/com/endor/wrapper/WrapperFilter.java +++ b/src/main/java/com/endor/wrapper/WrapperFilter.java @@ -1,6 +1,6 @@ package com.endor.wrapper; -import javax.servlet.*; +import jakarta.servlet.*; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/com/endor/wrapper/WrapperServlet.java b/src/main/java/com/endor/wrapper/WrapperServlet.java index f92dfcd..f3f5b69 100644 --- a/src/main/java/com/endor/wrapper/WrapperServlet.java +++ b/src/main/java/com/endor/wrapper/WrapperServlet.java @@ -1,9 +1,9 @@ package com.endor.wrapper; -import javax.servlet.GenericServlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.GenericServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.io.PrintWriter;