mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

password auth

Browse source
This commit is contained in:
Toby 2021-03-02 17:08:39 -08:00
parent 244d0d43a9
commit b107eae34a
5 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -180,3 +180,4 @@ $RECYCLE.BIN/
# End of https://www.gitignore.io/api/go,linux,macos,windows,intellij+all # End of https://www.gitignore.io/api/go,linux,macos,windows,intellij+all
cmd/relay/*.json cmd/relay/*.json
hy_linux

5
build.ps1 Normal file
View file

@ -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

1
build_windows.bat
View file

@ -1 +0,0 @@
go build -ldflags="-w -s" ./cmd

5
cmd/config.go
View file

@ -3,6 +3,7 @@ package main
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/yosuke-furukawa/json5/encoding/json5"
) )
const ( const (
@ -26,8 +27,8 @@ type serverConfig struct {
ACL string `json:"acl"` ACL string `json:"acl"`
Obfs string `json:"obfs"` Obfs string `json:"obfs"`
Auth struct { Auth struct {
Mode string `json:"mode"` Mode string `json:"mode"`
Config interface{} `json:"config"` Config json5.RawMessage `json:"config"`
} `json:"auth"` } `json:"auth"`
ReceiveWindowConn uint64 `json:"recv_window_conn"` ReceiveWindowConn uint64 `json:"recv_window_conn"`
ReceiveWindowClient uint64 `json:"recv_window_client"` ReceiveWindowClient uint64 `json:"recv_window_client"`

25
cmd/server.go
View file

@ -9,9 +9,9 @@ import (
hyCongestion "github.com/tobyxdd/hysteria/pkg/congestion" hyCongestion "github.com/tobyxdd/hysteria/pkg/congestion"
"github.com/tobyxdd/hysteria/pkg/core" "github.com/tobyxdd/hysteria/pkg/core"
"github.com/tobyxdd/hysteria/pkg/obfs" "github.com/tobyxdd/hysteria/pkg/obfs"
"github.com/yosuke-furukawa/json5/encoding/json5"
"io" "io"
"net" "net"
"strings"
) )
func server(config *serverConfig) { func server(config *serverConfig) {
@ -48,13 +48,30 @@ func server(config *serverConfig) {
} }
// Auth // Auth
var authFunc func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) 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") logrus.Warn("No authentication configured")
authFunc = func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) { authFunc = func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
return true, "Welcome" return true, "Welcome"
} }
} else { case "password":
// TODO 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") logrus.WithField("mode", config.Auth.Mode).Fatal("Unsupported authentication mode")
} }
// Obfuscator // Obfuscator