Add verification of time skewness

go.mod

@@ -36,6 +36,7 @@ require (
 )
 
 require (
+	github.com/beevik/ntp v1.5.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

go.sum

@@ -12,6 +12,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0=
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1:J29hk+f9lJrblVIfiJOtTFk+OblBawmib4uz/VdKzlg=
+github.com/beevik/ntp v1.5.0 h1:y+uj/JjNwlY2JahivxYvtmv4ehfi3h74fAuABB9ZSM4=
+github.com/beevik/ntp v1.5.0/go.mod h1:mJEhBrwT76w9D+IfOEGvuzyuudiW9E52U2BaTrMOYow=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

internal/cli/doctor.go

@@ -3,17 +3,35 @@ package cli
 import (
 	"fmt"
 	"os"
-	"strings"
 	"text/template"
 
 	"github.com/9seconds/mtg/v2/internal/config"
 	"github.com/9seconds/mtg/v2/internal/utils"
+	"github.com/9seconds/mtg/v2/mtglib"
+	"github.com/beevik/ntp"
 )
 
 var (
+	tplError = template.Must(
+		template.New("").Parse("  ‼️ {{ .description }}: {{ .error }}\n"),
+	)
+
 	tplWDeprecatedConfig = template.Must(
-		template.New("deprecated-config").
+		template.New("").
-			Parse(`  ⚠️ Option {{ .old | printf "%q" }}{{ if .old_section }} from section [{{ .old_section }}]{{ end }} is deprecated and will be removed in v{{ .when }}. Please use {{ .new | printf "%q" }}{{ if .new_section }} in [{{ .new_section }}] section{{ end }} instead.`),
+			Parse(`  ⚠️ Option {{ .old | printf "%q" }}{{ if .old_section }} from section [{{ .old_section }}]{{ end }} is deprecated and will be removed in v{{ .when }}. Please use {{ .new | printf "%q" }}{{ if .new_section }} in [{{ .new_section }}] section{{ end }} instead.` + "\n"),
+	)
+
+	tplOTimeSkewness = template.Must(
+		template.New("").
+			Parse("  ✅ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}\n"),
+	)
+	tplWTimeSkewness = template.Must(
+		template.New("").
+			Parse("  ⚠️ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}. Please check ntp.\n"),
+	)
+	tplETimeSkewness = template.Must(
+		template.New("").
+			Parse("  ❌ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}. You will get many rejected connections!\n"),
 	)
 )
 
@@ -33,15 +51,17 @@ func (d *Doctor) Run(cli *CLI, version string) error {
 	everythingOK := true
 
 	fmt.Println("Deprecated options")
-	if errs := d.checkDeprecatedConfig(); len(errs) > 0 {
+	if !d.checkDeprecatedConfig() {
-		for _, err := range errs {
+		everythingOK = false
-			fmt.Println(err)
-			everythingOK = false
-		}
 	} else {
 		fmt.Println("  ✅ All good")
 	}
 
+	fmt.Println("Time skewness")
+	if !d.checkTimeSkewness() {
+		everythingOK = false
+	}
+
 	if !everythingOK {
 		os.Exit(1)
 	}
@@ -49,11 +69,12 @@ func (d *Doctor) Run(cli *CLI, version string) error {
 	return nil
 }
 
-func (d *Doctor) checkDeprecatedConfig() []string {
+func (d *Doctor) checkDeprecatedConfig() bool {
-	errors := []string{}
+	ok := true
 
 	if d.conf.DomainFrontingIP.Value != nil {
-		errors = d.addError(errors, tplWDeprecatedConfig, map[string]string{
+		ok = false
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{
 			"when":        "2.3.0",
 			"old":         "domain-fronting-ip",
 			"old_section": "",
@@ -63,7 +84,8 @@ func (d *Doctor) checkDeprecatedConfig() []string {
 	}
 
 	if d.conf.DomainFrontingPort.Value != 0 {
-		errors = d.addError(errors, tplWDeprecatedConfig, map[string]string{
+		ok = false
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{
 			"when":        "2.3.0",
 			"old":         "domain-fronting-port",
 			"old_section": "",
@@ -73,7 +95,8 @@ func (d *Doctor) checkDeprecatedConfig() []string {
 	}
 
 	if d.conf.DomainFrontingProxyProtocol.Value {
-		errors = d.addError(errors, tplWDeprecatedConfig, map[string]string{
+		ok = false
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{
 			"when":        "2.3.0",
 			"old":         "domain-fronting-proxy-protocol",
 			"old_section": "",
@@ -83,7 +106,8 @@ func (d *Doctor) checkDeprecatedConfig() []string {
 	}
 
 	if d.conf.Network.DOHIP.Value != nil {
-		errors = d.addError(errors, tplWDeprecatedConfig, map[string]string{
+		ok = false
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{
 			"when":        "2.3.0",
 			"old":         "doh-ip",
 			"old_section": "network",
@@ -92,14 +116,36 @@ func (d *Doctor) checkDeprecatedConfig() []string {
 		})
 	}
 
-	return errors
+	return ok
 }
 
-func (d *Doctor) addError(messages []string, tpl *template.Template, context map[string]string) []string {
+func (d *Doctor) checkTimeSkewness() bool {
-	value := &strings.Builder{}
+	response, err := ntp.Query("0.pool.ntp.org")
-	if err := tpl.Execute(value, context); err != nil {
+	if err != nil {
-		panic(err)
+		tplError.Execute(os.Stdout, map[string]any{
+			"description": "cannot access ntp pool",
+			"error":       err,
+		})
+		return false
 	}
 
-	return append(messages, value.String())
+	skewness := response.ClockOffset.Abs()
+	confValue := d.conf.TolerateTimeSkewness.Get(mtglib.DefaultTolerateTimeSkewness)
+	diff := float64(skewness) / float64(confValue)
+	context := map[string]any{
+		"drift": response.ClockOffset,
+		"value": confValue,
+	}
+
+	switch {
+	case diff < 0.3:
+		tplOTimeSkewness.Execute(os.Stdout, context)
+		return true
+	case diff < 0.7:
+		tplWTimeSkewness.Execute(os.Stdout, context)
+	default:
+		tplETimeSkewness.Execute(os.Stdout, context)
+	}
+
+	return false
 }