Merge pull request #2 from lk29/x-ui

X UI compatible

app/dispatcher/default.go

@@ -8,6 +8,9 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"os"
+	ss "strings"
+
 
 	"github.com/xtls/xray-core/common"
 	"github.com/xtls/xray-core/common/buf"
@@ -27,6 +30,7 @@ import (
 )
 
 var errSniffingTimeout = newError("timeout on sniffing")
+var restrictedIPs string
 
 type cachedReader struct {
 	sync.Mutex
@@ -98,6 +102,9 @@ type DefaultDispatcher struct {
 }
 
 func init() {
+	// init read restricted IPs timer (first time every 10s,next times every 30s)
+	initRestrictedIPs()
+
 	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
 		d := new(DefaultDispatcher)
 		if err := core.RequireFeatures(ctx, func(om outbound.Manager, router routing.Router, pm policy.Manager, sm stats.Manager, dc dns.Client) error {
@@ -217,6 +224,8 @@ func (d *DefaultDispatcher) getLink(ctx context.Context, network net.Network, sn
 		Writer: downlinkWriter,
 	}
 
+	// check and drop Restricted Connections
+	dropRestrictedConnections(ctx,outboundLink,inboundLink)
 	sessionInbound := session.InboundFromContext(ctx)
 	var user *protocol.MemoryUser
 	if sessionInbound != nil {
@@ -247,7 +256,69 @@ func (d *DefaultDispatcher) getLink(ctx context.Context, network net.Network, sn
 
 	return inboundLink, outboundLink
 }
+func getOsArgValue(s []string, flags... string) string {
+	for i, v := range s {
+		for _, flagVal := range flags {
+			if v == flagVal {
+				return s[i + 1]
+			}
+		}
+	}
+
+	return ""
+}
+func contains(s []string, str string) bool {
+	for _, v := range s {
+		if v == str {
+			return true
+		}
+	}
+	return false
+}
+func initRestrictedIPs(){
+	intvalSecond := 10 * time.Second
+	ticker := time.NewTicker(intvalSecond)
+	quit := make(chan struct{})
+	restrictedIPsPath := getOsArgValue(os.Args,"-restrictedIPsPath","-rip")
+	if restrictedIPsPath == "" {
+		return
+	}
+	go func() {
+		intvalSecond = 30 * time.Second
+		for {
+		select {
+			case <- ticker.C:
+				restrictedIPsByte, err := os.ReadFile(restrictedIPsPath)
+				restrictedIPs = string(restrictedIPsByte)
+				newError("getting  restrictedIPs:", restrictedIPs,err).AtDebug().WriteToLog()
+
+			case <- quit:
+				ticker.Stop()
+				return
+			}
+		}
+	}()
+}
+func dropRestrictedConnections(ctx context.Context,outboundLink *transport.Link,inboundLink *transport.Link){
+	if restrictedIPs == ""{
+		return
+	}
+	// Drop Restricted Connections
+	sessionInbounds := session.InboundFromContext(ctx)
+	userIP := sessionInbounds.Source.Address.String()
+	IPs := ss.Split(string(restrictedIPs), ",")
+
+	if(contains(IPs,userIP)){
+		newError("IP Limited: ",userIP).AtDebug().WriteToLog(session.ExportIDToError(ctx))
+		common.Close(outboundLink.Writer)
+		common.Close(inboundLink.Writer)
+		common.Interrupt(outboundLink.Reader)
+		common.Interrupt(inboundLink.Reader)
 
+	}
+
+}
+
 func (d *DefaultDispatcher) shouldOverride(ctx context.Context, result SniffResult, request session.SniffingRequest, destination net.Destination) bool {
 	domain := result.Domain()
 	if domain == "" {

main/run.go

@@ -33,6 +33,10 @@ The -confdir=dir flag sets a dir with multiple json config
 The -format=json flag sets the format of config files. 
 Default "auto".
 
+The -restrictedIPsPath=file, -rip=file flags set the restricted IPs file path
+The IPs should split by "," in file. EX : 1.1.1.1,2.2.2.2 
+Default "".
+
 The -test flag tells Xray to test config files only, 
 without launching the server
 	`,
@@ -45,6 +49,7 @@ func init() {
 var (
 	configFiles cmdarg.Arg // "Config file for Xray.", the option is customed type, parse in main
 	configDir   string
+	restrictedIPsPath  string
 	test        = cmdRun.Flag.Bool("test", false, "Test config file only, without launching Xray server.")
 	format      = cmdRun.Flag.String("format", "auto", "Format of input file.")
 
@@ -55,6 +60,8 @@ var (
 		cmdRun.Flag.Var(&configFiles, "config", "Config path for Xray.")
 		cmdRun.Flag.Var(&configFiles, "c", "Short alias of -config")
 		cmdRun.Flag.StringVar(&configDir, "confdir", "", "A dir with multiple json config")
+		cmdRun.Flag.StringVar(&restrictedIPsPath, "restrictedIPsPath", "", "disAllowed IPs file path")
+		cmdRun.Flag.StringVar(&restrictedIPsPath, "rip", "", "Short alias of -restrictedIPsPath")
 
 		return true
 	}()