From 25652847c42d39cf34bb7308659ea05fd6f92cbd Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 19 Nov 2016 16:17:53 +0100 Subject: [PATCH] by default, only listen on localhost --- admin/api_team.go | 21 +++++++++++++++++++++ admin/main.go | 2 +- frontend/main.go | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/admin/api_team.go b/admin/api_team.go index a5ba9a7a..95e78838 100644 --- a/admin/api_team.go +++ b/admin/api_team.go @@ -16,6 +16,25 @@ var ApiTeamsRouting = map[string]DispatchFunction{ "DELETE": deletionTeam, } +func nginxGenMember() (string, error) { + if teams, err := fic.GetTeams(); err != nil { + return "", err + } else { + ret := "" + for _, team := range teams { + if members, err := team.GetMembers(); err == nil { + for _, member := range members { + ret += fmt.Sprintf(" if ($remote_user = \"%s\") { set $team \"%s\"; }\n", member.Nickname, team.InitialName) + } + } else { + return "", err + } + } + + return ret, nil + } +} + func nginxGenTeam() (string, error) { if teams, err := fic.GetTeams(); err != nil { return "", err @@ -107,6 +126,8 @@ func listTeam(args []string, body []byte) (interface{}, error) { return fic.GetTries(nil, nil) } else if args[0] == "nginx" { return nginxGenTeam() + } else if args[0] == "nginx-members" { + return nginxGenMember() } else if args[0] == "binding" { return bindingTeams() } else if tid, err := strconv.Atoi(string(args[0])); err != nil { diff --git a/admin/main.go b/admin/main.go index 4a552906..3fb57f91 100644 --- a/admin/main.go +++ b/admin/main.go @@ -19,7 +19,7 @@ var CloudUsername string var CloudPassword string func main() { - var bind = flag.String("bind", "0.0.0.0:8081", "Bind port/socket") + var bind = flag.String("bind", "127.0.0.1:8081", "Bind port/socket") var dsn = flag.String("dsn", "fic:fic@/fic", "DSN to connect to the MySQL server") flag.StringVar(&BaseURL, "baseurl", "http://fic.srs.epita.fr/", "URL prepended to each URL") flag.StringVar(&SubmissionDir, "submission", "./submissions/", "Base directory where save submissions") diff --git a/frontend/main.go b/frontend/main.go index 9d6b3df4..1dbbfb2c 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -27,7 +27,7 @@ func touchStartedFile(startSub time.Duration) { } func main() { - var bind = flag.String("bind", "0.0.0.0:8080", "Bind port/socket") + var bind = flag.String("bind", "127.0.0.1:8080", "Bind port/socket") var prefix = flag.String("prefix", "", "Request path prefix to strip (from proxy)") var start = flag.Int64("start", 0, fmt.Sprintf("Challenge start timestamp (in 2 minutes: %d)", time.Now().Unix()/60*60+120)) var duration = flag.Duration("duration", 180*time.Minute, "Challenge duration")