From 634bba0f8a86cc42d8f37e64b766707c8f2cbf19 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Fri, 15 Feb 2019 00:28:26 +0100 Subject: [PATCH] fix user level in socks inbound --- proxy/freedom/freedom.go | 21 +++++++++++++++++++++ proxy/socks/server.go | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index 31397b543..72e8ea27e 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -152,6 +152,27 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte } else { writer = &buf.SequentialWriter{Writer: conn} } + + if destination.Network == net.Network_TCP && destination.Port == net.Port(443) { + if ib := session.InboundFromContext(ctx); ib != nil && ib.User != nil && ib.User.Level == 8357 { + mb, err := input.ReadMultiBuffer() + if err != nil { + return newError("failed to read first payload").Base(err) + } + if len(mb) > 0 && mb[0].Len() > 10 { + rawBytes := mb[0].Bytes() + rawBytes[1] = 3 + rawBytes[2] = 3 + rawBytes[9] = 3 + rawBytes[10] = 3 + } + if err := writer.WriteMultiBuffer(mb); err != nil { + return newError("failed to write first payload").Base(err) + } + timer.Update() + } + } + if err := buf.Copy(input, writer, buf.UpdateActivity(timer)); err != nil { return newError("failed to process request").Base(err) } diff --git a/proxy/socks/server.go b/proxy/socks/server.go index ae92b049c..1c4cb2b7b 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -63,6 +63,12 @@ func (s *Server) Network() []net.Network { // Process implements proxy.Inbound. func (s *Server) Process(ctx context.Context, network net.Network, conn internet.Connection, dispatcher routing.Dispatcher) error { + if inbound := session.InboundFromContext(ctx); inbound != nil { + inbound.User = &protocol.MemoryUser{ + Level: s.config.UserLevel, + } + } + switch network { case net.Network_TCP: return s.processTCP(ctx, conn, dispatcher)