master

.gitignore

@@ -10,3 +10,6 @@ katana
 test.go
 vendor/*
 *.log
+teams/*
+teamcreds.txt
+lib/harbor/certs/*

Makefile

@@ -8,9 +8,7 @@ GOBIN := $(PROJECTROOT)/bin
 UTILDIR := $(PROJECTROOT)/scripts/utils
 SPINNER := $(UTILDIR)/spinner.sh
 BUILDIR := $(PROJECTROOT)/scripts/build
-CONTROLLER_MANIFEST:= $(PROJECTROOT)/manifests/dev/expose-controller.yml
-HELM_MANIFEST:= $(PROJECTROOT)/manifests/templates/helm-values.yml
-OPENVPN_MANIFEST:= $(PROJECTROOT)/manifests/templates/helm-values.yml
+MANIFEST:= $(PROJECTROOT)/kubernetes/manifests
 
 KEY_NAME := team
 
@@ -22,8 +20,6 @@ SERVICE_NAME_COMMAND =$(shell kubectl get svc --namespace $(OPENVPN_NAMESPACE) -
 SERVICE_IP_COMMAND=$(shell kubectl get svc --namespace $(OPENVPN_NAMESPACE) -l "app=openvpn,release=openvpn" -o jsonpath='{.items[0].status.loadBalancer.ingress[0].ip}')
 # CHALLENGE_DEPLOYER_IP :=  $(shell minikube service nginx-ingress-controller --url -n kube-system)
 
-CREATEBIN := $(shell [ ! -d ./bin ] && mkdir bin)
-
 # Make is verbose in Linux. Make it silent.
 MAKEFLAGS += --silent
 
@@ -40,7 +36,7 @@ build-cli:
 ## Lint the code
 install-golint:
 	@printf "🔨 Installing golint\n" 
-	@./scripts/install_golint.sh
+	@./scripts/install-golint.sh
 	@printf "👍 Done\n"
 
 ## Format the code
@@ -52,7 +48,7 @@ fmt:
 ## Check codebase for style mistakes
 lint: install-golint
 	@printf "🔨 Linting\n"
-	@golint ./...
+	@golangci-lint run
 	@printf "👍 Done\n"
 
 ## Clean build files
@@ -83,17 +79,23 @@ gen-certificates:
 	kubectl --namespace $(OPENVPN_NAMESPACE) exec -it $(POD_NAME) cat "/etc/openvpn/certs/pki/$(KEY_NAME)-$$n.ovpn" > $(KEY_NAME)-$$n.ovpn; \
 	done
 
-gen-vpn: set-env
-	helm install openvpn -f $(HELM_MANIFEST) stable/openvpn --namespace openvpn
-	minikube tunnel
-
-set-env:
+set-env: build
 	minikube start --driver=docker && \
 	minikube addons enable ingress  && \
-	kubectl apply -f $(CONTROLLER_MANIFEST) && \
-	sudo -- sh -c "echo \"$(minikube service nginx-ingress-controller --url -n kube-system | awk '{print substr($0,8)}' | awk '{print substr($0, 1, length($0)-6)}' | head -1)    challengedeployer.katana.local\" >> /etc/hosts" &&\
-	go build && \
-	./katana 
+	kubectl apply -f $(MANIFEST) && \
+	cp config.sample.toml config.toml && \
+	./bin/katana run
+
+set-env-prod: build
+	kubectl apply -f $(MANIFEST) && \
+	cp config.sample.toml config.toml && \
+	sudo ./bin/katana run
+
+build:
+	cd cmd && go build -o ../bin/katana
+
+run : build
+	sudo ./bin/katana run
 
 # Prints help message
 help:
@@ -106,5 +108,5 @@ help:
 	@echo "prepare-for-pr 	- Prepare the code for PR after fmt, lint and checking uncommitted files"
 	@echo "lint    			- Lint code using golangci-lint"
 	@echo "set-env" 		- Setup Katana environment  
-	@echo "gen-vpn"         - Generate VPN configurations
+	@echo "build"         	- Build katana binary
 

cmd/root.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"log"
+
 	"github.com/spf13/cobra"
 )
 
@@ -12,7 +14,9 @@ var rootCmd = &cobra.Command{
 	that streamlines the setup and management of attack-defence CTFs with automated infrastructure for
 	challenge dispatcher, VM deployer and flag juggler.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		cmd.Help()
+		if err := cmd.Help(); err != nil {
+			log.Printf("Failed to print cobra help: %s", err)
+		}
 	},
 }
 

cmd/run.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/sdslabs/katana/api"
+	"github.com/sdslabs/katana/services/master"
 	"github.com/spf13/cobra"
 )
 
@@ -25,7 +25,7 @@ var runCmd = &cobra.Command{
 		// }
 
 		// apiServer := api.Server()
-		return api.Server()
+		return master.Server()
 
 		// if err := g.Wait(); err != nil {
 		// 	os.Exit(1)

config.sample.toml

@@ -1,53 +1,56 @@
 kubeconfig = ""
-kubehost = "http://localhost"
+kubehost = "0.0.0.0"
+backendurl = "http://52.172.254.231:15528"
+rootdirectory = "/opt/katana"
 kubenamespace = "default"
-verbosity = 3
+timeout = 20 # in seconds
 
 [cluster]
 deploymentlabel = "katana"
-broadcastcount = 2
-broadcastlabel = "broadcast"
-teamcount = 3
+teamcount = 2
 teamlabel = "ctfteam"
-manifest_dir = "manifests/templates"
-manifests = [
-    "teams.yml",
-    "broadcast.yml",
-    "broadcast-service.yml",
-    "elasticsearch_svc.yml",
-    "elasticsearch_statefulset.yml",
-    "kibana.yml",
-    "fluentd-daemonset.yml",
-    "ingress.yml",
-    "openvpn.yml"
+templated_manifest_dir = "kubernetes/templates"
+templated_manifests = [
+    "storage-init.yml", # should be first and always present
+    "gogs.yml",
+    "mysql.yml",
+    "mongo.yml",
+    "harbor.yml",
 ]
 
 [services.api]
-host = "localhost"
-port = 3000
-
-[services.challengedeployer]
-host = "challengedeployer.katana.local"
-port = 8002
-broadcastport = 3003
-teamclientport = 3004
-challengeartifactlabel = "challfile"
+host = "0.0.0.0"
+port = 15528
 
 [teamvm]
+teampodname = "katana-team-master-pod"
+containername = "teamvm"
 challengedir = "/opt/challenges/"
 tmpdir = "/tmp/"
 initfile = "run.sh"
 daemonport = 3004
 
 [services.sshprovider]
-host = "localhost"
+host = "0.0.0.0"
 port = 2222
 creds_file = "teamcreds.txt"
 password_length = 10
 
 [mongo]
-url = "mongodb://scar:scar@localhost:27017/?authSource=admin"
+username = "adminuser"
+password = "password123"
+port = "32000"
+mongosh_version = "1.6.1"
+
+[mysql]
+username = "root"
+password = "test1234"
+port = "32001"
 
 [admin]
 username = "sdslabs"
 password = "sdslabs"
+
+[harbor]
+username = "admin"
+password = "Password12345" # NOTE: Password should be 8-128 characters long with at least 1 uppercase, 1 lowercase and 1 number

configs/parser.go

@@ -27,13 +27,15 @@ var (
 
 	ClusterConfig = KatanaConfig.Cluster
 
-	ChallengeDeployerConfig = ServicesConfig.ChallengeDeployer
-
 	SSHProviderConfig = ServicesConfig.SSHProvider
 
 	AdminConfig = KatanaConfig.AdminConfig
 
 	TeamVmConfig = KatanaConfig.TeamVmConfig
 
 	MongoConfig = KatanaConfig.Mongo
+
+	MySQLConfig = KatanaConfig.MySQL
+
+	HarborConfig = KatanaConfig.Harbor
 )

configs/types.go

@@ -6,21 +6,11 @@ type API struct {
 }
 
 type ClusterCfg struct {
-	DeploymentLabel string   `toml:"deploymentlabel"`
-	BroadcastCount  uint     `toml:"broadcastcount"`
-	BroadcastLabel  string   `toml:"broadcastlabel"`
-	TeamCount       uint     `toml:"teamcount"`
-	TeamLabel       string   `toml:"teamlabel"`
-	ManifestDir     string   `toml:"manifest_dir"`
-	Manifests       []string `toml:"manifests"`
-}
-
-type ChallengeDeployerCfg struct {
-	Host           string `toml:"host"`
-	Port           uint   `toml:"port"`
-	BroadcastPort  uint   `toml:"broadcastport"`
-	TeamClientPort uint   `toml:"teamclientport"`
-	ArtifactLabel  string `toml:"challengeartifactlabel"`
+	DeploymentLabel      string   `toml:"deploymentlabel"`
+	TeamCount            uint     `toml:"teamcount"`
+	TeamLabel            string   `toml:"teamlabel"`
+	TemplatedManifestDir string   `toml:"templated_manifest_dir"`
+	TemplatedManifests   []string `toml:"templated_manifests"`
 }
 
 type AdminCfg struct {
@@ -29,16 +19,17 @@ type AdminCfg struct {
 }
 
 type ServicesCfg struct {
-	API               API                  `toml:"api"`
-	ChallengeDeployer ChallengeDeployerCfg `toml:"challengedeployer"`
-	SSHProvider       SSHProviderCfg       `toml:"sshprovider"`
+	API         API            `toml:"api"`
+	SSHProvider SSHProviderCfg `toml:"sshprovider"`
 }
 
 type TeamChallengeConfig struct {
-	ChallengeDir string `toml:"challengedir"`
-	TempDir      string `toml:"tmpdir"`
-	InitFile     string `toml:"initfile"`
-	DaemonPort   uint   `toml:"daemonport"`
+	TeamPodName   string `toml:"teampodname"`
+	ContainerName string `toml:"containername"`
+	ChallengeDir  string `toml:"challengedir"`
+	TempDir       string `toml:"tmpdir"`
+	InitFile      string `toml:"initfile"`
+	DaemonPort    uint   `toml:"daemonport"`
 }
 
 type SSHProviderCfg struct {
@@ -49,11 +40,22 @@ type SSHProviderCfg struct {
 }
 
 type MongoCfg struct {
-	URL string `toml:"url"`
+	Username string `toml:"username"`
+	Password string `toml:"password"`
+	Port     string `toml:"port"`
+	Version  string `toml:"mongosh_version"`
+}
+
+type MySQLCfg struct {
+	Username string `toml:"username"`
+	Password string `toml:"password"`
+	Port     string `toml:"port"`
 }
 
 type KatanaCfg struct {
 	KubeHost      string              `toml:"kubehost"`
+	BackendUrl    string              `toml:"backendurl"`
+	RootDirectory string              `toml:"rootdirectory"`
 	KubeNameSpace string              `toml:"kubenamespace"`
 	KubeConfig    string              `toml:"kubeconfig"`
 	LogFile       string              `toml:"logfile"`
@@ -62,4 +64,12 @@ type KatanaCfg struct {
 	Mongo         MongoCfg            `toml:"mongo"`
 	TeamVmConfig  TeamChallengeConfig `toml:"teamvm"`
 	AdminConfig   AdminCfg            `toml:"admin"`
+	MySQL         MySQLCfg            `toml:"mysql"`
+	Harbor        HarborCfg           `toml:"harbor"`
+	TimeOut       int                 `toml:"timeout"`
+}
+
+type HarborCfg struct {
+	Username string `toml:"username"`
+	Password string `toml:"password"`
 }