chore(readme): update readme challenge

Signed-off-by: Gabriel Mocanu <gabi.mocanu98@gmail.com>

Author: gabrielmocanu

chapters/web-application-security/web-basics/drills/readme/README.md

@@ -4,7 +4,7 @@ Web: Web basics and browser security model: Readme
 
 ## Description
 
-Get the flag from [readme](http://141.85.224.118:8092/readme/).
+Get the flag from [readme](http://141.85.224.101:30013/readme/).
 
 Score: 25
 

chapters/web-application-security/web-basics/drills/readme/deploy/Dockerfile

@@ -1,3 +1,9 @@
+FROM php:7.2-apache AS builder
+
+ARG FLAG
+COPY src/index.template.html /tmp/index.template.html
+RUN sed "s/__TEMPLATE__/${FLAG}/g" /tmp/index.template.html > /tmp/index.html
+
 FROM php:7.2-apache
 
-COPY /src /var/www/html/readme/
+COPY --from=builder /tmp/index.html /var/www/html/readme/index.html

chapters/web-application-security/web-basics/drills/readme/deploy/Makefile

@@ -1,6 +1,28 @@
-EXTERNAL_PORT := 8092
+EXTERNAL_PORT := 30013
+INTERNAL_PORT := 80
 IMG_NAME := sss-web-01_readme
-FILE_TEMPLATE := ../src/index.template.html
-FILE_SRC := ../src/index.html
+CONT_NAME := ${IMG_NAME}
+FLAG_FILE := ../flag
 
-include activity.mk
+ifndef CONT_NAME
+$(error You need to set a name for IMG_NAME variable(e.g. sss-web-01_activity-name).)
+endif
+
+ifndef EXTERNAL_PORT
+$(error You need to set EXTERNAL_PORT variable.)
+endif
+
+run: build
+	docker run -d -p $(EXTERNAL_PORT):$(INTERNAL_PORT) --name $(CONT_NAME) -t $(IMG_NAME)
+
+build:
+	docker build --build-arg FLAG="$$(cat $(FLAG_FILE))" -t $(IMG_NAME) -f Dockerfile ..
+
+stop:
+	docker stop $(CONT_NAME)
+
+clean: stop
+	docker rm $(IMG_NAME)
+	docker image rm $(IMG_NAME):latest
+
+.PHONY: run build stop clean

chapters/web-application-security/web-basics/drills/readme/deploy/values.yaml

@@ -0,0 +1,25 @@
+namespace: web-basics
+
+challenge:
+  name: readme
+  category: web-basics
+
+image:
+  repository: sss-web-01_readme
+  tag: latest
+  pullPolicy: IfNotPresent
+
+replicaCount: 1
+
+containerPort: 80
+
+service:
+  type: NodePort
+  port: 80
+  nodePort: 30013
+
+healthCheck:
+  enabled: true
+  path: /readme/
+  initialDelaySeconds: 5
+  periodSeconds: 10

chapters/web-application-security/web-basics/drills/readme/sol/solution.sh

@@ -1,14 +1,12 @@
 #!/bin/bash
-PORT=8092
+PORT=30013
 
-if [[ $1 == "local" ]]
-then
-    url='http://127.0.0.1:'$PORT
-elif [[ $1 == "remote" ]] && [[ -z $2 ]] 
-then
-    url='http://141.85.224.118:'$PORT
+if [[ $1 == "local" ]]; then
+  url='http://127.0.0.1:'$PORT
+elif [[ $1 == "remote" ]] && [[ -z $2 ]]; then
+  url='http://141.85.224.101:'$PORT
 else
-    url=$1':'$2
+  url=$1':'$2
 fi
 
 # Readme