diff --git a/LICENSE b/LICENSE
index ebf3924e..abdea5f2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-MIT License
+MIT License (c) TT
-Copyright (c) 2018 Appsecco
+Copyright (c) 2018 Appsecco XYZ
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index d4fd7f89..c1699152 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# Damn Vulnerable Java Application
-
+Testing PR event 2
## Quick Start
Install Docker and Docker Compose.
@@ -9,7 +9,7 @@ docker-compose up
```
Navigate to `http://localhost:8080`
-To update image
+To update images
```
docker-compose build
diff --git a/cx.config b/cx.config
new file mode 100644
index 00000000..c90034fc
--- /dev/null
+++ b/cx.config
@@ -0,0 +1,9 @@
+{
+ "version": 1.0,
+ "project": "dvja-master",
+ "team": "/CxServer/Americas/Engineering",
+ "sast": {
+ "incremental": "false",
+ "forceScan": "true"
+ }
+}
diff --git a/cx.config.old b/cx.config.old
new file mode 100644
index 00000000..1863af2b
--- /dev/null
+++ b/cx.config.old
@@ -0,0 +1,43 @@
+{
+ "version": 1.0,
+ "project": "${repo}-${branch}",
+ "team": "\\CxServer\\Europe\\Caderon",
+ "sast": {
+ "preset": "XSS and SQLi only",
+ "engineConfiguration": "Default",
+ "incremental": "false",
+ "forceScan" : "true",
+ "fileExcludes": "*.jpg,*.xml",
+ "folderExcludes": "*/test/*,*/unittesst/*"
+ },
+ "additionalProperties" : {
+ "cxFlow": {
+ "application": "APPLICATION DVJAA",
+ "branches": ["develop", "master", "security"],
+ "emails": ["gem.immanuel@checkmarx.com"],
+ "bugTracker": "JIRA",
+ "jira": {
+ "project": "APPSEC",
+ "issue_type": "APPSECBUG",
+ "assignee": "gemify",
+ "opened_status": ["To Do","In Progress", "In Review"],
+ "closed_status": ["Closed","Done"],
+ "open_transition": "In Progress",
+ "close_transition": "Done",
+ "close_transition_field": "resolution",
+ "close_transition_value": "Done",
+ "priorities": {
+ "High": "High",
+ "Medium": "Medium",
+ "Low": "Low"
+ }
+ },
+ "filters" : {
+ "severity": ["High", "Medium"],
+ "cwe": [""],
+ "category": [""],
+ "status": ["Confirmed", "Urgent"]
+ }
+ }
+ }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 08c0c1e1..605ca260 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
build: .
depends_on:
- mysql
+ - another
ports:
- "8080:8080"
environment:
diff --git a/pom.xml b/pom.xml
index ad967556..461e0a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
dvja
- 2.3.30
- 2.3
- UTF-8
+ 2.4.30
+ 2.5
+ UTF-9
3.0.5.RELEASE
diff --git a/src/main/java/com/appsecco/dvja/Constant.java b/src/main/java/com/appsecco/dvja/Constant.java
index 726efe0c..2bbf8250 100644
--- a/src/main/java/com/appsecco/dvja/Constant.java
+++ b/src/main/java/com/appsecco/dvja/Constant.java
@@ -2,4 +2,5 @@
public class Constant {
public static String SESSION_USER_HANDLE = "USER";
+ int a = 2;
}
diff --git a/src/main/java/com/appsecco/dvja/services/UserService.java b/src/main/java/com/appsecco/dvja/services/UserService.java
index d629da92..4de9c9d7 100644
--- a/src/main/java/com/appsecco/dvja/services/UserService.java
+++ b/src/main/java/com/appsecco/dvja/services/UserService.java
@@ -22,6 +22,7 @@ public class UserService {
@PersistenceContext
public void setEntityManager(EntityManager em) {
this.entityManager = em;
+ // Test
}
public EntityManager getEntityManager() { return this.entityManager; }
diff --git a/src/main/java/com/appsecco/example/ExampleSupport.java b/src/main/java/com/appsecco/example/ExampleSupport.java
index 25da0d6f..b6b8bd7a 100644
--- a/src/main/java/com/appsecco/example/ExampleSupport.java
+++ b/src/main/java/com/appsecco/example/ExampleSupport.java
@@ -27,4 +27,5 @@
* Base Action class for the Tutorial package.
*/
public class ExampleSupport extends ActionSupport {
+ int a = 3;
}
diff --git a/src/main/java/com/appsecco/example/HelloWorld.java b/src/main/java/com/appsecco/example/HelloWorld.java
index ac7104bd..a476fb74 100644
--- a/src/main/java/com/appsecco/example/HelloWorld.java
+++ b/src/main/java/com/appsecco/example/HelloWorld.java
@@ -26,8 +26,10 @@
*/
public class HelloWorld extends ExampleSupport {
+ // A comment
public String execute() throws Exception {
setMessage(getText(MESSAGE));
+ // Some change
return SUCCESS;
}
diff --git a/src/main/java/com/appsecco/example/Login.java b/src/main/java/com/appsecco/example/Login.java
index b231919a..dcb8475b 100644
--- a/src/main/java/com/appsecco/example/Login.java
+++ b/src/main/java/com/appsecco/example/Login.java
@@ -29,7 +29,8 @@ public String execute() throws Exception {
if (isInvalid(getPassword())) return INPUT;
- return SUCCESS;
+ if (true) return "";
+ return SUCCESeS;
}
private boolean isInvalid(String value) {
@@ -56,4 +57,4 @@ public void setPassword(String password) {
this.password = password;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 5db93ece..e2ab7333 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,7 @@
-
+
@@ -13,4 +13,4 @@
-
\ No newline at end of file
+