From 702533e1e60d6c139fa23f92bcbeafd77cfb31e1 Mon Sep 17 00:00:00 2001 From: kr-ilya Date: Sun, 4 Jan 2026 18:01:27 +0300 Subject: [PATCH] refactor: code cleanup --- sub/subJsonService.go | 6 +++--- sub/subService.go | 11 ++++------- util/crypto/crypto.go | 3 +-- util/ldap/ldap.go | 38 ++++++++++++++++++++++++++---------- util/random/random.go | 6 +++--- util/reflect_util/reflect.go | 4 ++-- util/sys/sys_darwin.go | 4 ++-- web/job/clear_logs_job.go | 2 +- 8 files changed, 44 insertions(+), 30 deletions(-) diff --git a/sub/subJsonService.go b/sub/subJsonService.go index 86a7a405..8222491a 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -4,6 +4,7 @@ import ( _ "embed" "encoding/json" "fmt" + "maps" "strings" "github.com/mhsanaei/3x-ui/v2/database/model" @@ -197,9 +198,8 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client, newOutbounds = append(newOutbounds, s.defaultOutbounds...) newConfigJson := make(map[string]any) - for key, value := range s.configJson { - newConfigJson[key] = value - } + maps.Copy(newConfigJson, s.configJson) + newConfigJson["outbounds"] = newOutbounds newConfigJson["remarks"] = s.SubService.genRemark(inbound, client.Email, extPrxy["remark"].(string)) diff --git a/sub/subService.go b/sub/subService.go index ade871df..e046ebb4 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -484,8 +484,8 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { externalProxies, _ := stream["externalProxy"].([]any) if len(externalProxies) > 0 { - links := "" - for index, externalProxy := range externalProxies { + links := make([]string, 0, len(externalProxies)) + for _, externalProxy := range externalProxies { ep, _ := externalProxy.(map[string]any) newSecurity, _ := ep["forceTls"].(string) dest, _ := ep["dest"].(string) @@ -511,12 +511,9 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string { url.Fragment = s.genRemark(inbound, email, ep["remark"].(string)) - if index > 0 { - links += "\n" - } - links += url.String() + links = append(links, url.String()) } - return links + return strings.Join(links, "\n") } link := fmt.Sprintf("vless://%s@%s:%d", uuid, address, port) diff --git a/util/crypto/crypto.go b/util/crypto/crypto.go index 05d088a8..2db5bd83 100644 --- a/util/crypto/crypto.go +++ b/util/crypto/crypto.go @@ -13,6 +13,5 @@ func HashPasswordAsBcrypt(password string) (string, error) { // CheckPasswordHash verifies if the given password matches the bcrypt hash. func CheckPasswordHash(hash, password string) bool { - err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) - return err == nil + return bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) == nil } diff --git a/util/ldap/ldap.go b/util/ldap/ldap.go index 795d0e23..1b9faa53 100644 --- a/util/ldap/ldap.go +++ b/util/ldap/ldap.go @@ -24,13 +24,22 @@ type Config struct { // FetchVlessFlags returns map[email]enabled func FetchVlessFlags(cfg Config) (map[string]bool, error) { addr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) - var conn *ldap.Conn - var err error + + scheme := "ldap" if cfg.UseTLS { - conn, err = ldap.DialTLS("tcp", addr, &tls.Config{InsecureSkipVerify: false}) - } else { - conn, err = ldap.Dial("tcp", addr) + scheme = "ldaps" } + + ldapURL := fmt.Sprintf("%s://%s", scheme, addr) + + var opts []ldap.DialOpt + if cfg.UseTLS { + opts = append(opts, ldap.DialWithTLSConfig(&tls.Config{ + InsecureSkipVerify: false, + })) + } + + conn, err := ldap.DialURL(ldapURL, opts...) if err != nil { return nil, err } @@ -91,13 +100,22 @@ func FetchVlessFlags(cfg Config) (map[string]bool, error) { // AuthenticateUser searches user by cfg.UserAttr and attempts to bind with provided password. func AuthenticateUser(cfg Config, username, password string) (bool, error) { addr := fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) - var conn *ldap.Conn - var err error + + scheme := "ldap" if cfg.UseTLS { - conn, err = ldap.DialTLS("tcp", addr, &tls.Config{InsecureSkipVerify: false}) - } else { - conn, err = ldap.Dial("tcp", addr) + scheme = "ldaps" } + + ldapURL := fmt.Sprintf("%s://%s", scheme, addr) + + var opts []ldap.DialOpt + if cfg.UseTLS { + opts = append(opts, ldap.DialWithTLSConfig(&tls.Config{ + InsecureSkipVerify: false, + })) + } + + conn, err := ldap.DialURL(ldapURL, opts...) if err != nil { return false, err } diff --git a/util/random/random.go b/util/random/random.go index c746df63..ddb819c1 100644 --- a/util/random/random.go +++ b/util/random/random.go @@ -18,10 +18,10 @@ var ( // init initializes the character sequences used for random string generation. // It sets up arrays for numbers, lowercase letters, uppercase letters, and combinations. func init() { - for i := 0; i < 10; i++ { + for i := range 10 { numSeq[i] = rune('0' + i) } - for i := 0; i < 26; i++ { + for i := range 26 { lowerSeq[i] = rune('a' + i) upperSeq[i] = rune('A' + i) } @@ -40,7 +40,7 @@ func init() { // Seq generates a random string of length n containing alphanumeric characters (numbers, lowercase and uppercase letters). func Seq(n int) string { runes := make([]rune, n) - for i := 0; i < n; i++ { + for i := range n { idx, err := rand.Int(rand.Reader, big.NewInt(int64(len(allSeq)))) if err != nil { panic("crypto/rand failed: " + err.Error()) diff --git a/util/reflect_util/reflect.go b/util/reflect_util/reflect.go index 1f557e0d..b56f1456 100644 --- a/util/reflect_util/reflect.go +++ b/util/reflect_util/reflect.go @@ -7,7 +7,7 @@ import "reflect" func GetFields(t reflect.Type) []reflect.StructField { num := t.NumField() fields := make([]reflect.StructField, 0, num) - for i := 0; i < num; i++ { + for i := range num { fields = append(fields, t.Field(i)) } return fields @@ -17,7 +17,7 @@ func GetFields(t reflect.Type) []reflect.StructField { func GetFieldValues(v reflect.Value) []reflect.Value { num := v.NumField() fields := make([]reflect.Value, 0, num) - for i := 0; i < num; i++ { + for i := range num { fields = append(fields, v.Field(i)) } return fields diff --git a/util/sys/sys_darwin.go b/util/sys/sys_darwin.go index 6ecc78c0..b635b549 100644 --- a/util/sys/sys_darwin.go +++ b/util/sys/sys_darwin.go @@ -47,11 +47,11 @@ func CPUPercentRaw() (float64, error) { var out [5]uint64 switch len(raw) { case 5 * 8: - for i := 0; i < 5; i++ { + for i := range 5 { out[i] = binary.LittleEndian.Uint64(raw[i*8 : (i+1)*8]) } case 5 * 4: - for i := 0; i < 5; i++ { + for i := range 5 { out[i] = uint64(binary.LittleEndian.Uint32(raw[i*4 : (i+1)*4])) } default: diff --git a/web/job/clear_logs_job.go b/web/job/clear_logs_job.go index 85e0d64a..4ec0ec7f 100644 --- a/web/job/clear_logs_job.go +++ b/web/job/clear_logs_job.go @@ -45,7 +45,7 @@ func (j *ClearLogsJob) Run() { } // Clear log files and copy to previous logs - for i := 0; i < len(logFiles); i++ { + for i := range len(logFiles) { if i > 0 { // Copy to previous logs logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)