Skip to content

Ctf #66

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 30, 2022
Merged

Ctf #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a252e3b
fixes for a lot of things
commjoen Sep 30, 2022
a7bcb3e
Fixes , introducing version .98
commjoen Sep 30, 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
2 changes: 1 addition & 1 deletion aws/build-an-deploy-aws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ wait
DEFAULT_PASSWORD=thankyou
#TODO: REWRITE ABOVE, REWRITE THE HARDCODED DEPLOYMENT VALS INTO VALUES AND OVERRIDE THEM HERE!
echo "default password is ${DEFAULT_PASSWORD}"
helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.95aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"
helm upgrade --install mj ../helm/wrongsecrets-ctf-party --set="imagePullPolicy=Always" --set="balancer.env.K8S_ENV=aws" --set"balancer.env.IRSA_ROLE=arn:aws:iam::${ACCOUNT_ID}:role/wrongsecrets-secret-manager" --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${DEFAULT_PASSWORD}" --set="balancer.cookie.cookieParserSecret=thisisanewrandomvaluesowecanworkatit" --set="balancer.repository=jeroenwillemsen/wrongsecrets-balancer" --set="balancer.tag=0.98aws" --set="balancer.replicas=4" --set="wrongsecretsCleanup.repository=jeroenwillemsen/wrongsecrets-ctf-cleaner" --set="wrongsecretsCleanup.tag=0.2"
2 changes: 1 addition & 1 deletion helm/wrongsecrets-ctf-party/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ balancer:
# -- Set this to a fixed random alpa-numeric string (recommended length 24 chars). If not set this get randomly generated with every helm upgrade, each rotation invalidates all active cookies / sessions requirering users to login again.
cookieParserSecret: null
repository: jeroenwillemsen/wrongsecrets-balancer
tag: 0.95aws
tag: 0.98aws
# -- Number of replicas of the wrongsecrets-balancer deployment
replicas: 1
service:
Expand Down
4 changes: 2 additions & 2 deletions wrongsecrets-balancer/src/kubernetes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const createConfigmapForTeam = async (team) => {
const configmap = {
apiVersion: 'v1',
data: {
'funny.entry': 'thisIsK8SConfigMap',
'funny.entry': 'helloCTF-configmap',
},
kind: 'ConfigMap',
metadata: {
Expand All @@ -80,7 +80,7 @@ const createSecretsfileForTeam = async (team) => {
const secret = {
apiVersion: 'v1',
data: {
funnier: 'dGhpcyBpcyBhcGFzc3dvcmQ=',
funnier: 'RmxhZzogYXJlIHlvdSBoYXZpbmcgZnVuIHlldD8K',
},
kind: 'Secret',
type: 'Opaque',
Expand Down
8 changes: 7 additions & 1 deletion wrongsecrets-balancer/ui/src/cards/InstanceRestartingCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,18 @@ export const InstanceRestartingCard = ({ teamname }) => {
/>
</span>
</CenteredText>
<LinkButton data-test-id="start-hacking-button" href="/">
<LinkButton data-test-id="start-hacking-button" href="/" target="_blank">
<FormattedMessage
id="instance_status_back_to_hacking"
defaultMessage="Get back to Hacking"
/>
</LinkButton>
<LinkButton data-test-id="start-desktop-button" href="/?desktop" target="_blank">
<FormattedMessage
id="instance_status_start_vm"
defaultMessage="Start your Webtop, might require refresh"
/>
</LinkButton>
</BodyCard>
);
} else {
Expand Down