fic/server
1
0
Fork 0
Code Issues Pull Requests 10 Releases Wiki Activity

admin: Import from cyberrange handles UUID

Browse Source
This commit is contained in:
nemunaire 2025-03-30 15:44:48 +02:00
parent f6713c768b
commit 21752d1ca2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/api/team.go
View File

@ -339,7 +339,7 @@ func importTeamsFromCyberrange(c *gin.Context) {
} }
defer src.Close() defer src.Close()
var ut []fic.CyberrangeTeam var ut []fic.CyberrangeTeamBase
err = json.NewDecoder(src).Decode(&fic.CyberrangeAPIResponse{Data: &ut}) err = json.NewDecoder(src).Decode(&fic.CyberrangeAPIResponse{Data: &ut})
if err != nil { if err != nil {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()}) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()})
@ -355,7 +355,7 @@ func importTeamsFromCyberrange(c *gin.Context) {
for _, crteam := range ut { for _, crteam := range ut {
var exist_team *fic.Team var exist_team *fic.Team
for _, team := range teams { for _, team := range teams {
if team.Name == crteam.Name && team.ExternalId == crteam.UUID { if team.Name == crteam.Name || team.ExternalId == crteam.UUID {
exist_team = team exist_team = team
break break
} }

8
libfic/cyberrange.go
View File

@ -10,6 +10,14 @@ type CyberrangeAPIResponse struct {
Total int `json:"total"` Total int `json:"total"`
} }
type CyberrangeTeamBase struct {
UUID string `json:"uuid"`
Members []CyberrangeTeamMember `json:"members"`
Name string `json:"name"`
Score int64 `json:"score"`
Rank int `json:"rank"`
}
type CyberrangeTeam struct { type CyberrangeTeam struct {
UUID string `json:"session_uuid"` UUID string `json:"session_uuid"`
Members []CyberrangeTeamMember `json:"members"` Members []CyberrangeTeamMember `json:"members"`