docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
default:
return "", ErrInvalidNetwork | <mask> case C.UDP:
<mask> spath = "net.inet.udp.pcblist_n"
<mask> }
<mask>
<mask> isIPv4 := ip.To4() != nil
<mask>
<mask> value, err := syscall.Sysctl(spath)
<mask> if err != nil {
</s> Improve: simplify macOS process searching </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: </s> remove func getExecPathFromAddress(ip net.IP, portStr string, isTCP bool) (string, error) {
port, err := strconv.Atoi(portStr)
</s> add func getExecPathFromAddress(metadata *C.Metadata) (string, error) {
ip := metadata.SrcIP
port, err := strconv.Atoi(metadata.SrcPort) </s> remove name, err := getExecPathFromAddress(metadata.SrcIP, metadata.SrcPort, metadata.NetWork == C.TCP)
</s> add name, err := getExecPathFromAddress(metadata) </s> remove var kinds uint32 = 0
so, inp := 0, 0
for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
if kinds&thisKind == 0 {
kinds |= thisKind
switch thisKind {
case 0x1:
// XSO_SOCKET
so = int(i)
case 0x10:
// XSO_INPCB
inp = int(i)
default:
break
}
}
// all blocks needed by tcp/udp
if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
continue
}
kinds = 0
// xsocket_n.xso_protocol
proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
continue
}
</s> add // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
isIPv4 := ip.To4() != nil
| <mask> default:
<mask> return "", ErrInvalidNetwork
<mask> }
<mask>
<mask> value, err := syscall.Sysctl(spath)
<mask> if err != nil {
<mask> return "", err
<mask> }
</s> Improve: simplify macOS process searching </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: </s> remove func getExecPathFromAddress(ip net.IP, portStr string, isTCP bool) (string, error) {
port, err := strconv.Atoi(portStr)
</s> add func getExecPathFromAddress(metadata *C.Metadata) (string, error) {
ip := metadata.SrcIP
port, err := strconv.Atoi(metadata.SrcPort) </s> remove func xinpgenSize(b []byte) uint32 {
return binary.LittleEndian.Uint32(b[:4])
}
func roundUp8(n uint32) uint32 {
if n == 0 {
return uint32(8)
}
return (n + 7) & ((^uint32(8)) + 1)
</s> add func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0])) </s> remove name, err := getExecPathFromAddress(metadata.SrcIP, metadata.SrcPort, metadata.NetWork == C.TCP)
</s> add name, err := getExecPathFromAddress(metadata) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
// from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 | <mask> }
<mask>
<mask> buf := []byte(value)
<mask>
<mask> var kinds uint32 = 0
<mask> so, inp := 0, 0
<mask> for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
<mask> thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
<mask> if kinds&thisKind == 0 {
<mask> kinds |= thisKind
<mask> switch thisKind {
<mask> case 0x1:
<mask> // XSO_SOCKET
<mask> so = int(i)
<mask> case 0x10:
<mask> // XSO_INPCB
<mask> inp = int(i)
<mask> default:
<mask> break
<mask> }
<mask> }
<mask>
<mask> // all blocks needed by tcp/udp
<mask> if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
<mask> continue
<mask> }
<mask> kinds = 0
<mask>
<mask> // xsocket_n.xso_protocol
<mask> proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
<mask> if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
<mask> continue
<mask> }
<mask>
<mask> srcPort := binary.BigEndian.Uint16(buf[inp+18 : inp+20])
<mask> if uint16(port) != srcPort {
<mask> continue
<mask> }
</s> Improve: simplify macOS process searching </s> remove if flag&0x1 > 0 {
</s> add switch {
case flag&0x1 > 0 && isIPv4: </s> remove } else if flag&0x2 > 0 {
</s> add case flag&0x2 > 0 && !isIPv4: </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: </s> remove } else {
</s> add default: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
switch {
case flag&0x1 > 0 && isIPv4: | <mask> // xinpcb_n.inp_vflag
<mask> flag := buf[inp+44]
<mask>
<mask> var srcIP net.IP
<mask> if flag&0x1 > 0 {
<mask> // ipv4
<mask> srcIP = net.IP(buf[inp+76 : inp+80])
<mask> } else if flag&0x2 > 0 {
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+64 : inp+80])
</s> Improve: simplify macOS process searching </s> remove } else if flag&0x2 > 0 {
</s> add case flag&0x2 > 0 && !isIPv4: </s> remove } else {
</s> add default: </s> remove var kinds uint32 = 0
so, inp := 0, 0
for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
if kinds&thisKind == 0 {
kinds |= thisKind
switch thisKind {
case 0x1:
// XSO_SOCKET
so = int(i)
case 0x10:
// XSO_INPCB
inp = int(i)
default:
break
}
}
// all blocks needed by tcp/udp
if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
continue
}
kinds = 0
// xsocket_n.xso_protocol
proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
continue
}
</s> add // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
case flag&0x2 > 0 && !isIPv4: | <mask> var srcIP net.IP
<mask> if flag&0x1 > 0 {
<mask> // ipv4
<mask> srcIP = net.IP(buf[inp+76 : inp+80])
<mask> } else if flag&0x2 > 0 {
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+64 : inp+80])
<mask> } else {
<mask> continue
<mask> }
</s> Improve: simplify macOS process searching </s> remove if flag&0x1 > 0 {
</s> add switch {
case flag&0x1 > 0 && isIPv4: </s> remove } else {
</s> add default: </s> remove var kinds uint32 = 0
so, inp := 0, 0
for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
if kinds&thisKind == 0 {
kinds |= thisKind
switch thisKind {
case 0x1:
// XSO_SOCKET
so = int(i)
case 0x10:
// XSO_INPCB
inp = int(i)
default:
break
}
}
// all blocks needed by tcp/udp
if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
continue
}
kinds = 0
// xsocket_n.xso_protocol
proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
continue
}
</s> add // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: </s> remove func xinpgenSize(b []byte) uint32 {
return binary.LittleEndian.Uint32(b[:4])
}
func roundUp8(n uint32) uint32 {
if n == 0 {
return uint32(8)
}
return (n + 7) & ((^uint32(8)) + 1)
</s> add func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0])) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
default: | <mask> srcIP = net.IP(buf[inp+76 : inp+80])
<mask> } else if flag&0x2 > 0 {
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+64 : inp+80])
<mask> } else {
<mask> continue
<mask> }
<mask>
<mask> if !ip.Equal(srcIP) {
<mask> continue
</s> Improve: simplify macOS process searching </s> remove } else if flag&0x2 > 0 {
</s> add case flag&0x2 > 0 && !isIPv4: </s> remove if flag&0x1 > 0 {
</s> add switch {
case flag&0x1 > 0 && isIPv4: </s> remove var kinds uint32 = 0
so, inp := 0, 0
for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
if kinds&thisKind == 0 {
kinds |= thisKind
switch thisKind {
case 0x1:
// XSO_SOCKET
so = int(i)
case 0x10:
// XSO_INPCB
inp = int(i)
default:
break
}
}
// all blocks needed by tcp/udp
if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
continue
}
kinds = 0
// xsocket_n.xso_protocol
proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
continue
}
</s> add // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: </s> remove func xinpgenSize(b []byte) uint32 {
return binary.LittleEndian.Uint32(b[:4])
}
func roundUp8(n uint32) uint32 {
if n == 0 {
return uint32(8)
}
return (n + 7) & ((^uint32(8)) + 1)
</s> add func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0])) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
pid := readNativeUint32(buf[so+68 : so+72]) | <mask> continue
<mask> }
<mask>
<mask> // xsocket_n.so_last_pid
<mask> pid := binary.LittleEndian.Uint32(buf[so+68 : so+72])
<mask> return getExecPathFromPID(pid)
<mask> }
<mask>
<mask> return "", errors.New("process not found")
<mask> }
</s> Improve: simplify macOS process searching </s> remove func xinpgenSize(b []byte) uint32 {
return binary.LittleEndian.Uint32(b[:4])
}
func roundUp8(n uint32) uint32 {
if n == 0 {
return uint32(8)
}
return (n + 7) & ((^uint32(8)) + 1)
</s> add func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0])) </s> remove func getExecPathFromAddress(ip net.IP, portStr string, isTCP bool) (string, error) {
port, err := strconv.Atoi(portStr)
</s> add func getExecPathFromAddress(metadata *C.Metadata) (string, error) {
ip := metadata.SrcIP
port, err := strconv.Atoi(metadata.SrcPort) </s> remove spath := "net.inet.tcp.pcblist_n"
if !isTCP {
</s> add var spath string
switch metadata.NetWork {
case C.TCP:
spath = "net.inet.tcp.pcblist_n"
case C.UDP: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0])) | <mask>
<mask> return "", errors.New("process not found")
<mask> }
<mask>
<mask> func xinpgenSize(b []byte) uint32 {
<mask> return binary.LittleEndian.Uint32(b[:4])
<mask> }
<mask>
<mask> func roundUp8(n uint32) uint32 {
<mask> if n == 0 {
<mask> return uint32(8)
<mask> }
<mask> return (n + 7) & ((^uint32(8)) + 1)
<mask> }
</s> Improve: simplify macOS process searching </s> remove pid := binary.LittleEndian.Uint32(buf[so+68 : so+72])
</s> add pid := readNativeUint32(buf[so+68 : so+72]) </s> remove func getExecPathFromAddress(ip net.IP, portStr string, isTCP bool) (string, error) {
port, err := strconv.Atoi(portStr)
</s> add func getExecPathFromAddress(metadata *C.Metadata) (string, error) {
ip := metadata.SrcIP
port, err := strconv.Atoi(metadata.SrcPort) </s> remove var kinds uint32 = 0
so, inp := 0, 0
for i := roundUp8(xinpgenSize(buf)); i < uint32(len(buf)) && xinpgenSize(buf[i:]) > 24; i += roundUp8(xinpgenSize(buf[i:])) {
thisKind := binary.LittleEndian.Uint32(buf[i+4 : i+8])
if kinds&thisKind == 0 {
kinds |= thisKind
switch thisKind {
case 0x1:
// XSO_SOCKET
so = int(i)
case 0x10:
// XSO_INPCB
inp = int(i)
default:
break
}
}
// all blocks needed by tcp/udp
if (isTCP && kinds != 0x3f) || (!isTCP && kinds != 0x1f) {
continue
}
kinds = 0
// xsocket_n.xso_protocol
proto := binary.LittleEndian.Uint32(buf[so+36 : so+40])
if proto != syscall.IPPROTO_TCP && proto != syscall.IPPROTO_UDP {
continue
}
</s> add // from darwin-xnu/bsd/netinet/in_pcblist.c:get_pcblist_n
// size/offset are round up (aligned) to 8 bytes in darwin
// rup8(sizeof(xinpcb_n)) + rup8(sizeof(xsocket_n)) +
// 2 * rup8(sizeof(xsockbuf_n)) + rup8(sizeof(xsockstat_n))
itemSize := 384
if metadata.NetWork == C.TCP {
// rup8(sizeof(xtcpcb_n))
itemSize += 208
}
// skip the first and last xinpgen(24 bytes) block
for i := 24; i < len(buf)-24; i += itemSize {
// offset of xinpcb_n and xsocket_n
inp, so := i, i+104 </s> remove name, err := getExecPathFromAddress(metadata.SrcIP, metadata.SrcPort, metadata.NetWork == C.TCP)
</s> add name, err := getExecPathFromAddress(metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/b1d9dfd6bf2b880cf21db4cbbdee46a179d12b7c | rules/process_darwin.go |
if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { | <mask> proxyList = append(proxyList, groupName)
<mask> }
<mask>
<mask> // check if any loop exists and sort the ProxyGroups
<mask> if err := proxyGroupsDagSort(groupsConfig); err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> // parse proxy group
<mask> for _, mapping := range groupsConfig {
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove func proxyGroupsDagSort(groupsConfig []map[string]interface{}) error {
</s> add func proxyGroupsDagSort(groupsConfig []map[string]interface{}, decoder *structure.Decoder) error { </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/config.go |
adapters "github.com/Dreamacro/clash/adapters/outbound"
"github.com/Dreamacro/clash/common/structure" | <mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func trimArr(arr []string) (r []string) {
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove func proxyGroupsDagSort(groupsConfig []map[string]interface{}) error {
</s> add func proxyGroupsDagSort(groupsConfig []map[string]interface{}, decoder *structure.Decoder) error { </s> remove type Node struct {
</s> add type graphNode struct { </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
func proxyGroupsDagSort(groupsConfig []map[string]interface{}, decoder *structure.Decoder) error { | <mask>
<mask> // Check if ProxyGroups form DAG(Directed Acyclic Graph), and sort all ProxyGroups by dependency order.
<mask> // Meanwhile, record the original index in the config file.
<mask> // If loop is detected, return an error with location of loop.
<mask> func proxyGroupsDagSort(groupsConfig []map[string]interface{}) error {
<mask>
<mask> type Node struct {
<mask> indegree int
<mask> // topological order
<mask> topo int
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove type Node struct {
</s> add type graphNode struct { </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
type graphNode struct { | <mask> // Meanwhile, record the original index in the config file.
<mask> // If loop is detected, return an error with location of loop.
<mask> func proxyGroupsDagSort(groupsConfig []map[string]interface{}) error {
<mask>
<mask> type Node struct {
<mask> indegree int
<mask> // topological order
<mask> topo int
<mask> // the origional data in `groupsConfig`
<mask> data map[string]interface{}
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove func proxyGroupsDagSort(groupsConfig []map[string]interface{}) error {
</s> add func proxyGroupsDagSort(groupsConfig []map[string]interface{}, decoder *structure.Decoder) error { </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
graph := make(map[string]*graphNode) | <mask> outdegree int
<mask> from []string
<mask> }
<mask>
<mask> graph := make(map[string]*Node)
<mask>
<mask> // Step 1.1 build dependency graph
<mask> for idx, mapping := range groupsConfig {
<mask> groupName, existName := mapping["name"].(string)
<mask> if !existName {
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | <mask>
<mask> graph := make(map[string]*Node)
<mask>
<mask> // Step 1.1 build dependency graph
<mask> for idx, mapping := range groupsConfig {
<mask> groupName, existName := mapping["name"].(string)
<mask> if !existName {
<mask> return fmt.Errorf("ProxyGroup %d: missing name", idx)
<mask> }
<mask> if node, ok := graph[groupName]; ok {
<mask> if node.data != nil {
<mask> return fmt.Errorf("ProxyGroup %s: duplicate group name", groupName)
<mask> }
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
graph[groupName] = &graphNode{0, -1, mapping, 0, nil} | <mask> return fmt.Errorf("ProxyGroup %s: duplicate group name", groupName)
<mask> }
<mask> node.data = mapping
<mask> } else {
<mask> graph[groupName] = &Node{0, -1, mapping, 0, nil}
<mask> }
<mask> proxies, existProxies := mapping["proxies"]
<mask> if !existProxies {
<mask> return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
<mask> }
<mask> for _, proxy := range proxies.([]interface{}) {
<mask> proxy := proxy.(string)
<mask> if node, ex := graph[proxy]; ex {
<mask> node.indegree++
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
for _, proxy := range option.Proxies { | <mask> proxies, existProxies := mapping["proxies"]
<mask> if !existProxies {
<mask> return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
<mask> }
<mask> for _, proxy := range proxies.([]interface{}) {
<mask> proxy := proxy.(string)
<mask> if node, ex := graph[proxy]; ex {
<mask> node.indegree++
<mask> } else {
<mask> graph[proxy] = &Node{1, -1, nil, 0, nil}
<mask> }
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} </s> remove graph[proxy] = &Node{1, -1, nil, 0, nil}
</s> add graph[proxy] = &graphNode{1, -1, nil, 0, nil} </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
graph[proxy] = &graphNode{1, -1, nil, 0, nil} | <mask> proxy := proxy.(string)
<mask> if node, ex := graph[proxy]; ex {
<mask> node.indegree++
<mask> } else {
<mask> graph[proxy] = &Node{1, -1, nil, 0, nil}
<mask> }
<mask> }
<mask> }
<mask> // Step 1.2 Topological Sort
<mask> // topological index of **ProxyGroup**
</s> Fix: parse error in proxyGroupsDagSort (#298) </s> remove for _, proxy := range proxies.([]interface{}) {
proxy := proxy.(string)
</s> add for _, proxy := range option.Proxies { </s> remove graph[groupName] = &Node{0, -1, mapping, 0, nil}
}
proxies, existProxies := mapping["proxies"]
if !existProxies {
return fmt.Errorf("ProxyGroup %s: the `proxies` field is requried", groupName)
</s> add graph[groupName] = &graphNode{0, -1, mapping, 0, nil} </s> remove if err := proxyGroupsDagSort(groupsConfig); err != nil {
</s> add if err := proxyGroupsDagSort(groupsConfig, decoder); err != nil { </s> remove graph := make(map[string]*Node)
</s> add graph := make(map[string]*graphNode) </s> remove for idx, mapping := range groupsConfig {
groupName, existName := mapping["name"].(string)
if !existName {
return fmt.Errorf("ProxyGroup %d: missing name", idx)
</s> add for _, mapping := range groupsConfig {
option := &adapters.ProxyGroupOption{}
err := decoder.Decode(mapping, option)
groupName := option.Name
if err != nil {
return fmt.Errorf("ProxyGroup %s: %s", groupName, err.Error()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b3e10c05e6b2d72a9be75a267d7b87df375c37dd | config/utils.go |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "grpc",
</s> Chore: vmess test remove all alterid </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-grpc.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "tcp",
</s> Chore: vmess test remove all alterid </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-http.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "http",
</s> Chore: vmess test remove all alterid </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-http2.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "tcp",
</s> Chore: vmess test remove all alterid | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-tls.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "ws",
</s> Chore: vmess test remove all alterid </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-ws-0rtt.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "ws",
</s> Chore: vmess test remove all alterid | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-ws-tls.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "ws",
</s> Chore: vmess test remove all alterid | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess-ws.json |
"id": "b831381d-6324-4d53-ad4f-8cda48b30811" | <mask> "protocol": "vmess",
<mask> "settings": {
<mask> "clients": [
<mask> {
<mask> "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> "alterId": 32
<mask> }
<mask> ]
<mask> },
<mask> "streamSettings": {
<mask> "network": "tcp"
</s> Chore: vmess test remove all alterid </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" </s> remove "id": "b831381d-6324-4d53-ad4f-8cda48b30811",
"alterId": 32
</s> add "id": "b831381d-6324-4d53-ad4f-8cda48b30811" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/config/vmess.json |
Name: "vmess",
Server: localIP.String(),
Port: 10002,
UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
Cipher: "auto",
UDP: true, | <mask> cleanContainer(id)
<mask> })
<mask>
<mask> proxy, err := outbound.NewVmess(outbound.VmessOption{
<mask> Name: "vmess",
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> UDP: true,
<mask> })
<mask> if err != nil {
<mask> assert.FailNow(t, err.Error())
<mask> }
<mask>
<mask> time.Sleep(waitTime)
<mask> testSuit(t, proxy)
<mask> }
<mask>
<mask> func TestClash_VmessAEAD(t *testing.T) {
<mask> configPath := C.Path.Resolve("vmess-aead.json")
<mask>
<mask> cfg := &container.Config{
<mask> Image: ImageVmess,
<mask> ExposedPorts: defaultExposedPorts,
<mask> }
<mask> hostCfg := &container.HostConfig{
<mask> PortBindings: defaultPortBindings,
<mask> Binds: []string{fmt.Sprintf("%s:/etc/v2ray/config.json", configPath)},
<mask> }
<mask>
<mask> id, err := startContainer(cfg, hostCfg, "vmess-aead")
<mask> if err != nil {
<mask> assert.FailNow(t, err.Error())
<mask> }
<mask>
<mask> t.Cleanup(func() {
<mask> cleanContainer(id)
<mask> })
<mask>
<mask> proxy, err := outbound.NewVmess(outbound.VmessOption{
<mask> Name: "vmess",
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 0,
<mask> UDP: true,
<mask> })
<mask> if err != nil {
<mask> assert.FailNow(t, err.Error())
<mask> }
<mask>
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> TLS: true,
<mask> SkipCertVerify: true,
<mask> ServerName: "example.org",
<mask> UDP: true,
<mask> })
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "h2",
<mask> TLS: true,
<mask> SkipCertVerify: true,
<mask> ServerName: "example.org",
<mask> UDP: true,
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "http",
<mask> UDP: true,
<mask> HTTPOpts: outbound.HTTPOptions{
<mask> Method: "GET",
<mask> Path: []string{"/"},
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "ws",
<mask> UDP: true,
<mask> })
<mask> if err != nil {
<mask> assert.FailNow(t, err.Error())
</s> Chore: vmess test remove all alterid </s> remove Name: "vmess",
Server: localIP.String(),
Port: 10002,
UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
Cipher: "auto",
AlterID: 32,
UDP: true,
})
if err != nil {
assert.FailNow(t, err.Error())
}
time.Sleep(waitTime)
testSuit(t, proxy)
}
func TestClash_VmessAEAD(t *testing.T) {
configPath := C.Path.Resolve("vmess-aead.json")
cfg := &container.Config{
Image: ImageVmess,
ExposedPorts: defaultExposedPorts,
}
hostCfg := &container.HostConfig{
PortBindings: defaultPortBindings,
Binds: []string{fmt.Sprintf("%s:/etc/v2ray/config.json", configPath)},
}
id, err := startContainer(cfg, hostCfg, "vmess-aead")
if err != nil {
assert.FailNow(t, err.Error())
}
t.Cleanup(func() {
cleanContainer(id)
})
proxy, err := outbound.NewVmess(outbound.VmessOption{
Name: "vmess",
Server: localIP.String(),
Port: 10002,
UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
Cipher: "auto",
AlterID: 0,
UDP: true,
</s> add Name: "vmess",
Server: localIP.String(),
Port: 10002,
UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
Cipher: "auto",
UDP: true, </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "ws",
<mask> TLS: true,
<mask> SkipCertVerify: true,
<mask> UDP: true,
<mask> })
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "grpc",
<mask> TLS: true,
<mask> SkipCertVerify: true,
<mask> UDP: true,
<mask> ServerName: "example.org",
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "ws",
<mask> UDP: true,
<mask> ServerName: "example.org",
<mask> WSOpts: outbound.WSOptions{
<mask> MaxEarlyData: 2048,
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
<mask> Server: localIP.String(),
<mask> Port: 10002,
<mask> UUID: "b831381d-6324-4d53-ad4f-8cda48b30811",
<mask> Cipher: "auto",
<mask> AlterID: 32,
<mask> Network: "ws",
<mask> UDP: true,
<mask> ServerName: "example.org",
<mask> WSOpts: outbound.WSOptions{
<mask> Path: "/?ed=2048",
</s> Chore: vmess test remove all alterid </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add </s> remove AlterID: 32,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b52d0c16e9d936c28a9a8b4bbb279b941d1424d0 | test/vmess_test.go | |
StoreFakeIP bool `yaml:"store-fake-ip"` | <mask>
<mask> // Profile config
<mask> type Profile struct {
<mask> StoreSelected bool `yaml:"store-selected"`
<mask> StoreFakeIP bool `yaml:"store-fakeip"`
<mask> }
<mask>
<mask> // Experimental config
<mask> type Experimental struct{}
<mask>
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | config/config.go |
github.com/go-chi/chi/v5 v5.0.5 | <mask> go 1.17
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7
<mask> github.com/go-chi/chi/v5 v5.0.4
<mask> github.com/go-chi/cors v1.2.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v4.0.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.mod |
github.com/gofrs/uuid v4.1.0+incompatible | <mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7
<mask> github.com/go-chi/chi/v5 v5.0.4
<mask> github.com/go-chi/cors v1.2.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v4.0.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/oschwald/geoip2-golang v1.5.0
<mask> github.com/sirupsen/logrus v1.8.1
</s> Chore: update dependencies and rename profile props </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.mod |
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd | <mask> github.com/go-chi/cors v1.2.0
<mask> github.com/go-chi/render v1.0.1
<mask> github.com/gofrs/uuid v4.0.0+incompatible
<mask> github.com/gorilla/websocket v1.4.2
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/oschwald/geoip2-golang v1.5.0
<mask> github.com/sirupsen/logrus v1.8.1
<mask> github.com/stretchr/testify v1.7.0
<mask> go.etcd.io/bbolt v1.3.6
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.mod |
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af | <mask> github.com/stretchr/testify v1.7.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> go.uber.org/atomic v1.9.0
<mask> go.uber.org/automaxprocs v1.4.0
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> )
<mask>
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.mod |
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 | <mask> go.uber.org/automaxprocs v1.4.0
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> )
<mask>
<mask> require (
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.mod |
github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= | <mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
<mask> github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
<mask> github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
<mask> github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE=
<mask> github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
<mask> github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
<mask> github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
<mask> github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | <mask> github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE=
<mask> github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
<mask> github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
<mask> github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
<mask> github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
<mask> github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
<mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
</s> Chore: update dependencies and rename profile props </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= | <mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
<mask> github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
<mask> github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
</s> Chore: update dependencies and rename profile props </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | <mask> go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
<mask> golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | <mask> golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 h1:G2DDmludOQZoWbpCr7OKDxnl478ZBGMcOhrv+ooX/Q4=
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 h1:G2DDmludOQZoWbpCr7OKDxnl478ZBGMcOhrv+ooX/Q4=
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | go.sum |
github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
<mask> github.com/docker/docker v20.10.8+incompatible
<mask> github.com/docker/go-connections v0.4.0
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
<mask> )
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove github.com/docker/docker v20.10.8+incompatible h1:RVqD337BgQicVCzYrrlhLDWhq6OAD2PJDUg2LsEUvKM=
github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
</s> add github.com/docker/docker v20.10.10+incompatible h1:GKkP0T7U4ks6X3lmmHKC2QDprnpRJor2Z5a8m62R9ZM=
github.com/docker/docker v20.10.10+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
golang.org/x/net v0.0.0-20211105192438-b53810dc28af | <mask> github.com/docker/docker v20.10.8+incompatible
<mask> github.com/docker/go-connections v0.4.0
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/stretchr/testify v1.7.0
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
<mask> )
<mask>
<mask> replace github.com/Dreamacro/clash => ../
<mask>
<mask> require (
</s> Chore: update dependencies and rename profile props </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove github.com/docker/docker v20.10.8+incompatible h1:RVqD337BgQicVCzYrrlhLDWhq6OAD2PJDUg2LsEUvKM=
github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
</s> add github.com/docker/docker v20.10.10+incompatible h1:GKkP0T7U4ks6X3lmmHKC2QDprnpRJor2Z5a8m62R9ZM=
github.com/docker/docker v20.10.10+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | <mask> replace github.com/Dreamacro/clash => ../
<mask>
<mask> require (
<mask> github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
<mask> github.com/Microsoft/go-winio v0.5.0 // indirect
<mask> github.com/containerd/containerd v1.5.5 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/docker/distribution v2.7.1+incompatible // indirect
<mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gofrs/uuid v4.0.0+incompatible // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
github.com/gofrs/uuid v4.1.0+incompatible // indirect | <mask> github.com/containerd/containerd v1.5.5 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/docker/distribution v2.7.1+incompatible // indirect
<mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gofrs/uuid v4.0.0+incompatible // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/golang/protobuf v1.5.0 // indirect
<mask> github.com/gorilla/mux v1.8.0 // indirect
<mask> github.com/gorilla/websocket v1.4.2 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> Chore: update dependencies and rename profile props </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect | <mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/golang/protobuf v1.5.0 // indirect
<mask> github.com/gorilla/mux v1.8.0 // indirect
<mask> github.com/gorilla/websocket v1.4.2 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
<mask> github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
<mask> github.com/morikuni/aec v1.0.0 // indirect
<mask> github.com/opencontainers/go-digest v1.0.0 // indirect
<mask> github.com/opencontainers/image-spec v1.0.1 // indirect
<mask> github.com/oschwald/geoip2-golang v1.5.0 // indirect
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect | <mask> github.com/sirupsen/logrus v1.8.1 // indirect
<mask> github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
<mask> go.etcd.io/bbolt v1.3.6 // indirect
<mask> go.uber.org/atomic v1.9.0 // indirect
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
<mask> golang.org/x/text v0.3.6 // indirect
<mask> golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
<mask> google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect | <mask> go.etcd.io/bbolt v1.3.6 // indirect
<mask> go.uber.org/atomic v1.9.0 // indirect
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
<mask> golang.org/x/text v0.3.6 // indirect
<mask> golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
<mask> google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
<mask> google.golang.org/grpc v1.40.0 // indirect
<mask> google.golang.org/protobuf v1.26.0 // indirect
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
google.golang.org/grpc v1.42.0 // indirect | <mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
<mask> golang.org/x/text v0.3.6 // indirect
<mask> golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
<mask> google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
<mask> google.golang.org/grpc v1.40.0 // indirect
<mask> google.golang.org/protobuf v1.26.0 // indirect
<mask> gopkg.in/yaml.v2 v2.4.0 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
<mask> )
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.mod |
github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= | <mask> github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
<mask> github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
<mask> github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
<mask> github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
<mask> github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
<mask> github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
<mask> github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
<mask> github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
<mask> github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
<mask> github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
<mask> github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
</s> Chore: update dependencies and rename profile props </s> remove github.com/Microsoft/hcsshim v0.8.18/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
</s> add github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
</s> add google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= | <mask> github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
<mask> github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
<mask> github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
<mask> github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
<mask> github.com/Microsoft/hcsshim v0.8.18/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
<mask> github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
<mask> github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
<mask> github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
<mask> github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
<mask> github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
</s> Chore: update dependencies and rename profile props </s> remove github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
</s> add github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
</s> add google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= | <mask> github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
<mask> github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
<mask> github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
<mask> github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
<mask> github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
<mask> github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
<mask> github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
<mask> github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
<mask> github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
<mask> github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
</s> Chore: update dependencies and rename profile props </s> remove github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
</s> add google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/containerd/containerd v1.5.7 h1:rQyoYtj4KddB3bxG6SAqd4+08gePNyJjRqvOIfV3rkM=
github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= | <mask> github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU=
<mask> github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
<mask> github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
<mask> github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
<mask> github.com/containerd/containerd v1.5.5 h1:q1gxsZsGZ8ddVe98yO6pR21b5xQSMiR61lD0W96pgQo=
<mask> github.com/containerd/containerd v1.5.5/go.mod h1:oSTh0QpT1w6jYcGmbiSbxv9OSQYaa88mPyWIuU79zyo=
<mask> github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
<mask> github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
<mask> github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
<mask> github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
<mask> github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
</s> Chore: update dependencies and rename profile props </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/docker/docker v20.10.10+incompatible h1:GKkP0T7U4ks6X3lmmHKC2QDprnpRJor2Z5a8m62R9ZM=
github.com/docker/docker v20.10.10+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= | <mask> github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
<mask> github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
<mask> github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
<mask> github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
<mask> github.com/docker/docker v20.10.8+incompatible h1:RVqD337BgQicVCzYrrlhLDWhq6OAD2PJDUg2LsEUvKM=
<mask> github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
<mask> github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
<mask> github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
<mask> github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
<mask> github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
<mask> github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
</s> Chore: update dependencies and rename profile props </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= | <mask> github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
<mask> github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
<mask> github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
<mask> github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
<mask> github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
<mask> github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
<mask> github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
<mask> github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
<mask> github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
<mask> github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
</s> Chore: update dependencies and rename profile props </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
</s> add google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= | <mask> github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
<mask> github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
<mask> github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
<mask> github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
<mask> github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
<mask> github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
<mask> github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
<mask> github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
</s> Chore: update dependencies and rename profile props </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | <mask> github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
<mask> github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
<mask> github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
<mask> github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
<mask> github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
<mask> github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
<mask> github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
<mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
<mask> github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
<mask> github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
</s> Chore: update dependencies and rename profile props </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible // indirect
</s> add github.com/gofrs/uuid v4.1.0+incompatible // indirect </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= | <mask> github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
<mask> github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
<mask> github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
<mask> github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
<mask> github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
<mask> github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
</s> Chore: update dependencies and rename profile props </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd // indirect </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= | <mask> github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
<mask> github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
<mask> github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
<mask> github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
<mask> github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
<mask> github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
<mask> github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
<mask> github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
</s> Chore: update dependencies and rename profile props </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd </s> remove github.com/go-chi/chi/v5 v5.0.4
</s> add github.com/go-chi/chi/v5 v5.0.5 </s> remove github.com/gofrs/uuid v4.0.0+incompatible
</s> add github.com/gofrs/uuid v4.1.0+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= | <mask> github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
<mask> github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
<mask> github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
<mask> github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0=
<mask> github.com/opencontainers/runc v1.0.1/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
<mask> github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
<mask> github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
<mask> github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
<mask> github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
<mask> github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
</s> Chore: update dependencies and rename profile props </s> remove github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
</s> add github.com/go-chi/chi/v5 v5.0.5 h1:l3RJ8T8TAqLsXFfah+RA6N4pydMbPwSdvNM+AFWvLUM=
github.com/go-chi/chi/v5 v5.0.5/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= </s> remove github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid v4.1.0+incompatible h1:sIa2eCvUTwgjbqXrPLfNwUf9S3i3mpH1O1atV+iL/Wk=
github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= </s> remove github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd h1:jupbuQFZtwOBg/3EmK91/rGaYFkqCb9bwHOnwn7Cav0=
github.com/insomniacslk/dhcp v0.0.0-20211026125128-ad197bcd36fd/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= | <mask> go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
<mask> go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
<mask> go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
<mask> go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
<mask> go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
<mask> go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
<mask> golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | <mask> golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
<mask> golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
<mask> golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | <mask> golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
<mask> golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
<mask> golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/net v0.0.0-20211105192438-b53810dc28af </s> remove github.com/Dreamacro/clash v1.6.6-0.20210905062555-c7b718f6512d
github.com/docker/docker v20.10.8+incompatible
</s> add github.com/Dreamacro/clash v1.7.2-0.20211108085948-bd2ea2b917aa
github.com/docker/docker v20.10.10+incompatible | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 h1:G2DDmludOQZoWbpCr7OKDxnl478ZBGMcOhrv+ooX/Q4=
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | <mask> golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
</s> Chore: update dependencies and rename profile props </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 h1:G2DDmludOQZoWbpCr7OKDxnl478ZBGMcOhrv+ooX/Q4=
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= | <mask> google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
<mask> google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
<mask> google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
<mask> google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
<mask> google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
<mask> google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
<mask> google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
<mask> google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
<mask> google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
<mask> google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
<mask> google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
</s> Chore: update dependencies and rename profile props </s> remove google.golang.org/grpc v1.40.0 // indirect
</s> add google.golang.org/grpc v1.42.0 // indirect </s> remove golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
</s> add golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= </s> remove github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/containerd/containerd v1.5.5 // indirect
</s> add github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/containerd/containerd v1.5.7 // indirect </s> remove golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
</s> add golang.org/x/net v0.0.0-20211105192438-b53810dc28af | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b56d35040d38df288eb58a6b0a752cd84598817a | test/go.sum |
"flag"
"path" | <mask> "os"
<mask> "os/signal"
<mask> "syscall"
<mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
</s> Improve: support custom configuration directory | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b68af433894e0abdf9965b47ba2310b76cc5ed73 | main.go |
C "github.com/Dreamacro/clash/constant" | <mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/proxy"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask>
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> var (
<mask> homedir string
</s> Improve: support custom configuration directory | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b68af433894e0abdf9965b47ba2310b76cc5ed73 | main.go |
var (
homedir string
)
func init() {
flag.StringVar(&homedir, "d", "", "set configuration directory")
flag.Parse()
}
| <mask>
<mask> log "github.com/sirupsen/logrus"
<mask> )
<mask>
<mask> func main() {
<mask> tunnel.Instance().Run()
<mask> proxy.Instance().Run()
<mask> hub.Run()
</s> Improve: support custom configuration directory | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b68af433894e0abdf9965b47ba2310b76cc5ed73 | main.go |
if (homedir != "") {
if !path.IsAbs(homedir) {
currentDir, _ := os.Getwd()
homedir = path.Join(currentDir, homedir)
}
C.SetHomeDir(homedir)
}
| <mask> tunnel.Instance().Run()
<mask> proxy.Instance().Run()
<mask> hub.Run()
<mask>
<mask> config.Init()
<mask> err := config.Instance().Parse()
<mask> if err != nil {
<mask> log.Fatalf("Parse config error: %s", err.Error())
<mask> }
<mask>
</s> Improve: support custom configuration directory | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b68af433894e0abdf9965b47ba2310b76cc5ed73 | main.go |
<mask> package inbound
<mask>
<mask> import (
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
</s> Refactor: plain http proxy (#1443) </s> remove "bufio"
</s> add </s> remove "bufio"
"encoding/base64"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | adapter/inbound/http.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> // NewHTTP receive normal http request and return HTTPContext
<mask> func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
<mask> metadata := parseSocksAddr(socks5.ParseAddr(target))
<mask> metadata.NetWork = C.TCP
</s> Refactor: plain http proxy (#1443) </s> remove func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
metadata := parseHTTPAddr(request)
</s> add func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP </s> remove if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
</s> add if ip, port, err := parseAddr(source.String()); err == nil { </s> remove "github.com/Dreamacro/clash/context"
</s> add </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | adapter/inbound/http.go |
func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP | <mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> // NewHTTP receive normal http request and return HTTPContext
<mask> func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
<mask> metadata := parseHTTPAddr(request)
<mask> metadata.Type = C.HTTP
<mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
</s> add if ip, port, err := parseAddr(source.String()); err == nil { </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | adapter/inbound/http.go |
if ip, port, err := parseAddr(source.String()); err == nil { | <mask> // NewHTTP receive normal http request and return HTTPContext
<mask> func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
<mask> metadata := parseHTTPAddr(request)
<mask> metadata.Type = C.HTTP
<mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
<mask> return context.NewHTTPContext(conn, request, metadata)
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
metadata := parseHTTPAddr(request)
</s> add func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | adapter/inbound/http.go |
return context.NewConnContext(conn, metadata) | <mask> if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
<mask> metadata.SrcIP = ip
<mask> metadata.SrcPort = port
<mask> }
<mask> return context.NewHTTPContext(conn, request, metadata)
<mask> }
<mask>
<mask> // RemoveHopByHopHeaders remove hop-by-hop header
<mask> func RemoveHopByHopHeaders(header http.Header) {
<mask> // Strip hop-by-hop header based on RFC:
<mask> // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
<mask> // https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
<mask>
<mask> header.Del("Proxy-Connection")
<mask> header.Del("Proxy-Authenticate")
<mask> header.Del("Proxy-Authorization")
<mask> header.Del("TE")
<mask> header.Del("Trailers")
<mask> header.Del("Transfer-Encoding")
<mask> header.Del("Upgrade")
<mask>
<mask> connections := header.Get("Connection")
<mask> header.Del("Connection")
<mask> if len(connections) == 0 {
<mask> return
<mask> }
<mask> for _, h := range strings.Split(connections, ",") {
<mask> header.Del(strings.TrimSpace(h))
<mask> }
<mask> }
<mask>
<mask> // RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
<mask> // It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
<mask> func RemoveExtraHTTPHostPort(req *http.Request) {
<mask> host := req.Host
<mask> if host == "" {
<mask> host = req.URL.Host
<mask> }
<mask>
<mask> if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
<mask> host = pHost
<mask> }
<mask>
<mask> req.Host = host
<mask> req.URL.Host = host
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
</s> add if ip, port, err := parseAddr(source.String()); err == nil { </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
metadata := parseHTTPAddr(request)
</s> add func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove
// connLinker make the two net.Conn correlated, for temporary resolution of leaks.
// There is no better way to do this for now.
type connLinker struct {
net.Conn
linker net.Conn
}
func (conn *connLinker) Read(b []byte) (n int, err error) {
n, err = conn.Conn.Read(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Write(b []byte) (n int, err error) {
n, err = conn.Conn.Write(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Close() error {
conn.linker.Close()
return conn.Conn.Close()
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | adapter/inbound/http.go |
<mask> package http
<mask>
<mask> import (
<mask> "bufio"
<mask> "encoding/base64"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
</s> Refactor: plain http proxy (#1443) </s> remove "net/http"
"strings"
</s> add </s> remove "bufio"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
<mask> import (
<mask> "bufio"
<mask> "encoding/base64"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/auth"
</s> Refactor: plain http proxy (#1443) </s> remove "bufio"
"encoding/base64"
</s> add </s> remove "bufio"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> authStore "github.com/Dreamacro/clash/listener/auth"
<mask> "github.com/Dreamacro/clash/log"
</s> Refactor: plain http proxy (#1443) </s> remove "github.com/Dreamacro/clash/component/auth"
</s> add </s> remove authStore "github.com/Dreamacro/clash/listener/auth"
"github.com/Dreamacro/clash/log"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> authStore "github.com/Dreamacro/clash/listener/auth"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
</s> Refactor: plain http proxy (#1443) </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove authStore "github.com/Dreamacro/clash/listener/auth"
"github.com/Dreamacro/clash/log"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/auth"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> authStore "github.com/Dreamacro/clash/listener/auth"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> type Listener struct {
<mask> listener net.Listener
<mask> address string
</s> Refactor: plain http proxy (#1443) </s> remove cache *cache.Cache
</s> add </s> remove "github.com/Dreamacro/clash/component/auth"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
<mask> type Listener struct {
<mask> listener net.Listener
<mask> address string
<mask> closed bool
<mask> cache *cache.Cache
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
</s> Refactor: plain http proxy (#1443) </s> remove authStore "github.com/Dreamacro/clash/listener/auth"
"github.com/Dreamacro/clash/log"
</s> add </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove bufConn := NewBufferedConn(conn)
</s> add bufConn := N.NewBufferedConn(conn) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
return NewWithAuthenticate(addr, in, true)
}
func NewWithAuthenticate(addr string, in chan<- C.ConnContext, authenticate bool) (*Listener, error) { | <mask> closed bool
<mask> }
<mask>
<mask> func New(addr string, in chan<- C.ConnContext) (*Listener, error) {
<mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> Refactor: plain http proxy (#1443) </s> remove cache *cache.Cache
</s> add </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove bufConn := NewBufferedConn(conn)
</s> add bufConn := N.NewBufferedConn(conn) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove
// connLinker make the two net.Conn correlated, for temporary resolution of leaks.
// There is no better way to do this for now.
type connLinker struct {
net.Conn
linker net.Conn
}
func (conn *connLinker) Read(b []byte) (n int, err error) {
n, err = conn.Conn.Read(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Write(b []byte) (n int, err error) {
n, err = conn.Conn.Write(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Close() error {
conn.linker.Close()
return conn.Conn.Close()
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go |
var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} | <mask> l, err := net.Listen("tcp", addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
<mask> go func() {
<mask> for {
<mask> c, err := hl.listener.Accept()
<mask> if err != nil {
<mask> if hl.closed {
</s> Refactor: plain http proxy (#1443) </s> remove c, err := hl.listener.Accept()
</s> add conn, err := hl.listener.Accept() </s> remove cache *cache.Cache
</s> add </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go |
conn, err := hl.listener.Accept() | <mask> }
<mask> hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
<mask> go func() {
<mask> for {
<mask> c, err := hl.listener.Accept()
<mask> if err != nil {
<mask> if hl.closed {
<mask> break
<mask> }
<mask> continue
</s> Refactor: plain http proxy (#1443) </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove go HandleConn(c, in, hl.cache)
</s> add go HandleConn(conn, in, c) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove bufConn := NewBufferedConn(conn)
</s> add bufConn := N.NewBufferedConn(conn) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go |
go HandleConn(conn, in, c) | <mask> break
<mask> }
<mask> continue
<mask> }
<mask> go HandleConn(c, in, hl.cache)
<mask> }
<mask> }()
<mask>
<mask> return hl, nil
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove c, err := hl.listener.Accept()
</s> add conn, err := hl.listener.Accept() </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go |
<mask>
<mask> func (l *Listener) Address() string {
<mask> return l.address
<mask> }
<mask>
<mask> func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
<mask> if result := cache.Get(loginStr); result != nil {
<mask> ret = result.(bool)
<mask> return
<mask> }
<mask> loginData, err := base64.StdEncoding.DecodeString(loginStr)
<mask> login := strings.Split(string(loginData), ":")
<mask> ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
<mask>
<mask> cache.Put(loginStr, ret, time.Minute)
<mask> return
<mask> }
<mask>
<mask> func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
<mask> br := bufio.NewReader(conn)
<mask>
<mask> keepAlive:
<mask> request, err := http.ReadRequest(br)
<mask> if err != nil || request.URL.Host == "" {
<mask> conn.Close()
<mask> return
<mask> }
<mask>
<mask> keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
<mask> authenticator := authStore.Authenticator()
<mask> if authenticator != nil {
<mask> if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
<mask> conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
<mask> if keepAlive {
<mask> goto keepAlive
<mask> }
<mask> return
<mask> } else if !canActivate(authStrings[1], authenticator, cache) {
<mask> conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
<mask> log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
<mask> if keepAlive {
<mask> goto keepAlive
<mask> }
<mask> conn.Close()
<mask> return
<mask> }
<mask> }
<mask>
<mask> if request.Method == http.MethodConnect {
<mask> _, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
<mask> if err != nil {
<mask> conn.Close()
<mask> return
<mask> }
<mask> in <- inbound.NewHTTPS(request, conn)
<mask> return
<mask> }
<mask>
<mask> in <- inbound.NewHTTP(request, conn)
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove bufConn := NewBufferedConn(conn)
</s> add bufConn := N.NewBufferedConn(conn) </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove cache *cache.Cache
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/http/server.go | |
N "github.com/Dreamacro/clash/common/net" | <mask> "net"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/listener/http"
<mask> "github.com/Dreamacro/clash/listener/socks"
<mask> "github.com/Dreamacro/clash/transport/socks5"
<mask> )
</s> Refactor: plain http proxy (#1443) </s> remove "github.com/Dreamacro/clash/component/auth"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/mixed/mixed.go |
bufConn := N.NewBufferedConn(conn) | <mask> return l.address
<mask> }
<mask>
<mask> func handleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
<mask> bufConn := NewBufferedConn(conn)
<mask> head, err := bufConn.Peek(1)
<mask> if err != nil {
<mask> return
<mask> }
<mask>
</s> Refactor: plain http proxy (#1443) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove cache *cache.Cache
</s> add </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | listener/mixed/mixed.go |
<mask> package tunnel
<mask>
<mask> import (
<mask> "bufio"
<mask> "errors"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask> "strings"
</s> Refactor: plain http proxy (#1443) </s> remove "bufio"
"encoding/base64"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
<mask> "bufio"
<mask> "errors"
<mask> "io"
<mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> N "github.com/Dreamacro/clash/common/net"
<mask> "github.com/Dreamacro/clash/common/pool"
</s> Refactor: plain http proxy (#1443) </s> remove "bufio"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add </s> remove "bufio"
"encoding/base64"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/adapter/inbound"
<mask> N "github.com/Dreamacro/clash/common/net"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
</s> Refactor: plain http proxy (#1443) </s> remove "net/http"
"strings"
</s> add </s> remove "github.com/Dreamacro/clash/context"
</s> add </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
<mask> N "github.com/Dreamacro/clash/common/net"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
<mask> req := ctx.Request()
<mask> conn := ctx.Conn()
</s> Refactor: plain http proxy (#1443) </s> remove "github.com/Dreamacro/clash/adapter/inbound"
</s> add </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
metadata := parseHTTPAddr(request)
</s> add func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP </s> remove "net/http"
"strings"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
<mask> req := ctx.Request()
<mask> conn := ctx.Conn()
<mask>
<mask> // make outbound close after inbound error or close
<mask> conn = &connLinker{conn, outbound}
<mask>
<mask> inboundReader := bufio.NewReader(conn)
<mask> outboundReader := bufio.NewReader(outbound)
<mask>
<mask> inbound.RemoveExtraHTTPHostPort(req)
<mask> host := req.Host
<mask> for {
<mask> keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
<mask>
<mask> req.RequestURI = ""
<mask> inbound.RemoveHopByHopHeaders(req.Header)
<mask> err := req.Write(outbound)
<mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> handleResponse:
<mask> // resp will be closed after we call resp.Write()
<mask> // see https://golang.org/pkg/net/http/#Response.Write
<mask> resp, err := http.ReadResponse(outboundReader, req)
<mask> if err != nil {
<mask> break
<mask> }
<mask> inbound.RemoveHopByHopHeaders(resp.Header)
<mask>
<mask> if resp.StatusCode == http.StatusContinue {
<mask> err = resp.Write(conn)
<mask> if err != nil {
<mask> break
<mask> }
<mask> goto handleResponse
<mask> }
<mask>
<mask> // close conn when header `Connection` is `close`
<mask> if resp.Header.Get("Connection") == "close" {
<mask> keepAlive = false
<mask> }
<mask>
<mask> if keepAlive {
<mask> resp.Header.Set("Proxy-Connection", "keep-alive")
<mask> resp.Header.Set("Connection", "keep-alive")
<mask> resp.Header.Set("Keep-Alive", "timeout=4")
<mask> resp.Close = false
<mask> } else {
<mask> resp.Close = true
<mask> }
<mask> err = resp.Write(conn)
<mask> if err != nil || resp.Close {
<mask> break
<mask> }
<mask>
<mask> req, err = http.ReadRequest(inboundReader)
<mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> inbound.RemoveExtraHTTPHostPort(req)
<mask> // Sometimes firefox just open a socket to process multiple domains in HTTP
<mask> // The temporary solution is close connection when encountering different HOST
<mask> if req.Host != host {
<mask> break
<mask> }
<mask> }
<mask> }
<mask>
<mask> func handleUDPToRemote(packet C.UDPPacket, pc C.PacketConn, metadata *C.Metadata) error {
<mask> defer packet.Drop()
<mask>
<mask> // local resolve UDP dns
<mask> if !metadata.Resolved() {
</s> Refactor: plain http proxy (#1443) </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
</s> add if ip, port, err := parseAddr(source.String()); err == nil { </s> remove
// connLinker make the two net.Conn correlated, for temporary resolution of leaks.
// There is no better way to do this for now.
type connLinker struct {
net.Conn
linker net.Conn
}
func (conn *connLinker) Read(b []byte) (n int, err error) {
n, err = conn.Conn.Read(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Write(b []byte) (n int, err error) {
n, err = conn.Conn.Write(b)
if err != nil {
conn.linker.Close()
}
return n, err
}
func (conn *connLinker) Close() error {
conn.linker.Close()
return conn.Conn.Close()
}
</s> add </s> remove func NewHTTP(request *http.Request, conn net.Conn) *context.HTTPContext {
metadata := parseHTTPAddr(request)
</s> add func NewHTTP(target string, source net.Addr, conn net.Conn) *context.ConnContext {
metadata := parseSocksAddr(socks5.ParseAddr(target))
metadata.NetWork = C.TCP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
<mask> pool.Put(buf)
<mask> rightConn.SetReadDeadline(time.Now())
<mask> <-ch
<mask> }
<mask>
<mask> // connLinker make the two net.Conn correlated, for temporary resolution of leaks.
<mask> // There is no better way to do this for now.
<mask> type connLinker struct {
<mask> net.Conn
<mask> linker net.Conn
<mask> }
<mask>
<mask> func (conn *connLinker) Read(b []byte) (n int, err error) {
<mask> n, err = conn.Conn.Read(b)
<mask> if err != nil {
<mask> conn.linker.Close()
<mask> }
<mask> return n, err
<mask> }
<mask>
<mask> func (conn *connLinker) Write(b []byte) (n int, err error) {
<mask> n, err = conn.Conn.Write(b)
<mask> if err != nil {
<mask> conn.linker.Close()
<mask> }
<mask> return n, err
<mask> }
<mask>
<mask> func (conn *connLinker) Close() error {
<mask> conn.linker.Close()
<mask> return conn.Conn.Close()
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove cache *cache.Cache
</s> add </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/connection.go | |
handleSocket(ctx, remoteConn) | <mask> default:
<mask> log.Infoln("[TCP] %s --> %v doesn't match any rule using DIRECT", metadata.SourceAddress(), metadata.String())
<mask> }
<mask>
<mask> switch c := ctx.(type) {
<mask> case *context.HTTPContext:
<mask> handleHTTP(c, remoteConn)
<mask> default:
<mask> handleSocket(ctx, remoteConn)
<mask> }
<mask> }
<mask>
<mask> func shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
<mask> return rule.ShouldResolveIP() && metadata.Host != "" && metadata.DstIP == nil
<mask> }
</s> Refactor: plain http proxy (#1443) </s> remove
func canActivate(loginStr string, authenticator auth.Authenticator, cache *cache.Cache) (ret bool) {
if result := cache.Get(loginStr); result != nil {
ret = result.(bool)
return
}
loginData, err := base64.StdEncoding.DecodeString(loginStr)
login := strings.Split(string(loginData), ":")
ret = err == nil && len(login) == 2 && authenticator.Verify(login[0], login[1])
cache.Put(loginStr, ret, time.Minute)
return
}
func HandleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
br := bufio.NewReader(conn)
keepAlive:
request, err := http.ReadRequest(br)
if err != nil || request.URL.Host == "" {
conn.Close()
return
}
keepAlive := strings.TrimSpace(strings.ToLower(request.Header.Get("Proxy-Connection"))) == "keep-alive"
authenticator := authStore.Authenticator()
if authenticator != nil {
if authStrings := strings.Split(request.Header.Get("Proxy-Authorization"), " "); len(authStrings) != 2 {
conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\nProxy-Authenticate: Basic\r\n\r\n"))
if keepAlive {
goto keepAlive
}
return
} else if !canActivate(authStrings[1], authenticator, cache) {
conn.Write([]byte("HTTP/1.1 403 Forbidden\r\n\r\n"))
log.Infoln("Auth failed from %s", conn.RemoteAddr().String())
if keepAlive {
goto keepAlive
}
conn.Close()
return
}
}
if request.Method == http.MethodConnect {
_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
if err != nil {
conn.Close()
return
}
in <- inbound.NewHTTPS(request, conn)
return
}
in <- inbound.NewHTTP(request, conn)
}
</s> add </s> remove return context.NewHTTPContext(conn, request, metadata)
}
// RemoveHopByHopHeaders remove hop-by-hop header
func RemoveHopByHopHeaders(header http.Header) {
// Strip hop-by-hop header based on RFC:
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
// https://www.mnot.net/blog/2011/07/11/what_proxies_must_do
header.Del("Proxy-Connection")
header.Del("Proxy-Authenticate")
header.Del("Proxy-Authorization")
header.Del("TE")
header.Del("Trailers")
header.Del("Transfer-Encoding")
header.Del("Upgrade")
connections := header.Get("Connection")
header.Del("Connection")
if len(connections) == 0 {
return
}
for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h))
}
}
// RemoveExtraHTTPHostPort remove extra host port (example.com:80 --> example.com)
// It resolves the behavior of some HTTP servers that do not handle host:80 (e.g. baidu.com)
func RemoveExtraHTTPHostPort(req *http.Request) {
host := req.Host
if host == "" {
host = req.URL.Host
}
if pHost, port, err := net.SplitHostPort(host); err == nil && port == "80" {
host = pHost
}
req.Host = host
req.URL.Host = host
</s> add return context.NewConnContext(conn, metadata) </s> remove hl := &Listener{l, addr, false, cache.New(30 * time.Second)}
</s> add var c *cache.Cache
if authenticate {
c = cache.New(time.Second * 30)
}
hl := &Listener{
listener: l,
address: addr,
} </s> remove func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
req := ctx.Request()
conn := ctx.Conn()
// make outbound close after inbound error or close
conn = &connLinker{conn, outbound}
inboundReader := bufio.NewReader(conn)
outboundReader := bufio.NewReader(outbound)
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host
for {
keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
req.RequestURI = ""
inbound.RemoveHopByHopHeaders(req.Header)
err := req.Write(outbound)
if err != nil {
break
}
handleResponse:
// resp will be closed after we call resp.Write()
// see https://golang.org/pkg/net/http/#Response.Write
resp, err := http.ReadResponse(outboundReader, req)
if err != nil {
break
}
inbound.RemoveHopByHopHeaders(resp.Header)
if resp.StatusCode == http.StatusContinue {
err = resp.Write(conn)
if err != nil {
break
}
goto handleResponse
}
// close conn when header `Connection` is `close`
if resp.Header.Get("Connection") == "close" {
keepAlive = false
}
if keepAlive {
resp.Header.Set("Proxy-Connection", "keep-alive")
resp.Header.Set("Connection", "keep-alive")
resp.Header.Set("Keep-Alive", "timeout=4")
resp.Close = false
} else {
resp.Close = true
}
err = resp.Write(conn)
if err != nil || resp.Close {
break
}
req, err = http.ReadRequest(inboundReader)
if err != nil {
break
}
inbound.RemoveExtraHTTPHostPort(req)
// Sometimes firefox just open a socket to process multiple domains in HTTP
// The temporary solution is close connection when encountering different HOST
if req.Host != host {
break
}
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b6ff08074c858bb78d6fd670b9ce137c41dd25e9 | tunnel/tunnel.go |
Enable bool `yaml:"enable"`
IPv6 bool `yaml:"ipv6"`
NameServer []dns.NameServer `yaml:"nameserver"`
Fallback []dns.NameServer `yaml:"fallback"`
FallbackFilter FallbackFilter `yaml:"fallback-filter"`
Listen string `yaml:"listen"`
EnhancedMode dns.EnhancedMode `yaml:"enhanced-mode"`
FakeIPRange *fakeip.Pool
}
// FallbackFilter config
type FallbackFilter struct {
GeoIP bool `yaml:"geoip"`
IPCIDR []*net.IPNet `yaml:"ipcidr"` | <mask> }
<mask>
<mask> // DNS config
<mask> type DNS struct {
<mask> Enable bool `yaml:"enable"`
<mask> IPv6 bool `yaml:"ipv6"`
<mask> NameServer []dns.NameServer `yaml:"nameserver"`
<mask> Fallback []dns.NameServer `yaml:"fallback"`
<mask> Listen string `yaml:"listen"`
<mask> EnhancedMode dns.EnhancedMode `yaml:"enhanced-mode"`
<mask> FakeIPRange *fakeip.Pool
<mask> }
<mask>
<mask> // Experimental config
<mask> type Experimental struct {
<mask> IgnoreResolveFail bool `yaml:"ignore-resolve-fail"`
</s> Feature: add fallback filters (#105) </s> remove Enable bool `yaml:"enable"`
IPv6 bool `yaml:"ipv6"`
NameServer []string `yaml:"nameserver"`
Fallback []string `yaml:"fallback"`
Listen string `yaml:"listen"`
EnhancedMode dns.EnhancedMode `yaml:"enhanced-mode"`
FakeIPRange string `yaml:"fake-ip-range"`
</s> add Enable bool `yaml:"enable"`
IPv6 bool `yaml:"ipv6"`
NameServer []string `yaml:"nameserver"`
Fallback []string `yaml:"fallback"`
FallbackFilter rawFallbackFilter `yaml:"fallback-filter"`
Listen string `yaml:"listen"`
EnhancedMode dns.EnhancedMode `yaml:"enhanced-mode"`
FakeIPRange string `yaml:"fake-ip-range"`
}
type rawFallbackFilter struct {
GeoIP bool `yaml:"geoip"`
IPCIDR []string `yaml:"ipcidr"` </s> remove ipv6 bool
mapping bool
fakeip bool
pool *fakeip.Pool
fallback []resolver
main []resolver
group singleflight.Group
cache *cache.Cache
</s> add ipv6 bool
mapping bool
fakeip bool
pool *fakeip.Pool
main []resolver
fallback []resolver
fallbackFilters []fallbackFilter
group singleflight.Group
cache *cache.Cache | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/b76737bdbbce7cb2e6b380e33b77e5cb37c70c40 | config/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.