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

Christos alexandros dardampounis #9

Open
wants to merge 89 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
e36883b
Hide Generic Secret
chrisdardas Dec 17, 2024
b287544
Fixed duplicates in test\api\dataExportApiSpec.ts
kounsolas Dec 17, 2024
36b659f
Update gitignore
chrisdardas Dec 17, 2024
76d17a1
Fixed some duplicates
kounsolas Dec 17, 2024
bdae3b2
Hide Generic Secret
chrisdardas Dec 17, 2024
cca6a0d
Merge pull request #1 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
cc39f94
Update chatBotSpects.ts
bekouvas Dec 17, 2024
1cddc6f
Merge pull request #2 from chrisdardas/Chris-Kounsolas
kounsolas Dec 17, 2024
e539b3f
Merge pull request #3 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
486b01e
Fixed a security issue and removed duplicate code
chrisdardas Dec 17, 2024
9d2721e
Hid more JWT tokens
chrisdardas Dec 17, 2024
2507f9b
Merge pull request #4 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
02d803c
Fixed Possible SQL injection and duplicate code
chrisdardas Dec 17, 2024
0ed3970
Merge pull request #5 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
7faaad2
Fixed possible SQL injection in search
chrisdardas Dec 17, 2024
22a3816
Merge pull request #6 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
a190740
Violations fixing
bekouvas Dec 17, 2024
5c897db
Merge pull request #7 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
d5224a4
Fixing Violations
bekouvas Dec 17, 2024
e6fcddd
Merge pull request #8 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
0535d85
Update insecurity.ts
bekouvas Dec 17, 2024
23344d5
Merge pull request #9 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
528f5d5
Update noUpdate.ts
kounsolas Dec 17, 2024
c52bdca
Trying to fix some violations
chrisdardas Dec 17, 2024
5be8692
Update webhook.ts
kounsolas Dec 17, 2024
4498682
Merge pull request #10 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
636366c
commit changes in some duplicates
tanikara Dec 17, 2024
21bb86e
Merge pull request #11 from chrisdardas/Tania-Karagiannidi
tanikara Dec 17, 2024
1881263
Update fileUpload.ts
kounsolas Dec 17, 2024
82091f0
Merge pull request #12 from chrisdardas/Chris-Kounsolas
kounsolas Dec 17, 2024
b99edb3
Update languages.ts
kounsolas Dec 17, 2024
851b881
Update utils.ts
bekouvas Dec 17, 2024
a9e5163
Merge pull request #13 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
88c58c0
Update insecurity.ts
bekouvas Dec 17, 2024
427f794
Merge branch 'main' into Vasiliki-Bekou
bekouvas Dec 17, 2024
7ed67f6
Merge pull request #14 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 17, 2024
a53c81d
fixing violetions (usage of any)
tanikara Dec 17, 2024
f078a4e
Merge branch 'main' into Tania-Karagiannidi
tanikara Dec 17, 2024
712133c
Merge pull request #15 from chrisdardas/Tania-Karagiannidi
tanikara Dec 17, 2024
a9a1c02
Update order.ts
kounsolas Dec 17, 2024
fdef06d
Merge pull request #16 from chrisdardas/Chris-Kounsolas
kounsolas Dec 17, 2024
b8ac3db
Security testing for DDoS
chrisdardas Dec 17, 2024
2823cb2
Merge pull request #17 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 17, 2024
77f203c
Merge pull request #18 from chrisdardas/main
chrisdardas Dec 17, 2024
80e2190
Merge pull request #19 from chrisdardas/main
bekouvas Dec 17, 2024
3a8e2fa
Merge pull request #20 from chrisdardas/main
kounsolas Dec 17, 2024
0bc517c
Merge pull request #21 from chrisdardas/main
tanikara Dec 17, 2024
8018b3b
Fixing Regular expressions vulnerabilities
chrisdardas Dec 18, 2024
b2db3a5
Merge pull request #22 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
639100a
commit changes in configValidationSpec
tanikara Dec 18, 2024
abb77cb
cookie valnerability
kounsolas Dec 18, 2024
b3bce9f
Merge pull request #23 from chrisdardas/Tania-Karagiannidi
tanikara Dec 18, 2024
1b886e1
Merge pull request #24 from chrisdardas/Chris-Kounsolas
kounsolas Dec 18, 2024
7c6a611
Attempting to fix more security errors
chrisdardas Dec 18, 2024
5adfa3e
Merge pull request #25 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
38df77a
Fixed some valnerabilities
kounsolas Dec 18, 2024
4767ea1
Minor fixes
chrisdardas Dec 18, 2024
7600fa9
Merge pull request #27 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
08bbb5b
Update polyfills.ts
bekouvas Dec 18, 2024
0e06691
Merge pull request #28 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 18, 2024
00908c2
Fixed some valnerabilities
kounsolas Dec 18, 2024
cb2b614
update quantityApiSpec
tanikara Dec 18, 2024
6a0ea21
Merge pull request #29 from chrisdardas/Tania-Karagiannidi
tanikara Dec 18, 2024
f692cbd
Update test.ts
bekouvas Dec 18, 2024
c9d00b5
Resolved merge conflicts
kounsolas Dec 18, 2024
a958c27
update deliveryApiSpec.ts
tanikara Dec 18, 2024
1325c15
Merge pull request #30 from chrisdardas/Vasiliki-Bekou
bekouvas Dec 18, 2024
e505768
Merge branch 'main' of https://github.com/chrisdardas/juice-shop
kounsolas Dec 18, 2024
52a8463
Merge branch 'main' into Tania-Karagiannidi
tanikara Dec 18, 2024
b098acb
Merge pull request #31 from chrisdardas/Tania-Karagiannidi
tanikara Dec 18, 2024
399537c
Small security fixes
chrisdardas Dec 18, 2024
3f86929
Minor Fixes
chrisdardas Dec 18, 2024
683b840
Fixed some valnerabilities
kounsolas Dec 18, 2024
6aeb507
Resolved conflicts and merged Chris-Kounsolas into main
kounsolas Dec 18, 2024
0f23404
Update server.ts
kounsolas Dec 18, 2024
6dfcc84
Merge pull request #35 from chrisdardas/Chris-Kounsolas
kounsolas Dec 18, 2024
4b0926f
Update codingChallenges.ts
kounsolas Dec 18, 2024
7f0384e
Resolved conflicts and merged Chris-Kounsolas into main
kounsolas Dec 18, 2024
77fdd6b
Revert "Update codingChallenges.ts"
kounsolas Dec 18, 2024
9e0c5ac
Merge pull request #37 from chrisdardas/revert-36-Chris-Kounsolas
kounsolas Dec 18, 2024
e0bac49
Minor security fixes
chrisdardas Dec 18, 2024
1f73bfd
Update insecurity.ts
chrisdardas Dec 18, 2024
b344be9
Merge branch 'main' into Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
67e866e
Merge pull request #40 from chrisdardas/Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
e200511
update routes/2fa
tanikara Dec 18, 2024
9365c75
Merge pull request #41 from chrisdardas/Tania-Karagiannidi
tanikara Dec 18, 2024
0ea4469
Fixed some duplicates
chrisdardas Dec 18, 2024
676dcd1
Merge branch 'Christos-Alexandros-Dardampounis' of https://github.com…
chrisdardas Dec 18, 2024
67d3de4
Merge branch 'main' into Christos-Alexandros-Dardampounis
chrisdardas Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
56 changes: 28 additions & 28 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
version: "2"
plugins:
fixme:
enabled: true
duplication:
enabled: true
checks:
file-lines:
config:
threshold: 300
method-lines:
config:
threshold: 30
method-complexity:
config:
threshold: 7
similar-code:
enabled: false
identical-code:
enabled: false
exclude_patterns:
- 'Gruntfile.js'
- '**/*conf.js'
- 'data/datacreator.ts'
- 'frontend/src/hacking-instructor/**/*.ts'
- 'frontend/src/assets/private/*.js'
- 'lib/logger.ts'
- 'lib/config.types.ts'
version: "2"
plugins:
fixme:
enabled: true
duplication:
enabled: true
checks:
file-lines:
config:
threshold: 300
method-lines:
config:
threshold: 30
method-complexity:
config:
threshold: 7
similar-code:
enabled: false
identical-code:
enabled: false
exclude_patterns:
- 'Gruntfile.js'
- '**/*conf.js'
- 'data/datacreator.ts'
- 'frontend/src/hacking-instructor/**/*.ts'
- 'frontend/src/assets/private/*.js'
- 'lib/logger.ts'
- 'lib/config.types.ts'
62 changes: 31 additions & 31 deletions .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
version: 1
update_configs:
- package_manager: "javascript"
directory: "/"
update_schedule: "live"
target_branch: "develop"
default_reviewers:
- "bkimminich"
default_labels:
- "dependencies"
ignored_updates:
- match:
dependency_name: "express-jwt"
version_requirement: "0.1.3"
- match:
dependency_name: "sanitize-html"
version_requirement: "1.4.2"
- match:
dependency_name: "unzipper"
version_requirement: "0.9.15"
- match:
dependency_name: "jsonwebtoken"
version_requirement: "0.4.0"
- package_manager: "javascript"
directory: "/frontend"
update_schedule: "live"
target_branch: "develop"
default_reviewers:
- "bkimminich"
default_labels:
- "dependencies"
version: 1
update_configs:
- package_manager: "javascript"
directory: "/"
update_schedule: "live"
target_branch: "develop"
default_reviewers:
- "bkimminich"
default_labels:
- "dependencies"
ignored_updates:
- match:
dependency_name: "express-jwt"
version_requirement: "0.1.3"
- match:
dependency_name: "sanitize-html"
version_requirement: "1.4.2"
- match:
dependency_name: "unzipper"
version_requirement: "0.9.15"
- match:
dependency_name: "jsonwebtoken"
version_requirement: "0.4.0"
- package_manager: "javascript"
directory: "/frontend"
update_schedule: "live"
target_branch: "develop"
default_reviewers:
- "bkimminich"
default_labels:
- "dependencies"
26 changes: 13 additions & 13 deletions .devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"extensions": [
"eg2.vscode-npm-script",
"angular.ng-template",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint"
],
"settings": {
"eslint.workingDirectories": [
{ "mode": "auto" }
]
},
"postCreateCommand": "export NG_CLI_ANALYTICS=ci && export NG_FORCE_TTY=false && npm i -g @angular/cli && npm install && unset NG_FORCE_TTY"
{
"extensions": [
"eg2.vscode-npm-script",
"angular.ng-template",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint"
],
"settings": {
"eslint.workingDirectories": [
{ "mode": "auto" }
]
},
"postCreateCommand": "export NG_CLI_ANALYTICS=ci && export NG_FORCE_TTY=false && npm i -g @angular/cli && npm install && unset NG_FORCE_TTY"
}
34 changes: 17 additions & 17 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.git/
monitoring/
node_modules/
screenshots/
test/
build/reports/
dist/
vagrant/
logs/
Dockerfile
.npmrc
/bom.json
/bom.xml

# Pattern is *not covered* by node_modules/ above no matter what IntelliJ says!
frontend/node_modules/
frontend/dist/
.git/
monitoring/
node_modules/
screenshots/
test/
build/reports/
dist/
vagrant/
logs/
Dockerfile
.npmrc
/bom.json
/bom.xml
# Pattern is *not covered* by node_modules/ above no matter what IntelliJ says!
frontend/node_modules/
frontend/dist/
86 changes: 43 additions & 43 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
/*
* Copyright (c) 2014-2024 Bjoern Kimminich & the OWASP Juice Shop contributors.
* SPDX-License-Identifier: MIT
*/

module.exports = {
extends: 'standard-with-typescript',
env: {
browser: true,
node: true,
jasmine: true,
mocha: true,
jest: true
},
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly'
},
parserOptions: {
ecmaVersion: 2018,
project: './tsconfig.json'
},
ignorePatterns: [
'.eslintrc.js',
'app/private/**',
'vagrant/**',
'frontend/**',
'dist/**'
],
overrides: [
{
files: ['**/*.ts'],
parser: '@typescript-eslint/parser',
rules: {
'no-void': 'off', // conflicting with recommendation from @typescript-eslint/no-floating-promises
// FIXME warnings below this line need to be checked and fixed.
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/strict-boolean-expressions': 'off',
'@typescript-eslint/no-var-requires': 'off'
}
}
]
}
/*
* Copyright (c) 2014-2024 Bjoern Kimminich & the OWASP Juice Shop contributors.
* SPDX-License-Identifier: MIT
*/
module.exports = {
extends: 'standard-with-typescript',
env: {
browser: true,
node: true,
jasmine: true,
mocha: true,
jest: true
},
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly'
},
parserOptions: {
ecmaVersion: 2018,
project: './tsconfig.json'
},
ignorePatterns: [
'.eslintrc.js',
'app/private/**',
'vagrant/**',
'frontend/**',
'dist/**'
],
overrides: [
{
files: ['**/*.ts'],
parser: '@typescript-eslint/parser',
rules: {
'no-void': 'off', // conflicting with recommendation from @typescript-eslint/no-floating-promises
// FIXME warnings below this line need to be checked and fixed.
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/strict-boolean-expressions': 'off',
'@typescript-eslint/no-var-requires': 'off'
}
}
]
}
Loading