Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev branch2 #22

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a528803
Add .whitesource configuration file
mend-for-github-com[bot] Jul 21, 2022
79664f8
Merge pull request #1 from MendDemo-josh/whitesource/configure
joshbnewton31080 Jul 21, 2022
4470330
Update .whitesource
joshbnewton31080 Jul 21, 2022
59e3725
Update .whitesource
joshbnewton31080 Aug 2, 2022
43f0ce1
Update .whitesource
joshbnewton31080 Aug 2, 2022
8b5153f
Update .whitesource
joshbnewton31080 Aug 4, 2022
5d6e511
Update SQLInjectionServlet.java
joshbnewton31080 Oct 3, 2022
927121b
Update .whitesource
joshbnewton31080 Oct 3, 2022
abf3cd2
Update .whitesource
joshbnewton31080 Oct 3, 2022
387a110
Update pom.xml
joshbnewton31080 Oct 3, 2022
277f435
Update pom.xml
joshbnewton31080 Oct 3, 2022
0cece45
Update pom.xml
joshbnewton31080 Nov 3, 2022
db35f80
Update .whitesource
joshbnewton31080 Dec 19, 2022
09a50b5
Update .whitesource
joshbnewton31080 Feb 2, 2023
29dcabf
Update .whitesource
joshbnewton31080 Mar 2, 2023
f7bc815
Update pom.xml
joshbnewton31080 Mar 2, 2023
dbbc928
Update pom.xml
joshbnewton31080 Mar 22, 2023
b2ffdb9
Update ArithmeticExceptionServlet.java
joshbnewton31080 Mar 23, 2023
50547a0
Update pom.xml
joshbnewton31080 Jul 28, 2023
78319cf
Update pom.xml
joshbnewton31080 Jul 28, 2023
114f4fb
Update .whitesource
joshbnewton31080 Oct 2, 2023
54d2a21
Update .whitesource
joshbnewton31080 Oct 2, 2023
a41ce00
Update pom.xml
joshbnewton31080 Oct 31, 2023
52499d7
Update AbstractServlet.java
joshbnewton31080 Oct 31, 2023
4085777
Update SQLInjectionServlet.java
joshbnewton31080 Nov 8, 2023
17fb82c
Update .whitesource
joshbnewton31080 Nov 8, 2023
b32dd6f
Update .whitesource
joshbnewton31080 Nov 8, 2023
5ba8c90
Update .whitesource
joshbnewton31080 Nov 20, 2023
48c0a3c
Update AssertionErrorServlet.java
joshbnewton31080 Dec 13, 2023
02af48f
Update DBClient.java
joshbnewton31080 Dec 14, 2023
77eba14
Update EmbeddedADS.java - testing incremental scan
joshbnewton31080 Dec 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"scanSettings": {
"configMode": "AUTO",
"configExternalURL": "",
"projectToken": "",
"enableIaC": true,
"enableLicenseViolations": true,
"baseBranches": ["JoshDevBranch", "master"]
},
"scanSettingsSAST": {
"enableScan": true,
"scanPullRequests": true,
"incrementalScan": false,
"baseBranches": [],
"snippetSize": 10
},
"checkRunSettings": {
"vulnerableCheckRunConclusionLevel": "failure",
"displayMode": "diff",
"useMendCheckNames": true
},
"issueSettings": {
"minSeverityLevel": "MEDIUM",
"issueType": "DEPENDENCY"
},
"remediateSettings": {
"workflowRules": {
"enabled": true,
"extends": ["github>whitesource/merge-confidence:beta"]
}
}
}

12 changes: 7 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<artifactId>easybuggy</artifactId>
<version>1-SNAPSHOT</version>
<packaging>war</packaging>



<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -19,7 +21,7 @@
<jvm.args.print.gc.date.stamps>-XX:+PrintGCDateStamps</jvm.args.print.gc.date.stamps>
<jvm.args.gc.log.file.rotation>-XX:+UseGCLogFileRotation</jvm.args.gc.log.file.rotation>
<jvm.args.number.of.gc.log.files>-XX:NumberOfGCLogFiles=5</jvm.args.number.of.gc.log.files>
<jvm.args.gc.log.file.size>-XX:GCLogFileSize=10M</jvm.args.gc.log.file.size>
<jvm.args.gc.log.file.size>-XX:GCLogFileSize=10M</jvm.args.gc.log.file.size>
</properties>

<profiles>
Expand Down Expand Up @@ -56,13 +58,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.2</version>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -73,7 +75,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.3.0</version>
<version>10.16.1.2</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
Expand Down Expand Up @@ -222,7 +224,7 @@
<executions>
<execution>
<id>startup-uber-start</id>
<phase>install</phase>
<phase>deploy</phase>
<goals>
<goal>exec</goal>
</goals>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//testJosh - testing incremental scan
package org.t246osslab.easybuggy.core.dao;

import java.sql.Connection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//testJosh - testing incremental scan
package org.t246osslab.easybuggy.core.dao;

import org.apache.commons.lang.RandomStringUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public abstract class AbstractServlet extends HttpServlet {
* Send an HTTP response to the client.
*
* @param req HTTP servlet request.
* TestJosh
* @param res HTTP servlet response.
* @param htmlTitle Title of HTML page.
* @param htmlBody Body of HTML page.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//testJosh
package org.t246osslab.easybuggy.errors;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponse;

import org.t246osslab.easybuggy.core.servlets.AbstractServlet;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,16 @@ protected void service(HttpServletRequest req, HttpServletResponse res) throws S
private String selectUsers(String name, String password, HttpServletRequest req) {

Connection conn = null;
Statement stmt = null;
PreparedStatement stmt = null;
ResultSet rs = null;
String result = getErrMsg("msg.error.user.not.exist", req.getLocale());
try {
conn = DBClient.getConnection();
stmt = conn.createStatement();
/** stmt = conn.prepareStatement("SELECT name, secret FROM users WHERE ispublic = 'true' AND name='" + name
"SELECT name, secret FROM users WHERE ispublic = 'true' AND name=" + "?" + " AND password=" + "?");
*/
stmt.setString(1, name);
stmt.setString(2, password);
rs = stmt.executeQuery("SELECT name, secret FROM users WHERE ispublic = 'true' AND name='" + name
+ "' AND password='" + password + "'");
StringBuilder sb = new StringBuilder();
Expand Down