Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/org.webjars-bootstrap-5.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
commjoen authored Oct 11, 2023
2 parents 59f7cf7 + ea40319 commit 156cc29
Show file tree
Hide file tree
Showing 17 changed files with 649 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,7 @@ node_modules
cypress/videos
cypress/screenshots
cypress/downloads
py_env
tmp/
.env
contributors_file*
9 changes: 5 additions & 4 deletions Dockerfile_webdesktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ RUN \

WORKDIR /config/Desktop

COPY src/main/resources/executables/*linux* /config/Desktop/wrongsecrets/
COPY src/main/resources/executables/decrypt /config/Desktop/wrongsecrets/
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /config/Desktop/wrongsecrets/
COPY src/main/resources/executables/*linux* /var/tmp/wrongsecrets/
COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/
COPY src/main/resources/executables/secrchallenge.md /var/tmp/wrongsecrets/
COPY src/main/resources/executables/secrchallenge.json /var/tmp/wrongsecrets/
COPY src/test/resources/alibabacreds.kdbx /var/tmp/helpers/
COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/

RUN sudo chown abc /var/tmp/wrongsecrets

COPY wrongsecret-desktop-resources/startwm.sh /defaults/startwm.sh
6 changes: 4 additions & 2 deletions Dockerfile_webdesktopk8s
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ RUN echo "**** clone wrongsecrets.git for webtop in k8s ****" && \
WORKDIR /config/Desktop

COPY src/main/resources/executables/*linux* /var/tmp/wrongsecrets/
COPY src/main/resources/executables/decrypt /config/Desktop/wrongsecrets/
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /config/Desktop/wrongsecrets/
COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/
COPY src/main/resources/executables/secrchallenge.md /var/tmp/wrongsecrets/
COPY src/main/resources/executables/secrchallenge.json /var/tmp/wrongsecrets/
COPY src/test/resources/alibabacreds.kdbx /var/tmp/helpers/
COPY src/test/resources/alibabacreds.kdbx /var/tmp/wrongsecrets/
COPY wrongsecret-desktop-resources/welcome.md /var/tmp/wrongsecrets/
Expand Down
12 changes: 12 additions & 0 deletions scripts/sort_contibutors/Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
requests = "*"

[dev-packages]

[requires]
python_version = "3.11"
150 changes: 150 additions & 0 deletions scripts/sort_contibutors/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
1 change: 1 addition & 0 deletions scripts/sort_contibutors/contributors_file.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<html><head></head><><h1>Top contributors</h1><ul><li><a href='https://www.github.com/commjoen'>Jeroen Willemsen @commjoen</a></li><li><a href='https://www.github.com/J12934'>Jannik Hollenbach @J12934</a></li><li><a href='https://www.github.com/bendehaan'>Ben de Haan @bendehaan</a></li><li><a href='https://www.github.com/puneeth072003'>Puneeth @puneeth072003</a></li><li><a href='https://www.github.com/RemakingEden'>Joss Sparkes @RemakingEden</a></li></ul><h1>Contributors</h1><ul><li><a href='https://www.github.com/nbaars'>Nanne Baars @nbaars</a></li><li><a href='https://www.github.com/drnow4u'>Marcin Nowak @drnow4u</a></li><li><a href='https://www.github.com/osamamagdy'>Osama Magdy @osamamagdy</a></li><li><a href='https://www.github.com/roddas'>Rodolfo Cabral Neves @roddas</a></li><li><a href='https://www.github.com/Novice-expert'>None @Novice-expert</a></li><li><a href='https://www.github.com/tiborhercz'>Tibor Hercz @tiborhercz</a></li><li><a href='https://www.github.com/benno001'>Ben de Haan @benno001</a></li><li><a href='https://www.github.com/neatzsche'>None @neatzsche</a></li><li><a href='https://www.github.com/diamant3'>Diamond Rivero @diamant3</a></li><li><a href='https://www.github.com/DerGut'>Jannik Steinmann @DerGut</a></li><li><a href='https://www.github.com/rseedorff'>Robert Felber @rseedorff</a></li><li><a href='https://www.github.com/bkimminich'>Björn Kimminich @bkimminich</a></li><li><a href='https://www.github.com/fchyla'>Filip Chyla @fchyla</a></li><li><a href='https://www.github.com/scornelissen85'>S Cornelissen @scornelissen85</a></li><li><a href='https://www.github.com/adarsh-a-tw'>Adarsh A @adarsh-a-tw</a></li><li><a href='https://www.github.com/Dlitosh'>Dmitry Litosh @Dlitosh</a></li><li><a href='https://www.github.com/turjoc120'>Turjo Chowdhury @turjoc120</a></li><li><a href='https://www.github.com/tghosth'>Josh Grossman @tghosth</a></li><li><a href='https://www.github.com/sydseter'>Johan Sydseter @sydseter</a></li><li><a href='https://www.github.com/troygerber'>Troy @troygerber</a></li><li><a href='https://www.github.com/skandix'>hx @skandix</a></li><li><a href='https://www.github.com/madhuakula'>Madhu Akula @madhuakula</a></li><li><a href='https://www.github.com/mikewoudenberg'>Mike Woudenberg @mikewoudenberg</a></li><li><a href='https://www.github.com/northdpole'>Spyros @northdpole</a></li><li><a href='https://www.github.com/RubenAtBinx'>None @RubenAtBinx</a></li><li><a href='https://www.github.com/djvinnie'>Vineeth Jagadeesh @djvinnie</a></li><li><a href='https://www.github.com/blucas-accela'>Brian Lucas @blucas-accela</a></li><li><a href='https://www.github.com/nickmalcolm'>Nick Malcolm @nickmalcolm</a></li><li><a href='https://www.github.com/orangecola'>None @orangecola</a></li><li><a href='https://www.github.com/stefan-schaermeli'>Stefan Schärmeli @stefan-schaermeli</a></li><li><a href='https://www.github.com/fwijnholds'>Filip Wijnholds @fwijnholds</a></li><li><a href='https://www.github.com/alex-bender'>Alex Bender @alex-bender</a></li><li><a href='https://www.github.com/nhumblot'>Nicolas Humblot @nhumblot</a></li><li><a href='https://www.github.com/kingthorin'>Rick M @kingthorin</a></li><li><a href='https://www.github.com/szh'>Shlomo Zalman Heigh @szh</a></li><li><a href='https://www.github.com/f3rn0s'>f3rn0s @f3rn0s</a></li></ul><h1>Testers</h1><ul><li><a href='https://www.github.com/davevs'>Dave van Stein @davevs</a></li><li><a href='https://www.github.com/drnow4u'>Marcin Nowak @drnow4u</a></li><li><a href='https://www.github.com/mchangsp'>Marc Chang Sing Pang @mchangsp</a></li><li><a href='https://www.github.com/djvinnie'>Vineeth Jagadeesh @djvinnie</a></li></ul><h1>Special thanks</h1><ul><li><a href='https://www.github.com/madhuakula'>Madhu Akula @madhuakula @madhuakula</a></li><li><a href='https://www.github.com/bkimminich'>Björn Kimminich @bkimminich</a></li><li><a href='https://www.github.com/devsecops'>Dan Gora @devsecops</a></li><li><a href='https://www.github.com/saragluna'>Xiaolu Dai @saragluna</a></li><li><a href='https://www.github.com/jonathanGiles'>Jonathan Giles @jonathanGiles</a></li></ul></body><html>
57 changes: 57 additions & 0 deletions scripts/sort_contibutors/contributors_file.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Top contributors
- [Jeroen Willemsen @commjoen](https://www.github.com/commjoen)
- [Jannik Hollenbach @J12934](https://www.github.com/J12934)
- [Ben de Haan @bendehaan](https://www.github.com/bendehaan)
- [Puneeth @puneeth072003](https://www.github.com/puneeth072003)
- [Joss Sparkes @RemakingEden](https://www.github.com/RemakingEden)

Contributors
- [Nanne Baars @nbaars](https://www.github.com/nbaars)
- [Marcin Nowak @drnow4u](https://www.github.com/drnow4u)
- [Osama Magdy @osamamagdy](https://www.github.com/osamamagdy)
- [Rodolfo Cabral Neves @roddas](https://www.github.com/roddas)
- [None @Novice-expert](https://www.github.com/Novice-expert)
- [Tibor Hercz @tiborhercz](https://www.github.com/tiborhercz)
- [Ben de Haan @benno001](https://www.github.com/benno001)
- [None @neatzsche](https://www.github.com/neatzsche)
- [Diamond Rivero @diamant3](https://www.github.com/diamant3)
- [Jannik Steinmann @DerGut](https://www.github.com/DerGut)
- [Robert Felber @rseedorff](https://www.github.com/rseedorff)
- [Björn Kimminich @bkimminich](https://www.github.com/bkimminich)
- [Filip Chyla @fchyla](https://www.github.com/fchyla)
- [S Cornelissen @scornelissen85](https://www.github.com/scornelissen85)
- [Adarsh A @adarsh-a-tw](https://www.github.com/adarsh-a-tw)
- [Dmitry Litosh @Dlitosh](https://www.github.com/Dlitosh)
- [Turjo Chowdhury @turjoc120](https://www.github.com/turjoc120)
- [Josh Grossman @tghosth](https://www.github.com/tghosth)
- [Johan Sydseter @sydseter](https://www.github.com/sydseter)
- [Troy @troygerber](https://www.github.com/troygerber)
- [hx @skandix](https://www.github.com/skandix)
- [Madhu Akula @madhuakula](https://www.github.com/madhuakula)
- [Mike Woudenberg @mikewoudenberg](https://www.github.com/mikewoudenberg)
- [Spyros @northdpole](https://www.github.com/northdpole)
- [None @RubenAtBinx](https://www.github.com/RubenAtBinx)
- [Vineeth Jagadeesh @djvinnie](https://www.github.com/djvinnie)
- [Brian Lucas @blucas-accela](https://www.github.com/blucas-accela)
- [Nick Malcolm @nickmalcolm](https://www.github.com/nickmalcolm)
- [None @orangecola](https://www.github.com/orangecola)
- [Stefan Schärmeli @stefan-schaermeli](https://www.github.com/stefan-schaermeli)
- [Filip Wijnholds @fwijnholds](https://www.github.com/fwijnholds)
- [Alex Bender @alex-bender](https://www.github.com/alex-bender)
- [Nicolas Humblot @nhumblot](https://www.github.com/nhumblot)
- [Rick M @kingthorin](https://www.github.com/kingthorin)
- [Shlomo Zalman Heigh @szh](https://www.github.com/szh)
- [f3rn0s @f3rn0s](https://www.github.com/f3rn0s)

Testers
- [Dave van Stein @davevs](https://www.github.com/davevs)
- [Marcin Nowak @drnow4u](https://www.github.com/drnow4u)
- [Marc Chang Sing Pang @mchangsp](https://www.github.com/mchangsp)
- [Vineeth Jagadeesh @djvinnie](https://www.github.com/djvinnie)

Special thanks
- [Madhu Akula @madhuakula @madhuakula](https://www.github.com/madhuakula)
- [Björn Kimminich @bkimminich](https://www.github.com/bkimminich)
- [Dan Gora @devsecops](https://www.github.com/devsecops)
- [Xiaolu Dai @saragluna](https://www.github.com/saragluna)
- [Jonathan Giles @jonathanGiles](https://www.github.com/jonathanGiles)
Loading

0 comments on commit 156cc29

Please sign in to comment.