GuanM/XrayR
1
0
Fork 0
mirror of https://github.com/XrayR-project/XrayR.git synced 2025-06-08 13:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: http mode not working

Browse Source 
fix: use "email|uid" for global limit user identify
update: tls alpn challenge for apply certificate
This commit is contained in:
Senis 2022-11-16 12:59:44 +08:00
parent e16d94fb4a
commit e0237f5c54
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/limiter/limiter.go
View File

@ -1,10 +1,10 @@
// Package limiter is to control the links that go into the dispather // Package limiter is to control the links that go into the dispatcher
package limiter package limiter
import ( import (
"context" "context"
"fmt" "fmt"
"strconv" "strings"
"sync" "sync"
"time" "time"
@ -160,7 +160,7 @@ func (l *Limiter) GetUserBucket(tag string, email string, ip string) (limiter *r
if l.g.limit > 0 { if l.g.limit > 0 {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(l.g.timeout)) ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(l.g.timeout))
defer cancel() defer cancel()
uidString := strconv.Itoa(uid) uidString := email[strings.Index(email, "|")+1:]
// If any device is online // If any device is online
if exists, err := l.r.Exists(ctx, uidString).Result(); err != nil { if exists, err := l.r.Exists(ctx, uidString).Result(); err != nil {
newError(fmt.Sprintf("Redis: %v", err)).AtError().WriteToLog() newError(fmt.Sprintf("Redis: %v", err)).AtError().WriteToLog()

0
common/mylego/cmd_renew.go → common/mylego/renew.go
View File

0
common/mylego/cmd_renew_test.go → common/mylego/renew_test.go
View File

0
common/mylego/cmd_run.go → common/mylego/run.go
View File

4
common/mylego/setup.go
View File

@ -63,12 +63,12 @@ func createNonExistingFolder(path string) error {
func setupChallenges(l *LegoCMD, client *lego.Client) { func setupChallenges(l *LegoCMD, client *lego.Client) {
switch l.C.CertMode { switch l.C.CertMode {
case "http": case "http":
err := client.Challenge.SetHTTP01Provider(http01.NewProviderServer("", "5001")) err := client.Challenge.SetHTTP01Provider(http01.NewProviderServer("", ""))
if err != nil { if err != nil {
log.Panic(err) log.Panic(err)
} }
case "tls": case "tls":
err := client.Challenge.SetTLSALPN01Provider(tlsalpn01.NewProviderServer("", "5002")) err := client.Challenge.SetTLSALPN01Provider(tlsalpn01.NewProviderServer("", ""))
if err != nil { if err != nil {
log.Panic(err) log.Panic(err)
} }

2
main/config.yml.example
View File

@ -54,7 +54,7 @@ Nodes:
Dest: 80 # Required, Destination of fallback, check https://xtls.github.io/config/features/fallback.html for details. Dest: 80 # Required, Destination of fallback, check https://xtls.github.io/config/features/fallback.html for details.
ProxyProtocolVer: 0 # Send PROXY protocol version, 0 for dsable ProxyProtocolVer: 0 # Send PROXY protocol version, 0 for dsable
CertConfig: CertConfig:
CertMode: dns # Option about how to get certificate: none, file, http, dns. Choose "none" will forcedly disable the tls config. CertMode: dns # Option about how to get certificate: none, file, http, tls, dns. Choose "none" will forcedly disable the tls config.
CertDomain: "node1.test.com" # Domain to cert CertDomain: "node1.test.com" # Domain to cert
CertFile: /etc/XrayR/cert/node1.test.com.cert # Provided if the CertMode is file CertFile: /etc/XrayR/cert/node1.test.com.cert # Provided if the CertMode is file
KeyFile: /etc/XrayR/cert/node1.test.com.key KeyFile: /etc/XrayR/cert/node1.test.com.key

11
service/controller/inboundbuilder.go
View File

@ -197,12 +197,13 @@ func InboundBuilder(config *Config, nodeInfo *api.NodeInfo, tag string) (*core.I
} }
func getCertFile(certConfig *mylego.CertConfig) (certFile string, keyFile string, err error) { func getCertFile(certConfig *mylego.CertConfig) (certFile string, keyFile string, err error) {
if certConfig.CertMode == "file" { switch certConfig.CertMode {
case "file":
if certConfig.CertFile == "" || certConfig.KeyFile == "" { if certConfig.CertFile == "" || certConfig.KeyFile == "" {
return "", "", fmt.Errorf("cert file path or key file path not exist") return "", "", fmt.Errorf("cert file path or key file path not exist")
} }
return certConfig.CertFile, certConfig.KeyFile, nil return certConfig.CertFile, certConfig.KeyFile, nil
} else if certConfig.CertMode == "dns" { case "dns":
lego, err := mylego.New(certConfig) lego, err := mylego.New(certConfig)
if err != nil { if err != nil {
return "", "", err return "", "", err
@ -212,7 +213,7 @@ func getCertFile(certConfig *mylego.CertConfig) (certFile string, keyFile string
return "", "", err return "", "", err
} }
return certPath, keyPath, err return certPath, keyPath, err
} else if certConfig.CertMode == "http" { case "http", "tls":
lego, err := mylego.New(certConfig) lego, err := mylego.New(certConfig)
if err != nil { if err != nil {
return "", "", err return "", "", err
@ -222,10 +223,10 @@ func getCertFile(certConfig *mylego.CertConfig) (certFile string, keyFile string
return "", "", err return "", "", err
} }
return certPath, keyPath, err return certPath, keyPath, err
} default:
return "", "", fmt.Errorf("unsupported certmode: %s", certConfig.CertMode) return "", "", fmt.Errorf("unsupported certmode: %s", certConfig.CertMode)
} }
}
func buildVlessFallbacks(fallbackConfigs []*FallBackConfig) ([]*conf.VLessInboundFallback, error) { func buildVlessFallbacks(fallbackConfigs []*FallBackConfig) ([]*conf.VLessInboundFallback, error) {
if fallbackConfigs == nil { if fallbackConfigs == nil {