From 80994b835cd726629256e733049dba1668365efb Mon Sep 17 00:00:00 2001 From: nite07 Date: Mon, 11 Mar 2024 12:53:58 +0800 Subject: [PATCH] update --- parser/hysteria2.go | 6 +-- parser/shadowsocks.go | 4 ++ parser/trojan.go | 64 ++++++++++++++++++++++++++++--- parser/vless.go | 87 ++++++++++++++++++++++++++++++------------- 4 files changed, 124 insertions(+), 37 deletions(-) diff --git a/parser/hysteria2.go b/parser/hysteria2.go index 1c0a7fb..c8f903f 100644 --- a/parser/hysteria2.go +++ b/parser/hysteria2.go @@ -31,10 +31,6 @@ func ParseHysteria2(proxy string) (model.Proxy, error) { return model.Proxy{}, errors.New("invalid hysteria2 Url") } remarks := params.Get("name") - certificate := make([]string, 0) - if params.Get("pinSHA256") != "" { - certificate = append(certificate, params.Get("pinSHA256")) - } server := serverAndPort[0] password := parts[0] network := params.Get("network") @@ -53,7 +49,7 @@ func ParseHysteria2(proxy string) (model.Proxy, error) { Enabled: params.Get("pinSHA256") != "", Insecure: params.Get("insecure") == "1", ServerName: params.Get("sni"), - Certificate: certificate, + Certificate: []string{params.Get("pinSHA256")}, }, Network: network, }, diff --git a/parser/shadowsocks.go b/parser/shadowsocks.go index e43a476..c9f8ced 100644 --- a/parser/shadowsocks.go +++ b/parser/shadowsocks.go @@ -50,6 +50,10 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) { method := credentials[0] password := credentials[1] server := strings.TrimSpace(serverAndPort[0]) + // params, err := url.ParseQuery(proxy) + // if err != nil { + // return model.Proxy{}, err + // } result := model.Proxy{ Type: "shadowsocks", Shadowsocks: model.Shadowsocks{ diff --git a/parser/trojan.go b/parser/trojan.go index fdbfe0f..025c273 100644 --- a/parser/trojan.go +++ b/parser/trojan.go @@ -44,13 +44,65 @@ func ParseTrojan(proxy string) (model.Proxy, error) { Tag: remarks, Server: server, ServerPort: uint16(port), - TLS: &model.OutboundTLSOptions{ - Enabled: true, - ServerName: params.Get("sni"), - }, - Password: password, - Network: "tcp", + Password: password, + Network: params.Get("type"), }, } + if params.Get("security") == "xtls" || params.Get("security") == "tls" { + result.Trojan.TLS = &model.OutboundTLSOptions{ + Enabled: true, + ALPN: strings.Split(params.Get("alpn"), ","), + ServerName: params.Get("sni"), + } + } + if params.Get("security") == "reality" { + result.Trojan.TLS = &model.OutboundTLSOptions{ + Enabled: true, + ServerName: params.Get("sni"), + Reality: &model.OutboundRealityOptions{ + Enabled: true, + PublicKey: params.Get("pbk"), + ShortID: params.Get("sid"), + }, + UTLS: &model.OutboundUTLSOptions{ + Enabled: params.Get("fp") != "", + Fingerprint: params.Get("fp"), + }, + } + } + if params.Get("type") == "ws" { + result.Trojan.Transport = &model.V2RayTransportOptions{ + Type: "ws", + WebsocketOptions: model.V2RayWebsocketOptions{ + Path: params.Get("path"), + Headers: map[string]string{ + "Host": params.Get("host"), + }, + }, + } + } + if params.Get("type") == "http" { + result.Trojan.Transport = &model.V2RayTransportOptions{ + Type: "http", + HTTPOptions: model.V2RayHTTPOptions{ + Host: []string{params.Get("host")}, + Path: params.Get("path"), + }, + } + } + if params.Get("type") == "quic" { + result.Trojan.Transport = &model.V2RayTransportOptions{ + Type: "quic", + QUICOptions: model.V2RayQUICOptions{}, + } + } + if params.Get("type") == "grpc" { + result.Trojan.Transport = &model.V2RayTransportOptions{ + Type: "grpc", + GRPCOptions: model.V2RayGRPCOptions{ + ServiceName: params.Get("serviceName"), + }, + } + } return result, nil } diff --git a/parser/vless.go b/parser/vless.go index f6a5c7a..a8cab0d 100644 --- a/parser/vless.go +++ b/parser/vless.go @@ -57,33 +57,68 @@ func ParseVless(proxy string) (model.Proxy, error) { ServerPort: uint16(port), UUID: uuid, Network: network, - TLS: &model.OutboundTLSOptions{ - Enabled: params.Get("security") == "reality", - ServerName: params.Get("sni"), - UTLS: &model.OutboundUTLSOptions{ - Enabled: params.Get("fp") != "", - Fingerprint: params.Get("fp"), - }, - Reality: &model.OutboundRealityOptions{ - Enabled: params.Get("pbk") != "", - PublicKey: params.Get("pbk"), - ShortID: params.Get("sid"), - }, - ALPN: strings.Split(params.Get("alpn"), ","), - }, - Transport: &model.V2RayTransportOptions{ - WebsocketOptions: model.V2RayWebsocketOptions{ - Path: params.Get("path"), - Headers: map[string]string{ - "Host": params.Get("host"), - }, - }, - GRPCOptions: model.V2RayGRPCOptions{ - ServiceName: params.Get("serviceName"), - }, - }, - Flow: params.Get("flow"), + Flow: params.Get("flow"), }, } + if params.Get("security") == "tls" { + result.VLESS.TLS = &model.OutboundTLSOptions{ + Enabled: true, + ALPN: strings.Split(params.Get("alpn"), ","), + Insecure: params.Get("allowInsecure") == "1", + } + } + if params.Get("security") == "reality" { + result.VLESS.TLS = &model.OutboundTLSOptions{ + Enabled: true, + ServerName: params.Get("sni"), + UTLS: &model.OutboundUTLSOptions{ + Enabled: params.Get("fp") != "", + Fingerprint: params.Get("fp"), + }, + Reality: &model.OutboundRealityOptions{ + Enabled: true, + PublicKey: params.Get("pbk"), + ShortID: params.Get("sid"), + }, + ALPN: strings.Split(params.Get("alpn"), ","), + } + } + if params.Get("type") == "ws" { + result.VLESS.Transport = &model.V2RayTransportOptions{ + Type: "ws", + WebsocketOptions: model.V2RayWebsocketOptions{ + Path: params.Get("path"), + Headers: map[string]string{ + "Host": params.Get("host"), + }, + }, + } + } + if params.Get("type") == "quic" { + result.VLESS.Transport = &model.V2RayTransportOptions{ + Type: "quic", + QUICOptions: model.V2RayQUICOptions{}, + } + } + if params.Get("type") == "grpc" { + result.VLESS.Transport = &model.V2RayTransportOptions{ + Type: "grpc", + GRPCOptions: model.V2RayGRPCOptions{ + ServiceName: params.Get("serviceName"), + }, + } + } + if params.Get("type") == "http" { + host, err := url.QueryUnescape(params.Get("host")) + if err != nil { + return model.Proxy{}, err + } + result.VLESS.Transport = &model.V2RayTransportOptions{ + Type: "http", + HTTPOptions: model.V2RayHTTPOptions{ + Host: strings.Split(host, ","), + }, + } + } return result, nil }