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

admin: Fix dex template

Browse source
This commit is contained in:
nemunaire 2025-03-29 17:50:52 +01:00
parent 4973f7ac4a
commit fbc84f9d08
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
admin/api/password.go
View file

@ -8,7 +8,6 @@ import (
"net/http" "net/http"
"os" "os"
"path" "path"
"strings"
"text/template" "text/template"
"unicode" "unicode"
@ -242,7 +241,7 @@ func genDexConfig() ([]byte, error) {
logoPath := "" logoPath := ""
if len(challengeInfo.MainLogo) > 0 { if len(challengeInfo.MainLogo) > 0 {
logoPath = strings.Replace(challengeInfo.MainLogo[len(challengeInfo.MainLogo)-1], "$FILES$", fic.FilesDir, -1) logoPath = path.Join("../../files", "logo", path.Base(challengeInfo.MainLogo[len(challengeInfo.MainLogo)-1]))
} }
dexTmpl, err := template.New("dexcfg").Parse(dexcfgtpl) dexTmpl, err := template.New("dexcfg").Parse(dexcfgtpl)
@ -286,6 +285,11 @@ func genDexConfig() ([]byte, error) {
} }
func genDexPasswordTpl() ([]byte, error) { func genDexPasswordTpl() ([]byte, error) {
challengeInfo, err := GetChallengeInfo()
if err != nil {
return nil, fmt.Errorf("Cannot create template: %w", err)
}
if teams, err := fic.GetTeams(); err != nil { if teams, err := fic.GetTeams(); err != nil {
return nil, err return nil, err
} else { } else {
@ -295,6 +299,7 @@ func genDexPasswordTpl() ([]byte, error) {
return nil, fmt.Errorf("Cannot create template: %w", err) return nil, fmt.Errorf("Cannot create template: %w", err)
} else if err = dexTmpl.Execute(b, dexConfig{ } else if err = dexTmpl.Execute(b, dexConfig{
Teams: teams, Teams: teams,
Name: challengeInfo.Title,
}); err != nil { }); err != nil {
return nil, fmt.Errorf("An error occurs during template execution: %w", err) return nil, fmt.Errorf("An error occurs during template execution: %w", err)
} else { } else {