mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-08 14:09:20 +02:00
chore(vless): use email instead of id for ip restriction
This commit is contained in:
parent
343adca4c0
commit
6a0ff0efce
|
@ -449,22 +449,21 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
|
||||||
|
|
||||||
if (request.User.IpLimit > 0) {
|
if (request.User.IpLimit > 0) {
|
||||||
addr := connection.RemoteAddr().(*net.TCPAddr)
|
addr := connection.RemoteAddr().(*net.TCPAddr)
|
||||||
user := account.ID.String()
|
|
||||||
|
|
||||||
uniqueIps := make(map[string]bool)
|
uniqueIps := make(map[string]bool)
|
||||||
// Iterate through the connections and find unique used IP addresses withing last 30 seconds.
|
// Iterate through the connections and find unique used IP addresses withing last 30 seconds.
|
||||||
for _, conn := range *usrIpRstrct {
|
for _, conn := range *usrIpRstrct {
|
||||||
if conn.User == user && !conn.IpAddress.Equal(addr.IP) && ((time.Now().Unix() - conn.Time) < 30) {
|
if conn.User == request.User.Email && !conn.IpAddress.Equal(addr.IP) && ((time.Now().Unix() - conn.Time) < 30) {
|
||||||
uniqueIps[conn.IpAddress.String()] = true
|
uniqueIps[conn.IpAddress.String()] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len(uniqueIps) >= int(request.User.IpLimit)) {
|
if (len(uniqueIps) >= int(request.User.IpLimit)) {
|
||||||
return newError("User ", user, " has exceeded their allowed IPs.").AtWarning()
|
return newError("User ", request.User.Email, " has exceeded their allowed IPs.").AtWarning()
|
||||||
}
|
}
|
||||||
|
|
||||||
connIp.IpAddress = addr.IP
|
connIp.IpAddress = addr.IP
|
||||||
connIp.User = user
|
connIp.User = request.User.Email
|
||||||
connIp.Time = time.Now().Unix()
|
connIp.Time = time.Now().Unix()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue