Skip to content

Commit f96651a

Browse files
dschadowdschadow
committed
Changed file db loading in order to work with standalone Tomcat
Signed-off-by: Dominik Schadow <dominikschadow@googlemail.com>
1 parent b4c5a6c commit f96651a

File tree

8 files changed

+21
-12
lines changed

8 files changed

+21
-12
lines changed

‎Ch05_AccessReferenceMaps/src/main/java/de/dominikschadow/webappsecurity/AccountsDAO.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private Account queryAccount(int id) {
5757
ResultSet rs = null;
5858

5959
try {
60-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/accountsDB; shutdown=true", "sa", "");
60+
con = DriverManager.getConnection("jdbc:hsqldb:res:/accountsDB; shutdown=true", "sa", "");
6161
pstmt = con.prepareStatement(query);
6262
pstmt.setInt(1, id);
6363

@@ -110,7 +110,7 @@ private List<String> queryAccounts(int userId) {
110110
ResultSet rs = null;
111111

112112
try {
113-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/accountsDB; shutdown=true", "sa", "");
113+
con = DriverManager.getConnection("jdbc:hsqldb:res:/accountsDB; shutdown=true", "sa", "");
114114
pstmt = con.prepareStatement(query);
115115
pstmt.setInt(1, userId);
116116

‎Ch05_AccessReferenceMaps/src/main/java/de/dominikschadow/webappsecurity/AccountsIntegerDAO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private List<String> queryAccounts(User user) {
6969
ResultSet rs = null;
7070

7171
try {
72-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/accountsDB; shutdown=true", "sa", "");
72+
con = DriverManager.getConnection("jdbc:hsqldb:res:/accountsDB; shutdown=true", "sa", "");
7373
pstmt = con.prepareStatement(query);
7474
pstmt.setInt(1, user.getUserId());
7575

‎Ch05_AccessReferenceMaps/src/main/java/de/dominikschadow/webappsecurity/AccountsRandomDAO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private List<String> queryAccounts(User user) {
6767
ResultSet rs = null;
6868

6969
try {
70-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/accountsDB; shutdown=true", "sa", "");
70+
con = DriverManager.getConnection("jdbc:hsqldb:res:/accountsDB; shutdown=true", "sa", "");
7171
pstmt = con.prepareStatement(query);
7272
pstmt.setInt(1, user.getUserId());
7373

‎Ch06_SQLInjection/src/main/java/de/dominikschadow/webappsecurity/servlets/PreparedStatementServlet.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package de.dominikschadow.webappsecurity.servlets;
1919

2020
import de.dominikschadow.webappsecurity.domain.Customer;
21+
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324

@@ -28,6 +29,7 @@
2829
import javax.servlet.http.HttpServlet;
2930
import javax.servlet.http.HttpServletRequest;
3031
import javax.servlet.http.HttpServletResponse;
32+
3133
import java.io.IOException;
3234
import java.io.PrintWriter;
3335
import java.sql.*;
@@ -49,8 +51,9 @@ public class PreparedStatementServlet extends HttpServlet {
4951
@PostConstruct
5052
public void init() {
5153
try {
52-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/customerDB; shutdown=true", "sa", "");
53-
} catch (SQLException ex) {
54+
Class.forName("org.hsqldb.jdbcDriver");
55+
con = DriverManager.getConnection("jdbc:hsqldb:res:/customerDB; shutdown=true", "sa", "");
56+
} catch (ClassNotFoundException | SQLException ex) {
5457
logger.error(ex.getMessage(), ex);
5558
}
5659
}

‎Ch06_SQLInjection/src/main/java/de/dominikschadow/webappsecurity/servlets/StatementEscapingServlet.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package de.dominikschadow.webappsecurity.servlets;
1919

2020
import de.dominikschadow.webappsecurity.domain.Customer;
21+
2122
import org.owasp.esapi.ESAPI;
2223
import org.owasp.esapi.codecs.OracleCodec;
2324
import org.slf4j.Logger;
@@ -30,6 +31,7 @@
3031
import javax.servlet.http.HttpServlet;
3132
import javax.servlet.http.HttpServletRequest;
3233
import javax.servlet.http.HttpServletResponse;
34+
3335
import java.io.IOException;
3436
import java.io.PrintWriter;
3537
import java.sql.*;
@@ -51,8 +53,9 @@ public class StatementEscapingServlet extends HttpServlet {
5153
@PostConstruct
5254
public void init() {
5355
try {
54-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/customerDB; shutdown=true", "sa", "");
55-
} catch (SQLException ex) {
56+
Class.forName("org.hsqldb.jdbcDriver");
57+
con = DriverManager.getConnection("jdbc:hsqldb:res:/customerDB; shutdown=true", "sa", "");
58+
} catch (ClassNotFoundException | SQLException ex) {
5659
logger.error(ex.getMessage(), ex);
5760
}
5861
}

‎Ch06_SQLInjection/src/main/java/de/dominikschadow/webappsecurity/servlets/StatementServlet.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package de.dominikschadow.webappsecurity.servlets;
1919

2020
import de.dominikschadow.webappsecurity.domain.Customer;
21+
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324

@@ -28,6 +29,7 @@
2829
import javax.servlet.http.HttpServlet;
2930
import javax.servlet.http.HttpServletRequest;
3031
import javax.servlet.http.HttpServletResponse;
32+
3133
import java.io.IOException;
3234
import java.io.PrintWriter;
3335
import java.sql.*;
@@ -49,8 +51,9 @@ public class StatementServlet extends HttpServlet {
4951
@PostConstruct
5052
public void init() {
5153
try {
52-
con = DriverManager.getConnection("jdbc:hsqldb:file:src/main/resources/customerDB; shutdown=true", "sa", "");
53-
} catch (SQLException ex) {
54+
Class.forName("org.hsqldb.jdbcDriver");
55+
con = DriverManager.getConnection("jdbc:hsqldb:res:/customerDB; shutdown=true", "sa", "");
56+
} catch (ClassNotFoundException | SQLException ex) {
5457
logger.error(ex.getMessage(), ex);
5558
}
5659
}

‎Ch06_SQLInjection/src/main/resources/hibernate.cfg.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<hibernate-configuration>
66
<session-factory>
77
<property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
8-
<property name="connection.url">jdbc:hsqldb:file:src/main/resources/customerDB</property>
8+
<property name="connection.url">jdbc:hsqldb:res:/customerDB</property>
99
<property name="connection.username">sa</property>
1010
<property name="connection.password"></property>
1111
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>

‎Ch07_XSS/src/main/resources/hibernate.cfg.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<hibernate-configuration>
66
<session-factory>
77
<property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
8-
<property name="connection.url">jdbc:hsqldb:file:src/main/resources/customerDB</property>
8+
<property name="connection.url">jdbc:hsqldb:res:/customerDB</property>
99
<property name="connection.username">sa</property>
1010
<property name="connection.password"></property>
1111
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>

0 commit comments

Comments
 (0)