Merge pull request #1 from asteurer/main

renaming some things

Dockerfile

@@ -0,0 +1,8 @@
+FROM golang
+
+COPY main.go go.mod go.sum ./
+
+RUN go mod download && \
+    go build -o main main.go
+
+ENTRYPOINT [ "./main" ]

Makefile

@@ -1,15 +1,15 @@
 .PHONY: build push exec_db install uninstall
 # Builds the docker image of the database client and tags it
 build:
-	docker build . -f app.Dockerfile -t ghcr.io/kube-hack/sql-injection
+	docker build . -t ghcr.io/kube-hack/sql-injection
 
 # Pushes the docker image to a container registry
 push:
 	docker push ghcr.io/kube-hack/sql-injection
 
 # Execs user into the database to test SQL commands
 exec_db:
-	kubectl exec -it $$(kubectl get pods | awk '/postgres-db/ {print $$1}') -- psql -U postgres
+	kubectl exec -it $$(kubectl get pods | awk '/db-sql-injection/ {print $$1}') -- psql -U postgres
 
 # Installs the helm chart
 install:

README.md

@@ -47,7 +47,7 @@ helm install sql-injection kube-hack/sql-injection
 ### Port-forward the application
 
 ```sh
-kubectl port-forward svc/postgres-client 3000:3000
+kubectl port-forward svc/client-sql-injection 3000:3000
 ```
 
 After the application is port-forwarded (accessible via localhost), you can run the below actions:

chart/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
 name: sql-injection
-description: A chart that installs a PostgreSQL database with a database client has SQL injection vulnerabilities.
+description: A chart that deploys a PostgreSQL database with a database client that has SQL injection vulnerabilities.
 type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0

chart/templates/client.yaml

@@ -1,39 +1,39 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: postgres-client
+  name: client-sql-injection
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: postgres-client
+      app: client-sql-injection
   template:
     metadata:
       labels:
-        app: postgres-client
+        app: client-sql-injection
     spec:
       containers:
-        - name: postgres-client
+        - name: client-sql-injection
           image: ghcr.io/kube-hack/sql-injection:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
           envFrom:
             - configMapRef:
-                name: postgres-secret
+                name: creds-db-sql-injection
 
 ---
 
 apiVersion: v1
 kind: Service
 metadata:
-  name: postgres-client
+  name: client-sql-injection
   labels:
-    app: postgres-client
+    app: client-sql-injection
 spec:
   type: ClusterIP
   ports:
     - port: 3000
       targetPort: 8080
   selector:
-    app: postgres-client
+    app: client-sql-injection

chart/templates/postgres.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: postgres-secret
+  name: creds-db-sql-injection
   labels:
-    app: postgres
+    app: creds-db-sql-injection
 data:
   POSTGRES_USER: "{{ .Values.postgres.user }}"
   POSTGRES_PASSWORD: "{{ .Values.postgres.password }}"
@@ -14,7 +14,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: postgres-sql-schema
+  name: schema-db-sql-injection
 data:
   schema.sql: {{ .Files.Get "files/schema.sql" | indent 4 }}
 
@@ -23,26 +23,26 @@ data:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: postgres-db
+  name: db-sql-injection
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: postgres-db
+      app: db-sql-injection
   template:
     metadata:
       labels:
-        app: postgres-db
+        app: db-sql-injection
     spec:
       containers:
-        - name: postgres-db
+        - name: db-sql-injection
           image: postgres
           imagePullPolicy: Always
           ports:
             - containerPort: 5432
           envFrom:
             - configMapRef:
-                name: postgres-secret
+                name: creds-db-sql-injection
           volumeMounts:
             - mountPath: /docker-entrypoint-initdb.d/
               name: schema-volume
@@ -56,20 +56,20 @@ spec:
       volumes:
         - name: schema-volume
           configMap:
-            name: postgres-sql-schema
+            name: schema-db-sql-injection
 
 ---
 
 apiVersion: v1
 kind: Service
 metadata:
-  name: postgres-db
+  name: db-sql-injection
   labels:
-    app: postgres-db
+    app: db-sql-injection
 spec:
   type: ClusterIP
   ports:
     - port: 5432
       targetPort: 5432
   selector:
-    app: postgres-db
+    app: db-sql-injection

chart/values.yaml

@@ -2,4 +2,4 @@ postgres:
   user: postgres
   database: postgres
   password: postgres
-  host: postgres-db.default.svc.cluster.local:5432
+  host: db-sql-injection.default.svc.cluster.local:5432

go.mod

@@ -1,4 +1,4 @@
-module github.com/asteurer/kh-sql-injection
+module sql-injection
 
 go 1.22.4