diff --git a/svcs/amigo/amigo.go b/svcs/amigo/amigo.go index bf3623209..fba300440 100644 --- a/svcs/amigo/amigo.go +++ b/svcs/amigo/amigo.go @@ -171,7 +171,7 @@ func (am *Amigo) Handler(hooks Hooks, guacHandler http.Handler) http.Handler { m := http.NewServeMux() m.HandleFunc("/", am.handleIndex()) - m.HandleFunc("/info", am.handleInfo()) + m.HandleFunc("/help", am.handleHelp()) m.HandleFunc("/challenges", am.handleChallenges()) m.HandleFunc("/teams", am.handleTeams()) m.HandleFunc("/hosts", am.handleHostsInformation()) @@ -285,15 +285,15 @@ func (am *Amigo) handleGuacConnection(hook func(t *store.Team) error, next http. } } -func (am *Amigo) handleInfo() http.HandlerFunc { - infoTemplate := wd + "/svcs/amigo/resources/private/info.tmpl.html" +func (am *Amigo) handleHelp() http.HandlerFunc { + infoTemplate := wd + "/svcs/amigo/resources/private/help.tmpl.html" tmpl, err := parseTemplates(infoTemplate) if err != nil { log.Println("error info tmpl: ", err) } return func(w http.ResponseWriter, r *http.Request) { w.Header().Add("Strict-Transport-Security", "max-age=31536000; includeSubDomains") - if r.URL.Path != "/info" { + if r.URL.Path != "/help" { http.NotFound(w, r) return } diff --git a/svcs/amigo/resources/private/base.tmpl.html b/svcs/amigo/resources/private/base.tmpl.html index 3ad9a647b..e9a3d5e4d 100644 --- a/svcs/amigo/resources/private/base.tmpl.html +++ b/svcs/amigo/resources/private/base.tmpl.html @@ -5,9 +5,8 @@ {{.EventName}} - - + @@ -23,13 +22,13 @@
{{ template "content" . }} - +
diff --git a/svcs/amigo/resources/private/challenges.tmpl.html b/svcs/amigo/resources/private/challenges.tmpl.html index a1352d8df..ba453b3a9 100644 --- a/svcs/amigo/resources/private/challenges.tmpl.html +++ b/svcs/amigo/resources/private/challenges.tmpl.html @@ -1,12 +1,12 @@ {{ define "content"}} - +
-
-

Challenges

+
+

flag Challenges

-
+
diff --git a/svcs/amigo/resources/private/info.tmpl.html b/svcs/amigo/resources/private/help.tmpl.html similarity index 89% rename from svcs/amigo/resources/private/info.tmpl.html rename to svcs/amigo/resources/private/help.tmpl.html index 9e3aa4be6..2bdb4e836 100644 --- a/svcs/amigo/resources/private/info.tmpl.html +++ b/svcs/amigo/resources/private/help.tmpl.html @@ -1,10 +1,9 @@ {{ define "content" }} -
-

Information Point

+

help_outline Help

Edit this page @@ -28,8 +27,8 @@

Copy / Paste - Connection Error + Copy / Paste + Connection Error {{ end }}

@@ -37,7 +36,7 @@

In order to have VPN connection into virtualized lab environment on Haaukins, - you need to install Wireguard client for your computer.

+ you need to install Wireguard client for your computer.
Installation guideline for variety of clients are available on official website of Wireguard. @@ -100,7 +99,7 @@

Download application from installation page
  • Import configuration file as shown for MacOS
    • -
  • Make sure handshake is successfully done.

    • +
  • Make sure handshake is successfully done.

    • {{ end }} @@ -108,10 +107,10 @@

    In order to copy from Host to VM on the browser and the way around, these are the following command: -

    +

  • On Windows & Linux: Ctrl+Alt+Shift
  • On MacOS: Ctrl+Command+Shift
    • -

    +
    You might need to logout and login to VM cause sometimes keyboard combination is getting broken. For example, when you type A it writes E.

    @@ -126,18 +125,18 @@

    There are multiple reasons behind this error for example: -

    +

  • The VM crashed and you can not connect it
  • There might be multiple open tabs with same VM instance
  • After a while without any activity the VM goes into sleep mode
  • There might be poor internet connection
    • -

    +
    In order to solve this error try out those steps: -

    - 1. Close all the VM Tabs
    - 2. Log out and login on event page
    - 3. Click RESET Kali Machine button from challenges page
    - 4. In case you still get the error create a new team +
    +
  • Close all the VM Tabs
    • +
  • Log out and login on event page
    • +
  • Click RESET Kali Machine button from challenges page
    • +
  • In case you still get the error create a new team

    • {{ end }} diff --git a/svcs/amigo/resources/private/hosts.tmpl.html b/svcs/amigo/resources/private/hosts.tmpl.html index 7553e3526..c493893f5 100644 --- a/svcs/amigo/resources/private/hosts.tmpl.html +++ b/svcs/amigo/resources/private/hosts.tmpl.html @@ -1,15 +1,15 @@ {{ define "content"}} - +
    -

    Hosts

    +

    dns DNS

    Edit this page