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

Develop

database/query.go

@@ -14,7 +14,8 @@ var (
 		"finish_expected timestamp, " +
 		"finished_at timestamp," +
 		"createdBy text," +
-		"onlyVPN boolean);"
+		"onlyVPN boolean," +
+		"secretKey text);"
 
 	CreateTeamsTable = "CREATE TABLE IF NOT EXISTS Team(" +
 		"id serial primary key, " +
@@ -30,8 +31,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, onlyvpn)" +
-		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,$11,$12)"
+	AddEventQuery = "INSERT INTO event (tag, name, available, capacity, frontends, status, exercises, started_at, finish_expected, finished_at, createdby, onlyvpn,secretKey)" +
+		"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,$11,$12,$13)"
 
 	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, in.OnlyVPN)
+	_, 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, in.SecretKey)
 
 	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.OnlyVPN)
+			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN, &event.SecretKey)
 		if err != nil && !strings.Contains(err.Error(), handleNullConversionError) {
 			return nil, err
 		}

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.OnlyVPN)
+			&event.Exercises, &event.StartedAt, &event.ExpectedFinishTime, &event.FinishedAt, &event.CreatedBy, &event.OnlyVPN, &event.SecretKey)
 		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", false)
+	_, 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
 	}
@@ -213,6 +213,7 @@ func TestGetEvents(t *testing.T) {
 		FinishedAt:         time.Date(0001, 01, 01, 00, 00, 00, 0000, time.UTC).Format(time.RFC3339),
 		CreatedBy:          "tester",
 		OnlyVPN:            false,
+		SecretKey:          "",
 	}}
 
 	if got := getEvents(db); !reflect.DeepEqual(got, events) {

model/model.go

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

proto/store.proto

@@ -87,6 +87,7 @@ message AddEventRequest{
     int32 status = 10;
     string createdBy = 11;
     bool onlyVPN = 12;
+    string secretKey = 13;
 }
 
 message AddTeamRequest{
@@ -116,6 +117,7 @@ message GetEventResponse{
         int32 status = 10;
         string createdBy =11;
         bool onlyVPN = 12;
+        string secretKey = 13;
     }
     repeated Events events = 1;
     string errorMessage = 2;