update

Author: breadchris

pkg/backend/backend.go

@@ -491,7 +491,7 @@ func (b *Backend) GetHomePage(
 		if node.Meta.Entrypoint {
 			entrypoints = append(entrypoints, &xctf.Entrypoint{
 				Name:  node.Meta.Name,
-				Route: chals.ChalURL("https", id, node.Meta.Id, ""),
+				Route: chals.ChalURL(true, id, node.Meta.Id, ""),
 			})
 		}
 	}

pkg/chals/chals.go

@@ -58,11 +58,16 @@ func init() {
 	gob.Register(tmpl.PhoneState{})
 }
 
-func ChalURL(scheme, compId, chalID, host string) string {
+// TODO breadchris base url should be configured from the environment?
+func ChalURL(isHttps bool, compId, chalID, host string) string {
 	path := fmt.Sprintf("/play/%s/%s", compId, chalID)
 	if host == "" {
 		return path
 	}
+	scheme := "http"
+	if isHttps {
+		scheme = "https"
+	}
 	u := url.URL{
 		// TODO breadchris check if the original request was https
 		Scheme: scheme,
@@ -142,9 +147,10 @@ func (s *Handler) Handle() (string, http.Handler) {
 
 		// TODO breadchris find dependencies of referenced challenge and build those
 		challenges := map[string]string{}
+		isHttps := r.TLS != nil
 		for _, n := range graph.Nodes {
 			view := ""
-			chalURL := ChalURL(r.URL.Scheme, compId, n.Meta.Id, r.Host)
+			chalURL := ChalURL(isHttps, compId, n.Meta.Id, r.Host)
 			switch u := n.Challenge.(type) {
 			case *chalgen.Node_Base:
 				switch t := u.Base.Type.(type) {
@@ -171,6 +177,23 @@ func (s *Handler) Handle() (string, http.Handler) {
 			}
 		}
 
+		templChals := func(tl string) (string, error) {
+			nt, err := ttemplate.New("templ").Parse(tl)
+			if err != nil {
+				return "", err
+			}
+			var buf bytes.Buffer
+			err = nt.Execute(&buf, struct {
+				Challenges map[string]string
+			}{
+				Challenges: challenges,
+			})
+			if err != nil {
+				return "", err
+			}
+			return buf.String(), nil
+		}
+
 		for _, n := range graph.Nodes {
 			if n.Meta.Id == chalId {
 				switch u := n.Challenge.(type) {
@@ -277,22 +300,12 @@ func (s *Handler) Handle() (string, http.Handler) {
 
 						var newUrls []string
 						for _, ul := range t.Filemanager.Urls {
-							nt, err := ttemplate.New("app").Parse(ul)
-							if err != nil {
-								http.Error(w, err.Error(), http.StatusInternalServerError)
-								return
-							}
-							var buf bytes.Buffer
-							err = nt.Execute(&buf, struct {
-								Challenges map[string]string
-							}{
-								Challenges: challenges,
-							})
+							ul, err = templChals(ul)
 							if err != nil {
 								http.Error(w, err.Error(), http.StatusInternalServerError)
 								return
 							}
-							newUrls = append(newUrls, buf.String())
+							newUrls = append(newUrls, ul)
 						}
 						t.Filemanager.Urls = newUrls
 
@@ -354,22 +367,11 @@ func (s *Handler) Handle() (string, http.Handler) {
 							}
 						}
 						for _, app := range t.Phone.Apps {
-							nt, err := ttemplate.New("app").Parse(app.Url)
+							app.Url, err = templChals(app.Url)
 							if err != nil {
 								http.Error(w, err.Error(), http.StatusInternalServerError)
 								return
 							}
-							var buf bytes.Buffer
-							err = nt.Execute(&buf, struct {
-								Challenges map[string]string
-							}{
-								Challenges: challenges,
-							})
-							if err != nil {
-								http.Error(w, err.Error(), http.StatusInternalServerError)
-								return
-							}
-							app.Url = buf.String()
 						}
 						templ.Handler(tmpl.Page(tmpl.Phone(tmpl.PhoneState{
 							Flag:          n.Meta.Flag,
@@ -445,23 +447,11 @@ func (s *Handler) Handle() (string, http.Handler) {
 
 						for _, p := range t.Slack.Channels {
 							for _, n := range p.Messages {
-								nt, err := ttemplate.New("slack").Parse(n.Content)
-								if err != nil {
-									slog.Error("failed to parse slack message template", "channel", p.Name, "message", n.Content)
-									http.Error(w, err.Error(), http.StatusInternalServerError)
-									return
-								}
-								var buf bytes.Buffer
-								err = nt.Execute(&buf, struct {
-									Challenges map[string]string
-								}{
-									Challenges: challenges,
-								})
+								n.Content, err = templChals(n.Content)
 								if err != nil {
 									http.Error(w, err.Error(), http.StatusInternalServerError)
 									return
 								}
-								n.Content = buf.String()
 							}
 						}
 
@@ -494,22 +484,11 @@ func (s *Handler) Handle() (string, http.Handler) {
 						return
 					case *chalgen.Challenge_Twitter:
 						for _, p := range t.Twitter.Posts {
-							nt, err := ttemplate.New("twitter").Parse(p.Content)
+							p.Content, err = templChals(p.Content)
 							if err != nil {
 								http.Error(w, err.Error(), http.StatusInternalServerError)
 								return
 							}
-							var buf bytes.Buffer
-							err = nt.Execute(&buf, struct {
-								Challenges map[string]string
-							}{
-								Challenges: challenges,
-							})
-							if err != nil {
-								http.Error(w, err.Error(), http.StatusInternalServerError)
-								return
-							}
-							p.Content = buf.String()
 						}
 						err := twitterTmpl.Execute(w, struct {
 							Twitter *chalgen.Twitter
@@ -576,6 +555,23 @@ func (s *Handler) Handle() (string, http.Handler) {
 						s := tmpl.SearchState{
 							SearchURL: templ.SafeURL(baseURL + "/search"),
 						}
+						t.Search.Password, err = templChals(t.Search.Password)
+						if err != nil {
+							http.Error(w, err.Error(), http.StatusInternalServerError)
+							return
+						}
+
+						var newEntries []string
+						for _, se := range t.Search.Entry {
+							se, err = templChals(se)
+							if err != nil {
+								http.Error(w, err.Error(), http.StatusInternalServerError)
+								return
+							}
+							newEntries = append(newEntries, se)
+						}
+						t.Search.Entry = newEntries
+
 						if p == "search" {
 							err := r.ParseForm()
 							if err != nil {
@@ -606,6 +602,11 @@ func (s *Handler) Handle() (string, http.Handler) {
 							}
 							return
 						}
+						_, err := w.Write([]byte(n.Meta.Flag + "\n"))
+						if err != nil {
+							http.Error(w, err.Error(), http.StatusInternalServerError)
+							return
+						}
 						for _, h := range s {
 							_, err := w.Write([]byte(h.Hash + "\n"))
 							if err != nil {

pkg/chals/tmpl/phone.templ

@@ -61,7 +61,7 @@ templ App(state PhoneState, i int, a *chalgen.App) {
         if a.Html != "" {
           @templ.Raw(a.Html)
         } else {
-          <iframe src={a.Url} class="w-full h-full"></iframe>
+          <iframe src={a.Url} class="w-full h-96"></iframe>
         }
     }
 }