backend: add an identifier to each treated file
This commit is contained in:
parent
9693940d8c
commit
6ad11e49d5
5 changed files with 78 additions and 43 deletions
|
@ -1,9 +1,12 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"srs.epita.fr/fic-server/libfic"
|
"srs.epita.fr/fic-server/libfic"
|
||||||
|
@ -14,29 +17,35 @@ type wantChoices struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func treatWantChoices(pathname string, team fic.Team) {
|
func treatWantChoices(pathname string, team fic.Team) {
|
||||||
|
// Generate a unique identifier to follow the request in logs
|
||||||
|
bid := make([]byte, 5)
|
||||||
|
binary.LittleEndian.PutUint32(bid, rand.Uint32())
|
||||||
|
id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
|
||||||
|
log.Println(id, "New wantChoices receive", pathname)
|
||||||
|
|
||||||
var ask wantChoices
|
var ask wantChoices
|
||||||
|
|
||||||
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
|
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if ask.FlagId == 0 {
|
} else if ask.FlagId == 0 {
|
||||||
log.Println("[WRN] Invalid content in wantChoices file: ", pathname)
|
log.Printf("%s [WRN] Invalid content in wantChoices file: %s\n", id, pathname)
|
||||||
os.Remove(pathname)
|
os.Remove(pathname)
|
||||||
} else if flag, err := fic.GetFlagKey(ask.FlagId); err != nil {
|
} else if flag, err := fic.GetFlagKey(ask.FlagId); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if !team.CanSeeFlag(flag) {
|
} else if !team.CanSeeFlag(flag) {
|
||||||
log.Println("[!!!] The team asks to display choices whereas it doesn't have access to the flag")
|
log.Printf("%s [!!!] The team asks to display choices whereas it doesn't have access to the flag\n", id)
|
||||||
} else if exercice, err := flag.GetExercice(); err != nil {
|
} else if exercice, err := flag.GetExercice(); err != nil {
|
||||||
log.Println("[ERR] Unable to retrieve the flag's underlying exercice:", err)
|
log.Printf("%s [ERR] Unable to retrieve the flag's underlying exercice: %s\n", id, err)
|
||||||
} else if !team.HasAccess(exercice) {
|
} else if !team.HasAccess(exercice) {
|
||||||
log.Println("[!!!] The team asks to display choices whereas it doesn't have access to the exercice")
|
log.Printf("%s [!!!] The team asks to display choices whereas it doesn't have access to the exercice\n", id)
|
||||||
} else if err = team.DisplayChoices(flag); err != nil {
|
} else if err = team.DisplayChoices(flag); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else {
|
} else {
|
||||||
genTeamQueue <- &team
|
genTeamQueue <- &team
|
||||||
if err = os.Remove(pathname); err != nil {
|
if err = os.Remove(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"srs.epita.fr/fic-server/libfic"
|
"srs.epita.fr/fic-server/libfic"
|
||||||
|
@ -15,37 +18,43 @@ type askOpenHint struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func treatOpeningHint(pathname string, team fic.Team) {
|
func treatOpeningHint(pathname string, team fic.Team) {
|
||||||
|
// Generate a unique identifier to follow the request in logs
|
||||||
|
bid := make([]byte, 5)
|
||||||
|
binary.LittleEndian.PutUint32(bid, rand.Uint32())
|
||||||
|
id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
|
||||||
|
log.Println(id, "New openingHint receive", pathname)
|
||||||
|
|
||||||
var ask askOpenHint
|
var ask askOpenHint
|
||||||
|
|
||||||
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
|
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if ask.HintId == 0 {
|
} else if ask.HintId == 0 {
|
||||||
log.Println("[WRN] Invalid content in hint file: ", pathname)
|
log.Printf("%s [WRN] Invalid content in hint file: %s\n", id, pathname)
|
||||||
os.Remove(pathname)
|
os.Remove(pathname)
|
||||||
} else if hint, err := fic.GetHint(ask.HintId); err != nil {
|
} else if hint, err := fic.GetHint(ask.HintId); err != nil {
|
||||||
log.Println("[ERR] Unable to retrieve the given hint:", err)
|
log.Printf("%s [ERR] Unable to retrieve the given hint: %s\n", id, err)
|
||||||
} else if exercice, err := hint.GetExercice(); err != nil {
|
} else if exercice, err := hint.GetExercice(); err != nil {
|
||||||
log.Println("[ERR] Unable to retrieve the hint's underlying exercice:", err)
|
log.Printf("%s [ERR] Unable to retrieve the hint's underlying exercice: %s\n", id, err)
|
||||||
} else if !team.HasAccess(exercice) {
|
} else if !team.HasAccess(exercice) {
|
||||||
log.Println("[!!!] The team asks to open an hint whereas it doesn't have access to the exercice")
|
log.Printf("%s [!!!] The team asks to open an hint whereas it doesn't have access to the exercice\n", id)
|
||||||
} else if err = team.OpenHint(hint); err != nil {
|
} else if err = team.OpenHint(hint); err != nil {
|
||||||
log.Println("[ERR] Unable to open hint", err)
|
log.Printf("%s [ERR] Unable to open hint: %s\n", id, err)
|
||||||
} else {
|
} else {
|
||||||
// Write event
|
// Write event
|
||||||
if lvl, err := exercice.GetLevel(); err != nil {
|
if lvl, err := exercice.GetLevel(); err != nil {
|
||||||
log.Println("[WRN]", err)
|
log.Printf("%s [WRN] %s\n", id, err)
|
||||||
} else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil {
|
} else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil {
|
||||||
log.Println("[WRN]", err)
|
log.Printf("%s [WRN] %s\n", id, err)
|
||||||
} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s !", team.Name, lvl, theme.Name), "info"); err != nil {
|
} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s !", team.Name, lvl, theme.Name), "info"); err != nil {
|
||||||
log.Println("[WRN] Unable to create event:", err)
|
log.Printf("%s [WRN] Unable to create event: %s\n", id, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
genTeamQueue <- &team
|
genTeamQueue <- &team
|
||||||
appendGenQueue(genStruct{Type: GenEvents})
|
appendGenQueue(genStruct{Type: GenEvents})
|
||||||
if err = os.Remove(pathname); err != nil {
|
if err = os.Remove(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -169,17 +169,17 @@ func treat(raw_path string) {
|
||||||
|
|
||||||
if teamid, err = strconv.ParseInt(spath[1], 10, 64); err != nil {
|
if teamid, err = strconv.ParseInt(spath[1], 10, 64); err != nil {
|
||||||
if lnk, err := os.Readlink(path.Join(TeamsDir, spath[1])); err != nil {
|
if lnk, err := os.Readlink(path.Join(TeamsDir, spath[1])); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("[ERR] Unable to readlink %q: %s\n", path.Join(TeamsDir, spath[1]), err)
|
||||||
return
|
return
|
||||||
} else if teamid, err = strconv.ParseInt(lnk, 10, 64); err != nil {
|
} else if teamid, err = strconv.ParseInt(lnk, 10, 64); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("[ERR] Error during ParseInt team %q: %s\n", lnk, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var team fic.Team
|
var team fic.Team
|
||||||
if team, err = fic.GetTeam(teamid); err != nil {
|
if team, err = fic.GetTeam(teamid); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("[ERR] Unable to retrieve team %d: %s\n", teamid, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
@ -23,7 +25,7 @@ type uTeamRegistration struct {
|
||||||
Members []fic.Member
|
Members []fic.Member
|
||||||
}
|
}
|
||||||
|
|
||||||
func registrationProcess(team fic.Team, members []fic.Member, team_id string) {
|
func registrationProcess(id string, team fic.Team, members []fic.Member, team_id string) {
|
||||||
for _, m := range members {
|
for _, m := range members {
|
||||||
// Force Id to 0, as it shouldn't have been defined yet
|
// Force Id to 0, as it shouldn't have been defined yet
|
||||||
m.Id = 0
|
m.Id = 0
|
||||||
|
@ -36,10 +38,10 @@ func registrationProcess(team fic.Team, members []fic.Member, team_id string) {
|
||||||
|
|
||||||
// Create team directories into TEAMS
|
// Create team directories into TEAMS
|
||||||
if err := os.MkdirAll(path.Join(TeamsDir, teamDirPath), 0777); err != nil {
|
if err := os.MkdirAll(path.Join(TeamsDir, teamDirPath), 0777); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Println(id, "[ERR]", err)
|
||||||
}
|
}
|
||||||
if err := os.Symlink(teamDirPath, path.Join(TeamsDir, team_id)); err != nil {
|
if err := os.Symlink(teamDirPath, path.Join(TeamsDir, team_id)); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Println(id, "[ERR]", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
genTeamQueue <- &team
|
genTeamQueue <- &team
|
||||||
|
@ -47,39 +49,45 @@ func registrationProcess(team fic.Team, members []fic.Member, team_id string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func treatRegistration(pathname string, team_id string) {
|
func treatRegistration(pathname string, team_id string) {
|
||||||
|
// Generate a unique identifier to follow the request in logs
|
||||||
|
bid := make([]byte, 5)
|
||||||
|
binary.LittleEndian.PutUint32(bid, rand.Uint32())
|
||||||
|
id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
|
||||||
|
log.Println(id, "New registration receive", pathname)
|
||||||
|
|
||||||
var nTeam uTeamRegistration
|
var nTeam uTeamRegistration
|
||||||
|
|
||||||
if !allowRegistration {
|
if !allowRegistration {
|
||||||
log.Println("[ERR] Registration received, whereas disabled. Skipped.")
|
log.Printf("%s [ERR] Registration received, whereas disabled. Skipped.\n", id)
|
||||||
} else if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
} else if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if err := json.Unmarshal(cnt_raw, &nTeam); err != nil {
|
} else if err := json.Unmarshal(cnt_raw, &nTeam); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if nTeam.JTeam > 0 {
|
} else if nTeam.JTeam > 0 {
|
||||||
if !canJoinTeam {
|
if !canJoinTeam {
|
||||||
log.Println("[ERR] Join team received, whereas disabled. Skipped.")
|
log.Printf("%s [ERR] Join team received, whereas disabled. Skipped.\n", id)
|
||||||
} else if len(nTeam.Members) != 1 {
|
} else if len(nTeam.Members) != 1 {
|
||||||
log.Printf("[ERR] Join team received, with incorrect member length: %d. Skipped.\n", len(nTeam.Members))
|
log.Printf("%s [ERR] Join team received, with incorrect member length: %d. Skipped.\n", id, len(nTeam.Members))
|
||||||
} else if team, err := fic.GetTeam(nTeam.JTeam); err != nil {
|
} else if team, err := fic.GetTeam(nTeam.JTeam); err != nil {
|
||||||
log.Printf("[ERR] Unable to join registered team %s: %s\n", nTeam.JTeam, err)
|
log.Printf("%s [ERR] Unable to join registered team %d: %s\n", id, nTeam.JTeam, err)
|
||||||
} else {
|
} else {
|
||||||
registrationProcess(team, nTeam.Members, team_id)
|
registrationProcess(id, team, nTeam.Members, team_id)
|
||||||
|
|
||||||
if err := os.Remove(pathname); err != nil {
|
if err := os.Remove(pathname); err != nil {
|
||||||
log.Println("[WRN]", err)
|
log.Printf("%s [WRN] %s\n", id, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if validTeamName(nTeam.TeamName) {
|
} else if validTeamName(nTeam.TeamName) {
|
||||||
if team, err := fic.CreateTeam(nTeam.TeamName, uint32(rand.Int31n(16581376))); err != nil {
|
if team, err := fic.CreateTeam(nTeam.TeamName, uint32(rand.Int31n(16581376))); err != nil {
|
||||||
log.Printf("[ERR] Unable to register new team %s: %s\n", nTeam.TeamName, err)
|
log.Printf("%s [ERR] Unable to register new team %s: %s\n", id, nTeam.TeamName, err)
|
||||||
} else {
|
} else {
|
||||||
registrationProcess(team, nTeam.Members, team_id)
|
registrationProcess(id, team, nTeam.Members, team_id)
|
||||||
|
|
||||||
if err := os.Remove(pathname); err != nil {
|
if err := os.Remove(pathname); err != nil {
|
||||||
log.Println("[WRN]", err)
|
log.Printf("%s [WRN] %s\n", id, err)
|
||||||
}
|
}
|
||||||
if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "info"); err != nil {
|
if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "info"); err != nil {
|
||||||
log.Println("[WRN] Unable to create event:", err)
|
log.Printf("%s [WRN] Unable to create event: %s\n", id, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
appendGenQueue(genStruct{Type: GenEvents})
|
appendGenQueue(genStruct{Type: GenEvents})
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
|
||||||
|
@ -17,24 +20,30 @@ func validTeamName(name string) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func treatRename(pathname string, team fic.Team) {
|
func treatRename(pathname string, team fic.Team) {
|
||||||
|
// Generate a unique identifier to follow the request in logs
|
||||||
|
bid := make([]byte, 5)
|
||||||
|
binary.LittleEndian.PutUint32(bid, rand.Uint32())
|
||||||
|
id := "[" + base64.StdEncoding.EncodeToString(bid) + "]"
|
||||||
|
log.Println(id, "New renameTeam receive", pathname)
|
||||||
|
|
||||||
var keys map[string]string
|
var keys map[string]string
|
||||||
|
|
||||||
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
|
} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
} else if validTeamName(keys["newName"]) {
|
} else if validTeamName(keys["newName"]) {
|
||||||
team.Name = keys["newName"]
|
team.Name = keys["newName"]
|
||||||
if _, err := team.Update(); err != nil {
|
if _, err := team.Update(); err != nil {
|
||||||
log.Println("[WRN] Unable to change team name:", err)
|
log.Printf("%s [WRN] Unable to change team name: %s\n", id, err)
|
||||||
}
|
}
|
||||||
genTeamQueue <- &team
|
genTeamQueue <- &team
|
||||||
if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "info"); err != nil {
|
if _, err := fic.NewEvent(fmt.Sprintf("Souhaitons bonne chance à l'équipe <strong>%s</strong> qui vient de nous rejoindre !", team.Name), "info"); err != nil {
|
||||||
log.Println("[WRN] Unable to create event:", err)
|
log.Printf("%s [WRN] Unable to create event: %s\n", id, err)
|
||||||
}
|
}
|
||||||
appendGenQueue(genStruct{Type: GenEvents})
|
appendGenQueue(genStruct{Type: GenEvents})
|
||||||
if err := os.Remove(pathname); err != nil {
|
if err := os.Remove(pathname); err != nil {
|
||||||
log.Println("[ERR]", err)
|
log.Printf("%s [ERR] %s\n", id, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue