Merge pull request #41 from aau-network-security/develop

Develop to master

database/query.go

@@ -13,7 +13,8 @@ var (
 		"started_at timestamp, " +
 		"finish_expected timestamp, " +
 		"finished_at timestamp," +
-		"createdBy text);"
+		"createdBy text," +
+		"onlyVPN boolean);"
 
 	CreateTeamsTable = "CREATE TABLE IF NOT EXISTS Team(" +
 		"id serial primary key, " +
@@ -29,8 +30,8 @@ var (
 	AddTeamQuery = "INSERT INTO team (tag, event_id, email, name, password, created_at, last_access, solved_challenges)" +
 		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8)"
 
-	AddEventQuery = "INSERT INTO event (tag, name, available, capacity, frontends, status, exercises, started_at, finish_expected, finished_at, createdby)" +
-		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,$11)"
+	AddEventQuery = "INSERT INTO event (tag, name, available, capacity, frontends, status, exercises, started_at, finish_expected, finished_at, createdby, onlyvpn)" +
+		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,$11,$12)"
 
 	UpdateCloseEvent  = "UPDATE event SET tag = $2, finished_at = $3 WHERE tag = $1"
 	UpdateEventStatus = "UPDATE event SET status = $2 WHERE tag = $1 "

database/store.go

@@ -92,7 +92,7 @@ func (s *store) AddEvent(in *pb.AddEventRequest) (string, error) {
 	finishTime, _ := time.Parse(TimeFormat, in.FinishedAt)
 	expectedFinishTime, _ := time.Parse(TimeFormat, in.ExpectedFinishTime)
 
-	_, err := s.db.Exec(AddEventQuery, in.Tag, in.Name, in.Available, in.Capacity, in.Frontends, in.Status, in.Exercises, startTime, expectedFinishTime, finishTime, in.CreatedBy)
+	_, err := s.db.Exec(AddEventQuery, in.Tag, in.Name, in.Available, in.Capacity, in.Frontends, in.Status, in.Exercises, startTime, expectedFinishTime, finishTime, in.CreatedBy, in.OnlyVPN)
 
 	if err != nil {
 		return "", err
@@ -328,7 +328,7 @@ func parseEvents(rows *sql.Rows) ([]model.Event, error) {
 	for rows.Next() {
 		event := new(model.Event)
 		err := rows.Scan(&event.Id, &event.Tag, &event.Name, &event.Available, &event.Capacity, &event.Status, &event.Frontends,
-			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy)
+			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN)
 		if err != nil && !strings.Contains(err.Error(), handleNullConversionError) {
 			return nil, err
 		}

database/store_test.go

@@ -213,6 +213,7 @@ func TestAddEvent(t *testing.T) {
 		Status:             1,
 		ExpectedFinishTime: "2020-05-21 14:35:01",
 		FinishedAt:         "0001-01-01 00:00:00", // it means that event is not finished yet
+		OnlyVPN:            false,
 	}
 
 	resp, err := c.AddEvent(context.Background(), &req)

database/timeline.go

@@ -72,7 +72,7 @@ func getEvents(db *sql.DB) []model.Event {
 	for r.Next() {
 		event := new(model.Event)
 		err := r.Scan(&event.Id, &event.Tag, &event.Name, &event.Available, &event.Capacity, &event.Status, &event.Frontends,
-			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy)
+			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN)
 		if err != nil && !strings.Contains(err.Error(), "Null conversion error ") {
 			log.Fatalf("Error on scanning query %v", err)
 		}

database/timeline_test.go

@@ -57,7 +57,7 @@ func insertTeamEvent(eid int, db *sql.DB) error {
 }
 
 func insertFakeEvent(event fakeEvent, db *sql.DB) error {
-	_, err := db.Exec(AddEventQuery, event.tag, "", event.available, event.capacity, "kali", 1, "ftp,sql", event.sT.UTC(), event.fT.UTC(), time.Date(0001, 01, 01, 00, 00, 00, 0000, time.UTC).Format(time.RFC3339), "tester")
+	_, err := db.Exec(AddEventQuery, event.tag, "", event.available, event.capacity, "kali", 1, "ftp,sql", event.sT.UTC(), event.fT.UTC(), time.Date(0001, 01, 01, 00, 00, 00, 0000, time.UTC).Format(time.RFC3339), "tester", false)
 	if err != nil {
 		return err
 	}
@@ -212,6 +212,7 @@ func TestGetEvents(t *testing.T) {
 		ExpectedFinishTime: expectedFinishTime.Format(time.RFC3339),
 		FinishedAt:         time.Date(0001, 01, 01, 00, 00, 00, 0000, time.UTC).Format(time.RFC3339),
 		CreatedBy:          "tester",
+		OnlyVPN:            false,
 	}}
 
 	if got := getEvents(db); !reflect.DeepEqual(got, events) {

docker-compose-dev.yml

@@ -0,0 +1,37 @@
+version: '3'
+services:
+  server:
+    container_name: server
+    env_file:
+      - .env
+    build: .
+    ports:
+      - 50051:50051
+    restart: on-failure
+    depends_on:
+      - postgres-db
+    volumes:
+      - ${CERTS_PATH}:/certs:ro  # in production, change this CERTS_PATH to your certificate files folder
+      - ${CONFIG_PATH}:/config.yml:ro  # mount config file
+    networks:
+      - internal
+
+  postgres-db:
+    image: postgres:alpine
+    container_name: postgres
+    command: postgres
+    env_file:
+      - .env
+    ports:
+      - '5432:5432'
+    volumes:
+      - data:/var/lib/postgresql/data
+    networks:
+      - internal
+
+# Networks to be created to facilitate communication between containers
+volumes:
+  data:
+networks:
+  internal:
+    driver: bridge

docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - internal
 
   postgres-db:
-    image: postgres:9.6.18-alpine
+    image: postgres:alpine
     container_name: postgres
     command: postgres -c config_file=/etc/postgresql/postgresql.conf -c logging_collector=on -c log_destination=stderr -c log_directory=/logs
     env_file:

model/model.go

@@ -13,6 +13,7 @@ type Event struct {
 	ExpectedFinishTime string
 	FinishedAt         string
 	CreatedBy          string
+	OnlyVPN            bool
 }
 
 type Team struct {