feat: add information to the /apple page for the macOS standalone client user (#915)
Co-authored-by: Kristoffer Dalby <kristoffer@dalby.cc>
This commit is contained in:
LiuHanCheng
GitHub
parent
527b580f5e
commit
bf87b33292
4 changed files with 218 additions and 107 deletions
|
|
@ -2,6 +2,7 @@ package headscale
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
_ "embed"
|
||||||
"html/template"
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
textTemplate "text/template"
|
textTemplate "text/template"
|
||||||
|
|
@ -11,51 +12,18 @@ import (
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
//go:embed templates/apple.html
|
||||||
|
var appleTemplate string
|
||||||
|
|
||||||
|
//go:embed templates/windows.html
|
||||||
|
var windowsTemplate string
|
||||||
|
|
||||||
// WindowsConfigMessage shows a simple message in the browser for how to configure the Windows Tailscale client.
|
// WindowsConfigMessage shows a simple message in the browser for how to configure the Windows Tailscale client.
|
||||||
func (h *Headscale) WindowsConfigMessage(
|
func (h *Headscale) WindowsConfigMessage(
|
||||||
writer http.ResponseWriter,
|
writer http.ResponseWriter,
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
) {
|
) {
|
||||||
winTemplate := template.Must(template.New("windows").Parse(`
|
winTemplate := template.Must(template.New("windows").Parse(windowsTemplate))
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<h1>headscale</h1>
|
|
||||||
<h2>Windows registry configuration</h2>
|
|
||||||
<p>
|
|
||||||
This page provides Windows registry information for the official Windows Tailscale client.
|
|
||||||
<p>
|
|
||||||
<p>
|
|
||||||
The registry file will configure Tailscale to use <code>{{.URL}}</code> as its control server.
|
|
||||||
<p>
|
|
||||||
<h3>Caution</h3>
|
|
||||||
<p>You should always download and inspect the registry file before installing it:</p>
|
|
||||||
<pre><code>curl {{.URL}}/windows/tailscale.reg</code></pre>
|
|
||||||
|
|
||||||
<h2>Installation</h2>
|
|
||||||
<p>Headscale can be set to the default server by running the registry file:</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<a href="/windows/tailscale.reg" download="tailscale.reg">Windows registry file</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<ol>
|
|
||||||
<li>Download the registry file, then run it</li>
|
|
||||||
<li>Follow the prompts</li>
|
|
||||||
<li>Install and run the official windows Tailscale client</li>
|
|
||||||
<li>When the installation has finished, start Tailscale, and log in by clicking the icon in the system tray</li>
|
|
||||||
</ol>
|
|
||||||
<p>Or</p>
|
|
||||||
<p>Open command prompt with Administrator rights. Issue the following commands to add the required registry entries:</p>
|
|
||||||
<pre>
|
|
||||||
<code>REG ADD "HKLM\Software\Tailscale IPN" /v UnattendedMode /t REG_SZ /d always
|
|
||||||
REG ADD "HKLM\Software\Tailscale IPN" /v LoginURL /t REG_SZ /d "{{.URL}}"</code></pre>
|
|
||||||
<p>
|
|
||||||
Restart Tailscale and log in.
|
|
||||||
<p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
`))
|
|
||||||
|
|
||||||
config := map[string]interface{}{
|
config := map[string]interface{}{
|
||||||
"URL": h.cfg.ServerURL,
|
"URL": h.cfg.ServerURL,
|
||||||
}
|
}
|
||||||
|
|
@ -136,55 +104,7 @@ func (h *Headscale) AppleConfigMessage(
|
||||||
writer http.ResponseWriter,
|
writer http.ResponseWriter,
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
) {
|
) {
|
||||||
appleTemplate := template.Must(template.New("apple").Parse(`
|
appleTemplate := template.Must(template.New("apple").Parse(appleTemplate))
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<h1>headscale</h1>
|
|
||||||
<h2>Apple configuration profiles</h2>
|
|
||||||
<p>
|
|
||||||
This page provides <a href="https://support.apple.com/guide/mdm/mdm-overview-mdmbf9e668/web">configuration profiles</a> for the official Tailscale clients for <a href="https://apps.apple.com/us/app/tailscale/id1470499037?ls=1">iOS</a> and <a href="https://apps.apple.com/ca/app/tailscale/id1475387142?mt=12">macOS</a>.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The profiles will configure Tailscale.app to use <code>{{.URL}}</code> as its control server.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<h3>Caution</h3>
|
|
||||||
<p>You should always download and inspect the profile before installing it:</p>
|
|
||||||
<!--
|
|
||||||
<pre><code>curl {{.URL}}/apple/ios</code></pre>
|
|
||||||
-->
|
|
||||||
<pre><code>curl {{.URL}}/apple/macos</code></pre>
|
|
||||||
|
|
||||||
<h2>Profiles</h2>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
<h3>iOS</h3>
|
|
||||||
<p>
|
|
||||||
<a href="/apple/ios" download="headscale_ios.mobileconfig">iOS profile</a>
|
|
||||||
</p>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<h3>macOS</h3>
|
|
||||||
<p>Headscale can be set to the default server by installing a Headscale configuration profile:</p>
|
|
||||||
<p>
|
|
||||||
<a href="/apple/macos" download="headscale_macos.mobileconfig">macOS profile</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<ol>
|
|
||||||
<li>Download the profile, then open it. When it has been opened, there should be a notification that a profile can be installed</li>
|
|
||||||
<li>Open System Preferences and go to "Profiles"</li>
|
|
||||||
<li>Find and install the Headscale profile</li>
|
|
||||||
<li>Restart Tailscale.app and log in</li>
|
|
||||||
</ol>
|
|
||||||
|
|
||||||
<p>Or</p>
|
|
||||||
<p>Use your terminal to configure the default setting for Tailscale by issuing:</p>
|
|
||||||
<code>defaults write io.tailscale.ipn.macos ControlURL {{.URL}}</code>
|
|
||||||
|
|
||||||
<p>Restart Tailscale.app and log in.</p>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>`))
|
|
||||||
|
|
||||||
config := map[string]interface{}{
|
config := map[string]interface{}{
|
||||||
"URL": h.cfg.ServerURL,
|
"URL": h.cfg.ServerURL,
|
||||||
|
|
@ -282,24 +202,33 @@ func (h *Headscale) ApplePlatformConfig(
|
||||||
}
|
}
|
||||||
|
|
||||||
var payload bytes.Buffer
|
var payload bytes.Buffer
|
||||||
|
handleMacError := func(ierr error) {
|
||||||
|
log.Error().
|
||||||
|
Str("handler", "ApplePlatformConfig").
|
||||||
|
Err(ierr).
|
||||||
|
Msg("Could not render Apple macOS template")
|
||||||
|
|
||||||
|
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
||||||
|
writer.WriteHeader(http.StatusInternalServerError)
|
||||||
|
_, err := writer.Write([]byte("Could not render Apple macOS template"))
|
||||||
|
if err != nil {
|
||||||
|
log.Error().
|
||||||
|
Caller().
|
||||||
|
Err(err).
|
||||||
|
Msg("Failed to write response")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch platform {
|
switch platform {
|
||||||
case "macos":
|
case "macos-standlone":
|
||||||
if err := macosTemplate.Execute(&payload, platformConfig); err != nil {
|
if err := macosStandloneTemplate.Execute(&payload, platformConfig); err != nil {
|
||||||
log.Error().
|
handleMacError(err)
|
||||||
Str("handler", "ApplePlatformConfig").
|
|
||||||
Err(err).
|
|
||||||
Msg("Could not render Apple macOS template")
|
|
||||||
|
|
||||||
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
return
|
||||||
writer.WriteHeader(http.StatusInternalServerError)
|
}
|
||||||
_, err := writer.Write([]byte("Could not render Apple macOS template"))
|
case "macos-app-store":
|
||||||
if err != nil {
|
if err := macosAppStoreTemplate.Execute(&payload, platformConfig); err != nil {
|
||||||
log.Error().
|
handleMacError(err)
|
||||||
Caller().
|
|
||||||
Err(err).
|
|
||||||
Msg("Failed to write response")
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -444,7 +373,7 @@ var iosTemplate = textTemplate.Must(textTemplate.New("iosTemplate").Parse(`
|
||||||
</dict>
|
</dict>
|
||||||
`))
|
`))
|
||||||
|
|
||||||
var macosTemplate = template.Must(template.New("macosTemplate").Parse(`
|
var macosAppStoreTemplate = template.Must(template.New("macosTemplate").Parse(`
|
||||||
<dict>
|
<dict>
|
||||||
<key>PayloadType</key>
|
<key>PayloadType</key>
|
||||||
<string>io.tailscale.ipn.macos</string>
|
<string>io.tailscale.ipn.macos</string>
|
||||||
|
|
@ -456,7 +385,23 @@ var macosTemplate = template.Must(template.New("macosTemplate").Parse(`
|
||||||
<integer>1</integer>
|
<integer>1</integer>
|
||||||
<key>PayloadEnabled</key>
|
<key>PayloadEnabled</key>
|
||||||
<true/>
|
<true/>
|
||||||
|
<key>ControlURL</key>
|
||||||
|
<string>{{.URL}}</string>
|
||||||
|
</dict>
|
||||||
|
`))
|
||||||
|
|
||||||
|
var macosStandloneTemplate = template.Must(template.New("macosStandloneTemplate").Parse(`
|
||||||
|
<dict>
|
||||||
|
<key>PayloadType</key>
|
||||||
|
<string>io.tailscale.ipn.macsys</string>
|
||||||
|
<key>PayloadUUID</key>
|
||||||
|
<string>{{.UUID}}</string>
|
||||||
|
<key>PayloadIdentifier</key>
|
||||||
|
<string>com.github.juanfont.headscale</string>
|
||||||
|
<key>PayloadVersion</key>
|
||||||
|
<integer>1</integer>
|
||||||
|
<key>PayloadEnabled</key>
|
||||||
|
<true/>
|
||||||
<key>ControlURL</key>
|
<key>ControlURL</key>
|
||||||
<string>{{.URL}}</string>
|
<string>{{.URL}}</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
|
|
||||||
102
templates/apple.html
Normal file
102
templates/apple.html
Normal file
|
|
@ -0,0 +1,102 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Document</title>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<h1>headscale</h1>
|
||||||
|
<h2>Apple configuration profiles</h2>
|
||||||
|
<p>
|
||||||
|
This page provides
|
||||||
|
<a href="https://support.apple.com/guide/mdm/mdm-overview-mdmbf9e668/web">
|
||||||
|
configuration profiles
|
||||||
|
</a>
|
||||||
|
for the official Tailscale clients for
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a href="https://apps.apple.com/us/app/tailscale/id1470499037?ls=1"
|
||||||
|
>iOS</a
|
||||||
|
>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="https://apps.apple.com/ca/app/tailscale/id1475387142?mt=12"
|
||||||
|
>macOS - AppStore Client</a
|
||||||
|
>.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="https://pkgs.tailscale.com/stable/#macos"
|
||||||
|
>macOS - Standalone Client</a
|
||||||
|
>.
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
The profiles will configure Tailscale.app to use <code>{{.URL}}</code> as
|
||||||
|
its control server.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h3>Caution</h3>
|
||||||
|
<p>
|
||||||
|
You should always download and inspect the profile before installing it:
|
||||||
|
</p>
|
||||||
|
<!--
|
||||||
|
<pre><code>curl {{.URL}}/apple/ios</code></pre>
|
||||||
|
-->
|
||||||
|
<pre><code>curl {{.URL}}/apple/macos</code></pre>
|
||||||
|
|
||||||
|
<h2>Profiles</h2>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
<h3>iOS</h3>
|
||||||
|
<p>
|
||||||
|
<a href="/apple/ios" download="headscale_ios.mobileconfig">iOS profile</a>
|
||||||
|
</p>
|
||||||
|
-->
|
||||||
|
|
||||||
|
<h3>macOS</h3>
|
||||||
|
<p>
|
||||||
|
Headscale can be set to the default server by installing a Headscale
|
||||||
|
configuration profile:
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<a href="/apple/macos-app-store" download="headscale_macos.mobileconfig"
|
||||||
|
>macOS AppStore profile</a
|
||||||
|
>
|
||||||
|
<a href="/apple/macos-standalone" download="headscale_macos.mobileconfig"
|
||||||
|
>macOS Standalone profile</a
|
||||||
|
>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ol>
|
||||||
|
<li>
|
||||||
|
Download the profile, then open it. When it has been opened, there
|
||||||
|
should be a notification that a profile can be installed
|
||||||
|
</li>
|
||||||
|
<li>Open System Preferences and go to "Profiles"</li>
|
||||||
|
<li>Find and install the Headscale profile</li>
|
||||||
|
<li>Restart Tailscale.app and log in</li>
|
||||||
|
</ol>
|
||||||
|
|
||||||
|
<p>Or</p>
|
||||||
|
<p>
|
||||||
|
Use your terminal to configure the default setting for Tailscale by
|
||||||
|
issuing:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
for app store client:
|
||||||
|
<code>defaults write io.tailscale.ipn.macos ControlURL {{.URL}}</code>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
for standlone client:
|
||||||
|
<code>defaults write io.tailscale.ipn.macsys ControlURL {{.URL}}</code>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p>Restart Tailscale.app and log in.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
64
templates/windows.html
Normal file
64
templates/windows.html
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Document</title>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<h1>headscale</h1>
|
||||||
|
<h2>Windows registry configuration</h2>
|
||||||
|
<p>
|
||||||
|
This page provides Windows registry information for the official Windows
|
||||||
|
Tailscale client.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p></p>
|
||||||
|
<p>
|
||||||
|
The registry file will configure Tailscale to use <code>{{.URL}}</code> as
|
||||||
|
its control server.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p></p>
|
||||||
|
<h3>Caution</h3>
|
||||||
|
<p>
|
||||||
|
You should always download and inspect the registry file before installing
|
||||||
|
it:
|
||||||
|
</p>
|
||||||
|
<pre><code>curl {{.URL}}/windows/tailscale.reg</code></pre>
|
||||||
|
|
||||||
|
<h2>Installation</h2>
|
||||||
|
<p>
|
||||||
|
Headscale can be set to the default server by running the registry file:
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<a href="/windows/tailscale.reg" download="tailscale.reg"
|
||||||
|
>Windows registry file</a
|
||||||
|
>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ol>
|
||||||
|
<li>Download the registry file, then run it</li>
|
||||||
|
<li>Follow the prompts</li>
|
||||||
|
<li>Install and run the official windows Tailscale client</li>
|
||||||
|
<li>
|
||||||
|
When the installation has finished, start Tailscale, and log in by
|
||||||
|
clicking the icon in the system tray
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
<p>Or</p>
|
||||||
|
<p>
|
||||||
|
Open command prompt with Administrator rights. Issue the following
|
||||||
|
commands to add the required registry entries:
|
||||||
|
</p>
|
||||||
|
<pre>
|
||||||
|
<code>REG ADD "HKLM\Software\Tailscale IPN" /v UnattendedMode /t REG_SZ /d always
|
||||||
|
REG ADD "HKLM\Software\Tailscale IPN" /v LoginURL /t REG_SZ /d "{{.URL}}"</code></pre>
|
||||||
|
<p>Restart Tailscale and log in.</p>
|
||||||
|
|
||||||
|
<p></p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
2
utils.go
2
utils.go
|
|
@ -347,7 +347,7 @@ func IsStringInSlice(slice []string, str string) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func AbsolutePathFromConfigPath(path string) string {
|
func AbsolutePathFromConfigPath(path string) string {
|
||||||
// If a relative path is provided, prefix it with the the directory where
|
// If a relative path is provided, prefix it with the directory where
|
||||||
// the config file was found.
|
// the config file was found.
|
||||||
if (path != "") && !strings.HasPrefix(path, string(os.PathSeparator)) {
|
if (path != "") && !strings.HasPrefix(path, string(os.PathSeparator)) {
|
||||||
dir, _ := filepath.Split(viper.ConfigFileUsed())
|
dir, _ := filepath.Split(viper.ConfigFileUsed())
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue