From b107eae34af0d14683fdf241a71ec81753dad408 Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Tue, 2 Mar 2021 17:08:39 -0800
Subject: [PATCH] password auth

---
 .gitignore        |  1 +
 build.ps1         |  5 +++++
 build_windows.bat |  1 -
 cmd/config.go     |  5 +++--
 cmd/server.go     | 25 +++++++++++++++++++++----
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 build.ps1
 delete mode 100644 build_windows.bat

diff --git a/.gitignore b/.gitignore
index e9e0ccf..f7771ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -180,3 +180,4 @@ $RECYCLE.BIN/
 # End of https://www.gitignore.io/api/go,linux,macos,windows,intellij+all
 
 cmd/relay/*.json
+hy_linux
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 0000000..bc44013
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,5 @@
+$env:GOOS = "windows"
+go build -ldflags="-w -s" -o "hy_windows.exe" ./cmd
+
+$env:GOOS = "linux"
+go build -ldflags="-w -s" -o "hy_linux" ./cmd
diff --git a/build_windows.bat b/build_windows.bat
deleted file mode 100644
index 55abb4e..0000000
--- a/build_windows.bat
+++ /dev/null
@@ -1 +0,0 @@
-go build -ldflags="-w -s" ./cmd
\ No newline at end of file
diff --git a/cmd/config.go b/cmd/config.go
index 226b888..8c1f06e 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 )
 
 const (
@@ -26,8 +27,8 @@ type serverConfig struct {
 	ACL        string `json:"acl"`
 	Obfs       string `json:"obfs"`
 	Auth       struct {
-		Mode   string      `json:"mode"`
-		Config interface{} `json:"config"`
+		Mode   string           `json:"mode"`
+		Config json5.RawMessage `json:"config"`
 	} `json:"auth"`
 	ReceiveWindowConn   uint64 `json:"recv_window_conn"`
 	ReceiveWindowClient uint64 `json:"recv_window_client"`
diff --git a/cmd/server.go b/cmd/server.go
index 206f15f..c6cf048 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -9,9 +9,9 @@ import (
 	hyCongestion "github.com/tobyxdd/hysteria/pkg/congestion"
 	"github.com/tobyxdd/hysteria/pkg/core"
 	"github.com/tobyxdd/hysteria/pkg/obfs"
+	"github.com/yosuke-furukawa/json5/encoding/json5"
 	"io"
 	"net"
-	"strings"
 )
 
 func server(config *serverConfig) {
@@ -48,13 +48,30 @@ func server(config *serverConfig) {
 	}
 	// Auth
 	var authFunc func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string)
-	if len(config.Auth.Mode) == 0 || strings.EqualFold(config.Auth.Mode, "none") {
+	switch authMode := config.Auth.Mode; authMode {
+	case "", "none":
 		logrus.Warn("No authentication configured")
 		authFunc = func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
 			return true, "Welcome"
 		}
-	} else {
-		// TODO
+	case "password":
+		logrus.Info("Password authentication enabled")
+		var pwdConfig map[string]string
+		err = json5.Unmarshal(config.Auth.Config, &pwdConfig)
+		if err != nil || len(pwdConfig["password"]) == 0 {
+			logrus.WithFields(logrus.Fields{
+				"error": err,
+			}).Fatal("Invalid password authentication config")
+		}
+		pwd := pwdConfig["password"]
+		authFunc = func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
+			if string(auth) == pwd {
+				return true, "Welcome"
+			} else {
+				return false, "Wrong password"
+			}
+		}
+	default:
 		logrus.WithField("mode", config.Auth.Mode).Fatal("Unsupported authentication mode")
 	}
 	// Obfuscator