mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
This commit is contained in:
1 parent
38b34030bc
commit
579b427e9d
10 files changed
+47
-41
No files matched your search
+3
-3
@@ -3,7 +3,7 @@ package proxy
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"sort"
|
||||
"slices"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -59,7 +59,7 @@ func DialerFromURL(s string, dialer Dialer) (Dialer, error) {
|
||||
s = s + "://"
|
||||
}
|
||||
|
||||
scheme := s[:strings.Index(s, ":")]
|
||||
scheme, _, _ := strings.Cut(s, ":")
|
||||
c, ok := dialerCreators[strings.ToLower(scheme)]
|
||||
if ok {
|
||||
return c(s, dialer)
|
||||
@@ -74,6 +74,6 @@ func DialerSchemes() string {
|
||||
for name := range dialerCreators {
|
||||
s = append(s, name)
|
||||
}
|
||||
sort.Strings(s)
|
||||
slices.Sort(s)
|
||||
return strings.Join(s, " ")
|
||||
}
|
||||
+13
-10
@@ -60,13 +60,15 @@ func NewHTTP(s string, d proxy.Dialer, p proxy.Proxy) (*HTTP, error) {
|
||||
|
||||
// parseStartLine parses "GET /foo HTTP/1.1" OR "HTTP/1.1 200 OK" into its three parts.
|
||||
func parseStartLine(line string) (r1, r2, r3 string, ok bool) {
|
||||
s1 := strings.Index(line, " ")
|
||||
s2 := strings.Index(line[s1+1:], " ")
|
||||
if s1 < 0 || s2 < 0 {
|
||||
r1, rest, ok := strings.Cut(line, " ")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
s2 += s1 + 1
|
||||
return line[:s1], line[s1+1 : s2], line[s2+1:], true
|
||||
r2, r3, ok = strings.Cut(rest, " ")
|
||||
if !ok {
|
||||
return "", "", "", false
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func cleanHeaders(header textproto.MIMEHeader) {
|
||||
@@ -95,22 +97,23 @@ func writeHeaders(w io.Writer, header textproto.MIMEHeader) {
|
||||
}
|
||||
|
||||
func extractUserPass(auth string) (username, password string, ok bool) {
|
||||
if !strings.HasPrefix(auth, "Basic ") {
|
||||
token, ok := strings.CutPrefix(auth, "Basic ")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
b, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(auth, "Basic "))
|
||||
b, err := base64.StdEncoding.DecodeString(token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
s := string(b)
|
||||
idx := strings.IndexByte(s, ':')
|
||||
if idx < 0 {
|
||||
username, password, ok = strings.Cut(s, ":")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
return s[:idx], s[idx+1:], true
|
||||
return username, password, true
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@ package proxy
|
||||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"sort"
|
||||
"slices"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -44,7 +44,7 @@ func ServerFromURL(s string, proxy Proxy) (Server, error) {
|
||||
s = "mixed://" + s
|
||||
}
|
||||
|
||||
scheme := s[:strings.Index(s, ":")]
|
||||
scheme, _, _ := strings.Cut(s, ":")
|
||||
c, ok := serverCreators[strings.ToLower(scheme)]
|
||||
if ok {
|
||||
return c(s, proxy)
|
||||
@@ -59,6 +59,6 @@ func ServerSchemes() string {
|
||||
for name := range serverCreators {
|
||||
s = append(s, name)
|
||||
}
|
||||
sort.Strings(s)
|
||||
slices.Sort(s)
|
||||
return strings.Join(s, " ")
|
||||
}
|
||||
+1
-2
@@ -33,8 +33,7 @@ func sealVMessAEADHeader(key [16]byte, data []byte) []byte {
|
||||
connectionNonce := make([]byte, 8)
|
||||
rand.Read(connectionNonce)
|
||||
|
||||
aeadPayloadLengthSerializedByte := make([]byte, 2)
|
||||
binary.BigEndian.PutUint16(aeadPayloadLengthSerializedByte, uint16(len(data)))
|
||||
aeadPayloadLengthSerializedByte := binary.BigEndian.AppendUint16(nil, uint16(len(data)))
|
||||
|
||||
var payloadHeaderLengthAEADEncrypted []byte
|
||||
|
||||
|
||||
+7
-5
@@ -93,13 +93,15 @@ func NewWS(s string, d proxy.Dialer, p proxy.Proxy, withTLS bool) (*WS, error) {
|
||||
// parseFirstLine parses "GET /foo HTTP/1.1" OR "HTTP/1.1 200 OK" into its three parts.
|
||||
// TODO: move to separate http lib package for reuse(also for http proxy module)
|
||||
func parseFirstLine(line string) (r1, r2, r3 string, ok bool) {
|
||||
s1 := strings.Index(line, " ")
|
||||
s2 := strings.Index(line[s1+1:], " ")
|
||||
if s1 < 0 || s2 < 0 {
|
||||
r1, rest, ok := strings.Cut(line, " ")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
s2 += s1 + 1
|
||||
return line[:s1], line[s1+1 : s2], line[s2+1:], true
|
||||
r2, r3, ok = strings.Cut(rest, " ")
|
||||
if !ok {
|
||||
return "", "", "", false
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func generateClientKey() string {
|
||||
|
||||
Reference in new issue
Block a user