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

Myhotfix #24

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
276eeaf
Update HelloWorld.java
gemgit7 Apr 27, 2020
886435c
Merge pull request #1 from gemgit7/CxCE_CxFlow_Demo
gemgit7 Apr 27, 2020
bb21754
Update ExampleSupport.java
gemgit7 Apr 27, 2020
005d4c7
Update Constant.java
gemgit7 Apr 27, 2020
9ab69a9
Merge pull request #2 from gemgit7/CxCE_CxFlow_Demo
gemgit7 Apr 27, 2020
d246d22
Update Login.java
gemgit7 Apr 27, 2020
220c9bb
Merge pull request #3 from gemgit7/CxCE_CxFlow_Demo
gemgit7 Apr 27, 2020
e8b9a4b
Create cx.config
gemgit7 May 14, 2020
d9d7b49
Update UserService.java
gemgit7 May 14, 2020
5b661e4
Update docker-compose.yml
gemgit7 May 14, 2020
4106cc2
Update README.md
gemgit7 May 14, 2020
cf63757
Update cx.config
gemgit7 May 14, 2020
d3c4ca9
Update cx.config
gemgit7 May 14, 2020
3e21ee9
Update cx.config
gemgit7 May 14, 2020
6872b50
Update cx.config
gemgit7 May 14, 2020
f86fe49
Update cx.config
gemgit7 May 14, 2020
33580a2
Update cx.config
gemgit7 May 14, 2020
21fd32f
Update cx.config
gemgit7 May 14, 2020
81a7eac
Update cx.config
gemgit7 May 14, 2020
4b20e27
Update cx.config
gemgit7 May 14, 2020
48f2e77
Update cx.config
gemgit7 May 14, 2020
0dd3196
Update HelloWorld.java
gemgit7 Aug 17, 2020
6b74477
Merge pull request #7 from gemgit7/develop
gemgit7 Aug 17, 2020
810250e
Update ExampleSupport.java
gemgit7 Aug 17, 2020
8c8d2f2
Rename cx.config to cx.config.old
gemgit7 Aug 17, 2020
be80504
Rename cx.config to cx.config.old
gemgit7 Aug 17, 2020
a415862
Merge pull request #8 from gemgit7/develop
gemgit7 Aug 17, 2020
ac7dde4
Create blank.yml
gemgit7 Sep 21, 2020
73f48f2
Update blank.yml
gemgit7 Sep 21, 2020
a8c7dfa
Update log4j2.xml
gemgit7 Sep 21, 2020
2699aa4
Update Login.java
gemgit7 Sep 28, 2020
b34bb44
Update README.md
gemgit7 Sep 28, 2020
f8ceef0
Delete blank.yml
gemgit7 Mar 15, 2021
71d53f7
Update LICENSE
gemgit7 Mar 15, 2021
4ace881
Update cx.config.old
gemgit7 Aug 23, 2021
c8b367c
Merge pull request #19 from gemgit7/demo
gemgit7 Aug 23, 2021
040a008
Update README.md
gemgit7 Aug 23, 2021
81f021d
Merge pull request #21 from gemgit7/featurex
gemgit7 Aug 23, 2021
fa7921d
Update README.md
gemgit7 Aug 23, 2021
e4f0bfc
Update README.md
gemgit7 Aug 23, 2021
a470aee
Update README.md
gemgit7 Aug 23, 2021
9a7d964
Update pom.xml
gemgit7 Sep 27, 2021
a69519a
Merge pull request #23 from gemgit7/sprint12
gemgit7 Sep 27, 2021
acf07e9
Update pom.xml
gemgit7 Sep 27, 2021
7c99187
Merge pull request #24 from gemgit7/sprint13
gemgit7 Sep 27, 2021
1d89803
Update pom.xml
gemgit7 Oct 20, 2021
b621386
Merge pull request #25 from gemgit7/sprint14
gemgit7 Oct 20, 2021
faf43ef
Update LICENSE
gemgit7 Mar 11, 2022
65f8130
Update LICENSE
gemgit7 Mar 11, 2022
2371c1a
Create cx.config
gemgit7 Mar 11, 2022
d0696b2
Update README.md
gemgit7 Mar 21, 2022
272bcc1
Update README.md
gemgit7 Mar 21, 2022
4ff9561
Update README.md
gemgit7 Mar 21, 2022
d29e0d6
Merge pull request #26 from gemgit7/mytest
gemgit7 Mar 21, 2022
759ca2b
Update README.md
gemgit7 Mar 21, 2022
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
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Damn Vulnerable Java Application

Testing PR event 2
## Quick Start

Install Docker and Docker Compose.
Expand All @@ -9,7 +9,7 @@ docker-compose up
```
Navigate to `http://localhost:8080`

To update image
To update images

```
docker-compose build
Expand Down
9 changes: 9 additions & 0 deletions cx.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"version": 1.0,
"project": "dvja-master",
"team": "/CxServer/Americas/Engineering",
"sast": {
"incremental": "false",
"forceScan": "true"
}
}
43 changes: 43 additions & 0 deletions cx.config.old
Original file line number Diff line number Diff line change
@@ -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": ["[email protected]"],
"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"]
}
}
}
}
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
build: .
depends_on:
- mysql
- another
ports:
- "8080:8080"
environment:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<name>dvja</name>

<properties>
<struts2.version>2.3.30</struts2.version>
<log4j2.version>2.3</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<struts2.version>2.4.30</struts2.version>
<log4j2.version>2.5</log4j2.version>
<project.build.sourceEncoding>UTF-9</project.build.sourceEncoding>
<spring.version>3.0.5.RELEASE</spring.version>
</properties>

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/appsecco/dvja/Constant.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

public class Constant {
public static String SESSION_USER_HANDLE = "USER";
int a = 2;
}
1 change: 1 addition & 0 deletions src/main/java/com/appsecco/dvja/services/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class UserService {
@PersistenceContext
public void setEntityManager(EntityManager em) {
this.entityManager = em;
// Test
}
public EntityManager getEntityManager() { return this.entityManager; }

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/appsecco/example/ExampleSupport.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@
* Base Action class for the Tutorial package.
*/
public class ExampleSupport extends ActionSupport {
int a = 3;
}
2 changes: 2 additions & 0 deletions src/main/java/com/appsecco/example/HelloWorld.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
*/
public class HelloWorld extends ExampleSupport {

// A comment
public String execute() throws Exception {
setMessage(getText(MESSAGE));
// Some change
return SUCCESS;
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/appsecco/example/Login.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -56,4 +57,4 @@ public void setPassword(String password) {
this.password = password;
}

}
}
4 changes: 2 additions & 2 deletions src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Configuration>
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
<PatternLayout pattyern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
</Console>
</Appenders>
<Loggers>
Expand All @@ -13,4 +13,4 @@
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
</Configuration>
</Configuration>