-
Notifications
You must be signed in to change notification settings - Fork 0
Major updates #8
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
base: main
Are you sure you want to change the base?
Conversation
Ported all debian and ubuntu based images to use the archival services. In addition, all containers were switched from the docker-hashes to timestamped images to give challenge authors a better feeling of how old/new the image is.
I updated the pwn debian 12.11 template to debian 12.12. Since the minor version changed, I renamed the folder do not include it. Since this change might spark some discussion, this is a seperate commit
All minor versions have been updated, the table listing the versions in the readme-md has been updated and .version has been updated.
…ives' into yctf_v2
This Commit adds file-extensions for files that are not binaries (e.g. python or bash-files). This was done because file-extensions are present for other challenges aswell (e.g. the solidity or php template). This closes #4
I accidentay removed too much in ecd71ba, this commit adds it back in
This PR adds tempaltes for docker-compose-files that can be included in the dist. We are currently missing support from the makefile.
I had a copy-paste error in the manifest for the connection info.
removed old flag.txt, added new entrypoint to write the flag into a file and start nsjail.
In all non-jail templates, all references to flag.txt have been removed in the challenge subdirectory and the flag is being read from the environment
Added a tempalte that dynamically gegerates challenge dists
|
The manifest for |
|
Great work! Will take a look at the changes today :) One question: |
h4ckd0tm3
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good so far, a few minor changes.
Regarding the solutions:
Might be that we need to rework the "find_flag" function again.
Hammer will provide the expected flag as env and I opted for a regex that matches generic flags as a fallback. Also open for input on that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Further supporting the fact that this should be it's own repository I think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Are we keeping the Makefiles now?
I am currently working non finishing the test command for hammer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we keeping the Makefiles now?
The preferred method of testing going forward should (IMO) be hammer.
Since the makefiles are stripped down so much, we could offer them as a "alternative" to hammer.
The only issue is that the RARGS and the actual parameters that hammer uses may get out of sync.
But if the Makefiles aren't that popular among challenge creators, we can just remove them.
|
|
||
| echo $FLAG > /jail/flag.txt | ||
| cat /jail/flag.txt | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| unset FLAG |
| @@ -1,2 +1,2 @@ | |||
| #!/bin/sh | |||
| /usr/bin/stdbuf -i0 -o0 -e0 /app/challenge | |||
| /usr/bin/stdbuf -i0 -o0 -e0 /app/challenge.bash | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Flag is never copied into the file.
| /usr/bin/stdbuf -i0 -o0 -e0 /app/challenge.bash | |
| echo $FLAG > /flag.txt | |
| unset FLAG | |
| /usr/bin/stdbuf -i0 -o0 -e0 /app/challenge.bash |
| RUN chmod +x /app/challenge | ||
| COPY challenge.bash /app/challenge.bash | ||
| RUN chmod +x /app/challenge.bash | ||
| COPY flag.txt /flag.txt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove flag copy, as flag.txt does not exist anymore.
Moved to entrypoint.sh
| COPY flag.txt /flag.txt |
| function: linear | ||
|
|
||
| connectinfo: >- | ||
| <code>snicat {{ infos['challenge_container']['1337']['hostname'] }}</code><br> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| <code>snicat {{ infos['challenge_container']['1337']['hostname'] }}</code><br> | |
| <a href="{{ infos['challenge_container']['1337']['hostname'] }}" target=_blank>{{ infos['challenge_container']['1337']['hostname'] }}</a> |
|
|
||
| connectinfo: >- | ||
| <code>snicat {{ infos['challenge_container']['1337']['hostname'] }}</code><br> | ||
| We recommend using <a href="https://github.com/CTFd/snicat" target="_blank">snicat</a> to connect to the challenge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| We recommend using <a href="https://github.com/CTFd/snicat" target="_blank">snicat</a> to connect to the challenge. |
|
|
||
| echo $FLAG > /jail/flag.txt | ||
| cat /jail/flag.txt | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| unset FLAG |
|
|
||
| echo $FLAG > /jail/flag.txt | ||
| cat /jail/flag.txt | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| unset FLAG |
|
|
||
| echo $FLAG > /jail/flag.txt | ||
| cat /jail/flag.txt | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| unset FLAG |
|
Hey, thanks for the review.
Ah, I didn't know that. In this case, let's use your default and your regex. |
Hey, this PR adds/changes the following
There are unfortunately a lot of changes in this PR.
We could also split it up into multiple PRs in order to make it easier to review.