Przeglądaj źródła

show legacy warning only once

Shelikhoo 4 lat temu
rodzic
commit
e413653b1d
2 zmienionych plików z 16 dodań i 1 usunięć
  1. 3 1
      proxy/vmess/encoding/server.go
  2. 13 0
      proxy/vmess/validator.go

+ 3 - 1
proxy/vmess/encoding/server.go

@@ -199,7 +199,9 @@ func (s *ServerSession) DecodeRequestHeader(reader io.Reader) (*protocol.Request
 		if s.isAEADForced {
 			return nil, drainConnection(newError("invalid user: VMessAEAD is enforced and a non VMessAEAD connection is received. You can still disable this security feature with environment variable v2ray.vmess.aead.forced = false . You will not be able to enable legacy header workaround in the future."))
 		}
-		newError("Critical Warning: potentially invalid user: a non VMessAEAD connection is received. From 2022 Jan 1st, this kind of connection will be rejected by default. You should update or replace your client software now. ").AtWarning().WriteToLog()
+		if s.userValidator.ShouldShowLegacyWarn() {
+			newError("Critical Warning: potentially invalid user: a non VMessAEAD connection is received. From 2022 Jan 1st, this kind of connection will be rejected by default. You should update or replace your client software now. This message will not be shown for further violation on this inbound.").AtWarning().WriteToLog()
+		}
 		user = userLegacy
 		iv := hashTimestamp(md5.New(), timestamp)
 		vmessAccount = userLegacy.Account.(*vmess.MemoryAccount)

+ 13 - 0
proxy/vmess/validator.go

@@ -42,6 +42,8 @@ type TimedUserValidator struct {
 	behaviorFused bool
 
 	aeadDecoderHolder *aead.AuthIDDecoderHolder
+
+	legacyWarnShown bool
 }
 
 type indexTimePair struct {
@@ -247,6 +249,17 @@ func (v *TimedUserValidator) BurnTaintFuse(userHash []byte) error {
 	return ErrNotFound
 }
 
+/* ShouldShowLegacyWarn will return whether a Legacy Warning should be shown
+Not guaranteed to only return true once for every inbound, but it is okay.
+*/
+func (v *TimedUserValidator) ShouldShowLegacyWarn() bool {
+	if v.legacyWarnShown {
+		return false
+	}
+	v.legacyWarnShown = true
+	return true
+}
+
 var ErrNotFound = newError("Not Found")
 
 var ErrTainted = newError("ErrTainted")