update: Update some APIs

Author: fressive

server/router/api/v1/challenge_service.go

@@ -137,5 +137,60 @@ func GetFullChallenges(c echo.Context) error {
 		return PermissionDenied(&c)
 	}
 
-	return OKWithData(&c, game.Challenges)
+	challenges := game.Challenges
+	filtered := make([]*store.Challenge, 0)
+	for _, challenge := range challenges {
+		if !game.Visibility && !user.HasPrivilege(store.UserPrivilegeAdministrator) && !game.IsManager(user) {
+			continue
+		}
+		filtered = append(filtered, challenge)
+	}
+
+	return OKWithData(&c, filtered)
+}
+
+func GetChallengeStatus(c echo.Context) error {
+	ctx := c.(*context.CustomContext)
+	user, _ := GetUserFromToken(&c)
+
+	game_uuid := ctx.Param("game_uuid")
+	game, err := ctx.Store.GetGameByUUID(game_uuid)
+	if err != nil {
+		return Failed(&c, "Unable to fetch game")
+	}
+
+	if !game.Visibility && !user.HasPrivilege(store.UserPrivilegeAdministrator) && !game.IsManager(user) {
+		return PermissionDenied(&c)
+	}
+
+	challenges := game.Challenges
+	filtered := make([]*store.Challenge, 0)
+	for _, challenge := range challenges {
+		if !game.Visibility && !user.HasPrivilege(store.UserPrivilegeAdministrator) && !game.IsManager(user) {
+			continue
+		}
+		filtered = append(filtered, challenge)
+	}
+
+	resp := map[string]any{}
+
+	team := game.GetTeamByUser(ctx.Store, user)
+
+	for _, challenge := range filtered {
+		if challenge.IsSolvedBy(team, ctx.Store) {
+			resp[challenge.UUID] = map[string]any{
+				"solved":       true,
+				"score":        challenge.GetScore(team, ctx.Store),
+				"solved_count": challenge.GetSolvedCount(ctx.Store),
+			}
+		} else {
+			resp[challenge.UUID] = map[string]any{
+				"solved":       false,
+				"score":        0,
+				"solved_count": challenge.GetSolvedCount(ctx.Store),
+			}
+		}
+	}
+
+	return OKWithData(&c, resp)
 }

server/router/api/v1/team_service.go

@@ -77,3 +77,24 @@ func CreateTeam(c echo.Context) error {
 		"team_uuid": uuid,
 	})
 }
+
+func GetTeamScore(c echo.Context) error {
+	ctx := c.(*context.CustomContext)
+
+	user, _ := GetUserFromToken(&c)
+	game, err := ctx.Store.GetGameByUUID(ctx.Param("game_uuid"))
+	if err != nil || !(game.Visibility || user.HasPrivilege(store.UserPrivilegeAdministrator) || game.IsManager(user)) {
+		return Failed(&c, "Unable to fetch game")
+	}
+
+	team := game.GetTeamByUser(ctx.Store, user)
+
+	if team == nil {
+		return Failed(&c, "You are not in a team")
+	}
+
+	return OKWithData(&c, map[string]any{
+		"score": team.GetTeamScore(ctx.Store),
+		"rank":  team.GetTeamRank(ctx.Store),
+	})
+}

server/server.go

@@ -112,6 +112,7 @@ func registerRouter(s *Server) {
 	// teamApi.GET("", v1.GetTeams).Name = "get-teams"
 	// teamApi.GET("/:uuid", v1.GetTeam).Name = "get-team"
 	teamApi.POST("/create", v1.CreateTeam).Name = "create-team"
+	teamApi.GET("/score", v1.GetTeamScore).Name = "get-team-score"
 	// teamApi.POST("/:uuid/ban", v1.BanTeam).Name = "ban-team"
 
 	// Challenge APIs
@@ -122,7 +123,7 @@ func registerRouter(s *Server) {
 	challengeApi.POST("/create/container", v1.CreateContainer).Name = "create-test-container"
 	challengeApi.DELETE("/create/container/:container_uuid", v1.DisposeContainer).Name = "dispose-test-container"
 	challengeApi.POST("/:challenge_uuid/flag", v1.SubmitFlag).Name = "submit-flag"
-	challengeApi.POST("/:challenge_uuid/container/create", v1.CreateChallengeContainer).Name = "create-challenge-container"
+	challengeApi.GET("/status", v1.GetChallengeStatus).Name = "get-challenge-status"
 
 	// Container APIs
 	containerApi := challengeApi.Group("/:challenge_uuid/container")
@@ -198,7 +199,7 @@ func NewServer(ctx context.Context, config *config.Config, clientSet *kubernetes
 
 	registerRouter(s)
 
-	// TODO: frontend server register here
+	echoServer.Static("/", "public")
 
 	slog.Info(fmt.Sprintf("Hoshino web server is running on %s:%d.", config.Address, config.Port))
 	return s, nil

store/challenge.go

@@ -143,3 +143,15 @@ func (c *Challenge) IsSolvedBy(team *Team, s *Store) bool {
 	s.db.Model(Flag{}).Where("team_id = ? AND challenge_id = ? AND state >= 1", team.ID, c.ID).Count(&count)
 	return count > 0
 }
+
+func (c *Challenge) GetScore(team *Team, s *Store) int {
+	var score int
+	s.db.Model(Flag{}).Where("team_id = ? AND challenge_id = ? AND state >= 1", team.ID, c.ID).Select("score").First(&score)
+	return score
+}
+
+func (c *Challenge) GetSolvedCount(s *Store) int {
+	var count int64
+	s.db.Model(Flag{}).Where("challenge_id = ? AND state >= 1", c.ID).Count(&count)
+	return int(count)
+}

store/container.go

@@ -48,10 +48,7 @@ type Container struct {
 func (s *Store) CanCreateContainer(user *User) bool {
 	var count int64
 
-	s.db.Model(Container{}).Where(&Container{
-		Creator: user,
-		Status:  ContainerStatusRunning,
-	}).Count(&count)
+	s.db.Model(Container{}).Where("creator_id = ? AND status = 1").Count(&count)
 
 	max := s.GetSettingInt("max_container_per_user")
 

store/team.go

@@ -41,7 +41,7 @@ type Team struct {
 
 	// The team is under a game
 	GameID uint  `gorm:"not null" json:"-"`
-	Game   *Game `gorm:"foreignKey:GameID" json:"game"`
+	Game   *Game `gorm:"foreignKey:GameID" json:"-"`
 
 	// Is the team banned
 	Banned bool `gorm:"default:false" json:"banned"`
@@ -116,3 +116,15 @@ func (s *Store) GetTeamByUUID(uuid string) (*Team, error) {
 	err := s.db.Where("uuid = ?", uuid).First(&team).Error
 	return &team, err
 }
+
+func (t *Team) GetTeamScore(s *Store) int {
+	var score int
+	s.db.Model(Flag{}).Where("team_id = ? AND state >= 1", t.ID).Select("sum(score)").Row().Scan(&score)
+	return score
+}
+
+func (t *Team) GetTeamRank(s *Store) int64 {
+	var rank int64
+	s.db.Model(&Team{}).Where("game_id = ? AND (SELECT sum(score) FROM flags WHERE team_id = teams.id AND state >= 1) > ?", t.GameID, t.GetTeamScore(s)).Count(&rank)
+	return rank + 1
+}