Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: IRS-Cybersec/ctf_platform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.6.5
Choose a base ref
...
head repository: IRS-Cybersec/ctf_platform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 48,397 additions and 18,296 deletions.
  1. +47 −0 .github/workflows/container-api-publish.yml
  2. +47 −0 .github/workflows/container-client-publish.yml
  3. +2 −1 .gitignore
  4. BIN 1.jpg
  5. BIN 3.jpg
  6. BIN 4.jpg
  7. BIN 5.jpg
  8. BIN 6.jpg
  9. +730 −0 AlternativeClientFiles/Scoreboard/DoubleTable/Scoreboard.js
  10. +1 −0 CONTRIBUTING.md
  11. 0 LICENSE
  12. +57 −20 README.md
  13. +2 −0 api/.dockerignore
  14. +12 −0 api/Dockerfile
  15. +2 −1,117 api/README.md
  16. +271 −1,019 api/api.js
  17. +0 −103 api/challs.bson
  18. +596 −0 api/controllers/Accounts.js
  19. +83 −0 api/controllers/Announcements.js
  20. +1,092 −0 api/controllers/Challenges.js
  21. +254 −0 api/controllers/Emails.js
  22. +273 −0 api/controllers/Misc.js
  23. +79 −0 api/controllers/Scoreboard.js
  24. +183 −0 api/controllers/Sockets.js
  25. +230 −0 api/controllers/Submissions.js
  26. +397 −0 api/controllers/Teams.js
  27. +19 −0 api/middlewares/authentication.js
  28. +77 −0 api/middlewares/errorHandling.js
  29. +3,522 −560 api/package-lock.json
  30. +19 −9 api/package.json
  31. +0 −47 api/transactions.bson
  32. +0 −31 api/users.bson
  33. +97 −0 api/utils/createTransactionsCache.js
  34. +48 −0 api/utils/mongoDB.js
  35. +68 −0 api/utils/permissionUtils.js
  36. +120 −0 api/utils/startupChecks.js
  37. +184 −0 api/utils/validators.js
  38. +2 −0 client/.dockerignore
  39. +33 −0 client/Dockerfile
  40. +5 −5 client/README.md
  41. +12 −10 client/config-overrides.js
  42. BIN client/default.webp
  43. BIN client/defaultCatPhoto.webp
  44. +91 −0 client/nginx.conf
  45. +30,325 −11,043 client/package-lock.json
  46. +32 −26 client/package.json
  47. +15 −37 client/public/index.html
  48. +199 −0 client/src/AdminPanel/admin.js
  49. +302 −187 client/src/{ → AdminPanel}/adminChallengeCreate.js
  50. +333 −197 client/src/{ → AdminPanel}/adminChallengeEdit.js
  51. +877 −0 client/src/AdminPanel/adminChallenges.js
  52. +323 −0 client/src/AdminPanel/adminEmails.js
  53. +465 −0 client/src/AdminPanel/adminManageAnnouncements.js
  54. +683 −0 client/src/AdminPanel/adminSubmissions.js
  55. +1,141 −0 client/src/AdminPanel/adminUsers.js
  56. +280 −43 client/src/App.css
  57. +231 −147 client/src/App.js
  58. +1 −0 client/src/App.min.css
  59. +0 −9 client/src/App.test.js
  60. +395 −0 client/src/Challenges/challenges.js
  61. +844 −0 client/src/Challenges/challengesTagSort.js
  62. +65 −30 client/src/{ → Challenges}/challengesTagSortList.js
  63. +7 −0 client/src/Components/DatePicker.js
  64. +587 −0 client/src/Login/login.js
  65. +41 −0 client/src/Login/login.test.js
  66. +27 −0 client/src/Misc/MarkdownRenderer.js
  67. +109 −0 client/src/Misc/home.js
  68. +30 −0 client/src/Misc/oops.js
  69. +125 −123 client/src/{ → Misc}/userChallengeCreate.js
  70. +0 −342 client/src/Scoreboard.js
  71. +633 −0 client/src/Scoreboard/Scoreboard.js
  72. +504 −0 client/src/SidebarDropdown/Settings.js
  73. +633 −0 client/src/SidebarDropdown/Teams.js
  74. +270 −0 client/src/SidebarDropdown/profile.js
  75. +0 −135 client/src/admin.js
  76. +0 −367 client/src/adminChallenges.js
  77. +0 −108 client/src/adminSubmissions.js
  78. +0 −341 client/src/adminUsers.js
  79. +0 −29 client/src/announcements.js
  80. +1 −0 client/src/assets/blood.svg
  81. BIN client/src/assets/catPhoto1.jpg
  82. BIN client/src/assets/challenges_bg.jpg
  83. BIN client/src/assets/login_photo.jpg
  84. BIN client/src/assets/mainBG.png
  85. BIN client/src/assets/mainBG.webp
  86. BIN client/src/assets/profile.jpg
  87. +191 −0 client/src/assets/sieberrsec_ctf.svg
  88. +0 −312 client/src/challenges.js
  89. +0 −595 client/src/challengesCategory.js
  90. +0 −551 client/src/challengesTagSort.js
  91. +0 −47 client/src/home.js
  92. +0 −13 client/src/index.css
  93. +0 −1 client/src/index.js
  94. +0 −247 client/src/login.js
  95. +0 −7 client/src/logo.svg
  96. +0 −34 client/src/oops.js
  97. +0 −402 client/src/profile.js
  98. +8 −0 client/src/setupTests.js
  99. +0 −1 client/src/sieberrsec_ctf.svg
  100. +25 −0 ctf_platform.conf
  101. BIN demo_assets/1.jpg
  102. BIN { → demo_assets}/2.jpg
  103. BIN demo_assets/3.jpg
  104. BIN demo_assets/4.jpg
  105. BIN demo_assets/5.jpg
  106. BIN demo_assets/6.jpg
  107. BIN { → demo_assets}/7.jpg
  108. BIN demo_assets/8.jpg
  109. BIN demo_assets/9.jpg
  110. BIN demo_assets/demo2.gif
  111. +40 −0 docker-compose.yml
47 changes: 47 additions & 0 deletions .github/workflows/container-api-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Publishes the API server to GHCR

on:
push:
tags:
- '**'

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_api

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: ./api
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
47 changes: 47 additions & 0 deletions .github/workflows/container-client-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Publishes the client files to GHCR

on:
push:
tags:
- '**'

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_client

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: ./client
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vscode
node_modules
lc
lc
uploads
Binary file removed 1.jpg
Binary file not shown.
Binary file removed 3.jpg
Binary file not shown.
Binary file removed 4.jpg
Binary file not shown.
Binary file removed 5.jpg
Binary file not shown.
Binary file removed 6.jpg
Binary file not shown.
Loading