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

admin: Copy challenge.json from sync to distsettings

Browse Source
This commit is contained in:
nemunaire 2022-05-26 12:26:53 +02:00
parent 4b2625c47d
commit eb07eadae0
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/api/settings.go
View File

@ -3,8 +3,10 @@ package api
import (
"encoding/json"
"fmt"
"io"
"log"
"net/http"
"os"
"path"
"reflect"
"time"
@ -58,7 +60,21 @@ func getROSettings(c *gin.Context) {
}
func getChallengeInfo(c *gin.Context) {
challengeinfo, err := sync.GetFileContent(sync.GlobalImporter, "challenge.json")
var challengeinfo string
var err error
if sync.GlobalImporter == nil {
if fd, err := os.Open(path.Join(settings.SettingsDir, settings.ChallengeFile)); err == nil {
defer fd.Close()
var buf []byte
buf, err = io.ReadAll(fd)
if err == nil {
challengeinfo = string(buf)
}
}
} else {
challengeinfo, err = sync.GetFileContent(sync.GlobalImporter, settings.ChallengeFile)
}
if err != nil {
log.Println("Unable to retrieve challenge.json:", err.Error())
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": fmt.Sprintf("Unable to retrive challenge.json: %s", err.Error())})
@ -96,6 +112,12 @@ func saveChallengeInfo(c *gin.Context) {
return
}
if err := settings.SaveChallengeInfo(path.Join(settings.SettingsDir, settings.ChallengeFile), info); err != nil {
log.Println("Unable to SaveChallengeInfo:", err.Error())
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": fmt.Sprintf("Unable to save distributed challenge info: %s", err.Error())})
return
}
c.JSON(http.StatusOK, info)
}

14
admin/main.go
View File

@ -142,6 +142,20 @@ func main() {
log.Fatal("Unable to initialize the importer:", err)
}
log.Println("Using", sync.GlobalImporter.Kind())
// Update distributed challenge.json
challengeinfo, err := sync.GetFileContent(sync.GlobalImporter, settings.ChallengeFile)
if err == nil {
if fd, err := os.Create(path.Join(settings.SettingsDir, settings.ChallengeFile)); err != nil {
log.Fatal("Unable to open SETTINGS/challenge.json:", err)
} else {
fd.Write([]byte(challengeinfo))
err = fd.Close()
if err != nil {
log.Fatal("Something went wrong during SETTINGS/challenge.json writing:", err)
}
}
}
}
// Sanitize options