Populate Seed (more TBD) and checks

Author: yuhan6665

proxy/vless/account.go

@@ -15,6 +15,7 @@ func (a *Account) AsAccount() (protocol.Account, error) {
 		ID:         protocol.NewID(id),
 		Flow:       a.Flow,       // needs parser here?
 		Encryption: a.Encryption, // needs parser here?
+		Seed:       a.Seed,
 	}, nil
 }
 
@@ -26,6 +27,8 @@ type MemoryAccount struct {
 	Flow string
 	// Encryption of the account. Used for client connections, and only accepts "none" for now.
 	Encryption string
+	// Seed. Details TBD
+	Seed string
 }
 
 // Equals implements protocol.Account.Equals().

proxy/vless/account.pb.go

@@ -13,4 +13,6 @@ message Account {
   string flow = 2;
   // Encryption settings. Only applies to client side, and only accepts "none" for now.
   string encryption = 3;
+  // Seed settings. Details TBD
+  string seed = 4;
 }

proxy/vless/account.proto

@@ -1,6 +1,7 @@
 package encoding
 
 import (
+	"bytes"
 	"context"
 	"io"
 
@@ -177,3 +178,64 @@ func (r *LengthPacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
 	}
 	return mb, nil
 }
+
+func PopulateSeed(seed string, addons *Addons) {
+	if len(seed) > 0 {
+		addons.Seed = []byte {1} // only turn on, more TBD
+		addons.Mode = SeedMode_PaddingPlusDelay
+		addons.Duration = "0-8"
+		addons.Padding = &PaddingConfig{
+			RegularMin: 0,
+			RegularMax: 256,
+			LongMin:    900,
+			LongMax:    1400,
+		}
+		addons.Delay = &DelayConfig{
+			IsRandom: true,
+			MinMillis: 100,
+			MaxMillis: 500,
+		}
+		addons.Scheduler = &SchedulerConfig{
+			TimeoutMillis: 600,
+		}
+	}
+}
+
+func CheckSeed(requestAddons *Addons, responseAddons *Addons) error {
+	if !bytes.Equal(requestAddons.Seed, responseAddons.Seed) {
+		return newError("Seed bytes not match", requestAddons.Seed, responseAddons.Seed)
+	}
+	if requestAddons.Mode != responseAddons.Mode {
+		return newError("Mode not match", requestAddons.Mode, responseAddons.Mode)
+	}
+	if requestAddons.Duration != responseAddons.Duration {
+		return newError("Duration not match", requestAddons.Duration, responseAddons.Duration)
+	}
+	if requestAddons.Padding != nil && responseAddons.Padding != nil {
+		if requestAddons.Padding.RegularMin != responseAddons.Padding.RegularMin || 
+		requestAddons.Padding.RegularMax != responseAddons.Padding.RegularMax || 
+		requestAddons.Padding.LongMin != responseAddons.Padding.LongMin || 
+		requestAddons.Padding.LongMax != responseAddons.Padding.LongMax {
+			return newError("Padding not match")
+		}
+	} else if requestAddons.Padding != nil || responseAddons.Padding != nil {
+		return newError("Padding of one is nil but the other is not nil")
+	}
+	if requestAddons.Delay != nil && responseAddons.Delay != nil {
+		if requestAddons.Delay.IsRandom != responseAddons.Delay.IsRandom || 
+		requestAddons.Delay.MinMillis != responseAddons.Delay.MinMillis || 
+		requestAddons.Delay.MaxMillis != responseAddons.Delay.MaxMillis {
+			return newError("Delay not match")
+		}
+	} else if requestAddons.Delay != nil || responseAddons.Delay != nil {
+		return newError("Delay of one is nil but the other is not nil")
+	}
+	if requestAddons.Scheduler != nil && responseAddons.Scheduler != nil {
+		if requestAddons.Scheduler.TimeoutMillis != responseAddons.Scheduler.TimeoutMillis {
+			return newError("Scheduler not match")
+		}
+	} else if requestAddons.Scheduler != nil || responseAddons.Scheduler != nil {
+		return newError("Scheduler of one is nil but the other is not nil")
+	}
+	return nil
+}

proxy/vless/encoding/addons.go

@@ -13,7 +13,7 @@ message Addons {
   string Duration = 4;  // "0-8" means apply to number of packets, "1kb-" means start applying once both side exchange 1kb data, counting two-ways
   PaddingConfig Padding = 5;
   DelayConfig Delay = 6;
-  SchedulerConfig SchedulerConfig = 7;
+  SchedulerConfig Scheduler = 7;
 }
 
 enum SeedMode {

proxy/vless/encoding/addons.pb.go

@@ -443,6 +443,10 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection s
 	responseAddons := &encoding.Addons{
 		// Flow: requestAddons.Flow,
 	}
+	encoding.PopulateSeed(account.Seed, responseAddons)
+	if check := encoding.CheckSeed(requestAddons, responseAddons); check != nil {
+		return newError("Seed configuration mis-match").Base(check).AtWarning()
+	}
 
 	var input *bytes.Reader
 	var rawInput *bytes.Buffer

proxy/vless/encoding/addons.proto

@@ -120,6 +120,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
 	requestAddons := &encoding.Addons{
 		Flow: account.Flow,
 	}
+	encoding.PopulateSeed(account.Seed, requestAddons)
 
 	var input *bytes.Reader
 	var rawInput *bytes.Buffer