him411/UA3F
1
0
Fork 0
mirror of https://github.com/SunBK201/UA3F.git synced 2025-12-18 09:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(log): more log level option

Browse Source
This commit is contained in:
SunBK201 2023-12-30 01:43:53 +08:00
parent 77c300d2c8
commit 88b3796d74
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/ua3f.go
View File

@ -85,7 +85,7 @@ func main() {
func process(client net.Conn) { func process(client net.Conn) {
if err := Socks5Auth(client); err != nil { if err := Socks5Auth(client); err != nil {
logrus.Error("Auth failed: ", err) // logrus.Error("Auth failed: ", err)
client.Close() client.Close()
return return
} }
@ -103,18 +103,26 @@ func Socks5Auth(client net.Conn) (err error) {
buf := make([]byte, 256) buf := make([]byte, 256)
n, err := io.ReadFull(client, buf[:2]) n, err := io.ReadFull(client, buf[:2])
if n != 2 { if n != 2 {
if err == io.EOF {
logrus.Warn(fmt.Sprintf("[%s][Auth] read EOF", client.RemoteAddr().String()))
} else {
logrus.Error(fmt.Sprintf("[%s][Auth] read header: %s", client.RemoteAddr().String(), err.Error()))
}
return errors.New("reading header:" + err.Error()) return errors.New("reading header:" + err.Error())
} }
ver, nMethods := int(buf[0]), int(buf[1]) ver, nMethods := int(buf[0]), int(buf[1])
if ver != 5 { if ver != 5 {
logrus.Error(fmt.Sprintf("[%s][Auth] invalid ver", client.RemoteAddr().String()))
return errors.New("invalid version") return errors.New("invalid version")
} }
n, err = io.ReadFull(client, buf[:nMethods]) n, err = io.ReadFull(client, buf[:nMethods])
if n != nMethods { if n != nMethods {
return errors.New("reading methods:" + err.Error()) logrus.Error(fmt.Sprintf("[%s][Auth] read methods: %s", client.RemoteAddr().String(), err.Error()))
return errors.New("read methods:" + err.Error())
} }
n, err = client.Write([]byte{0x05, 0x00}) n, err = client.Write([]byte{0x05, 0x00})
if n != 2 || err != nil { if n != 2 || err != nil {
logrus.Error(fmt.Sprintf("[%s][Auth] write rsp: %s", client.RemoteAddr().String(), err.Error()))
return errors.New("write rsp:" + err.Error()) return errors.New("write rsp:" + err.Error())
} }
return nil return nil

2
luci/cbi.lua
View File

@ -39,6 +39,8 @@ log_level:value("debug")
log_level:value("info") log_level:value("info")
log_level:value("warn") log_level:value("warn")
log_level:value("error") log_level:value("error")
log_level:value("fatal")
log_level:value("panic")
log = main:taboption("log", TextValue, "") log = main:taboption("log", TextValue, "")
log.readonly = true log.readonly = true