Merge branch 'v2fly-master' into master

.github/linters/.golangci.yml

@@ -1,42 +1,23 @@
 run:
   timeout: 5m
-  skip-dirs:
-    - external
   skip-files:
     - generated.*
 
 issues:
   new: true
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gocyclo
-        - errcheck
-        - dupl
-        - gosec
-        - goconst
 
 linters:
   enable:
     - bodyclose
-    - deadcode
     - depguard
-    - dogsled
-    - dupl
-    - errcheck
-    - exhaustive
-    - goconst
     - gocritic
-    - gocyclo
     - gofmt
     - goimports
     - golint
     - goprintffuncname
-    - gosec
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - misspell
     - nakedret
     - noctx
@@ -49,6 +30,9 @@ linters:
     - typecheck
     - unconvert
     - unparam
-    - unused
     - varcheck
     - whitespace
+  disable:
+    - deadcode
+    - errcheck
+    - unused

.github/workflows/codeql-analysis.yml

@@ -15,6 +15,7 @@ on:
 
 jobs:
   analyze:
+    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/coverage.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   coverage:
+    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x

.github/workflows/linter.yml

@@ -13,6 +13,7 @@ on:
 
 jobs:
   lint:
+    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x

.github/workflows/sign.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   sign:
+    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout default branch

.github/workflows/stale.yml

@@ -14,4 +14,4 @@ jobs:
           stale-issue-message: "This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days"
           stale-pr-message: 'It has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days'
           days-before-stale: 120
-          days-before-close: 5
+          days-before-close: 5

.github/workflows/test.yml

@@ -17,6 +17,7 @@ on:
 
 jobs:
   test:
+    if: github.repository != 'v2ray/v2ray-core'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.github/workflows/updateGeofile.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   update:
+    if: github.repository == 'v2fly/v2ray-core'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase

Dockerfile

@@ -2,10 +2,12 @@
 # STEP 1 build executable binary
 ############################
 FROM golang:alpine AS builder
+
 RUN apk update && apk add --no-cache git bash wget curl
-WORKDIR /go/src/v2ray.com/core
+WORKDIR /build
 RUN git clone --progress https://github.com/v2fly/v2ray-core.git . && \
-    bash ./release/user-package.sh nosource noconf codename=$(git describe --tags) buildname=docker-fly abpathtgz=/tmp/v2ray.tgz
+    bash ./release/user-package.sh nosource noconf codename=$(git describe --abbrev=0 --tags) buildname=docker-fly abpathtgz=/tmp/v2ray.tgz
+
 ############################
 # STEP 2 build a small image
 ############################
@@ -20,4 +22,3 @@ RUN apk update && apk add ca-certificates && \
 #ENTRYPOINT ["/usr/bin/v2ray/v2ray"]
 ENV PATH /usr/bin/v2ray:$PATH
 CMD ["v2ray", "-config=/etc/v2ray/config.json"]
-

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 V2Ray
+Copyright (c) 2015-2020 V2Fly Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,19 +3,21 @@
 ***
 
 # Project V
-![](https://github.com/v2fly/v2ray-core/workflows/Test/badge.svg)
-[![codecov.io][3]][4] [![GoDoc][5]][6] [![codebeat][7]][8] [![Downloads][9]][10] [![Downloads][11]][12]
 
-[3]: https://codecov.io/gh/v2fly/v2ray-core/branch/master/graph/badge.svg?branch=master "Coverage badge"
+[![GitHub Test Badge][1]][2] [![codecov.io][3]][4] [![GoDoc][5]][6] [![codebeat][7]][8] [![Downloads][9]][10] [![Downloads][11]][12]
+
+[1]: https://github.com/v2fly/v2ray-core/workflows/Test/badge.svg "GitHub Test Badge"
+[2]: https://github.com/v2fly/v2ray-core/actions "GitHub Actions Page"
+[3]: https://codecov.io/gh/v2fly/v2ray-core/branch/master/graph/badge.svg?branch=master "Coverage Badge"
 [4]: https://codecov.io/gh/v2fly/v2ray-core?branch=master "Codecov Status"
-[5]: https://godoc.org/v2ray.com/core?status.svg "GoDoc badge"
+[5]: https://godoc.org/v2ray.com/core?status.svg "GoDoc Badge"
 [6]: https://godoc.org/v2ray.com/core "GoDoc"
-[7]: https://codebeat.co/badges/f2354ca8-3e24-463d-a2e3-159af73b2477 "Codebeat badge"
-[8]: https://codebeat.co/projects/github-com-v2ray-v2ray-core-master "Codebeat"
-[9]: https://img.shields.io/github/downloads/v2ray/v2ray-core/total.svg "All releases badge"
-[10]: https://github.com/v2ray/v2ray-core/releases/ "All releases number"
-[11]: https://img.shields.io/github/downloads/v2fly/v2ray-core/total.svg "All releases badge"
-[12]: https://github.com/v2fly/v2ray-core/releases/ "All releases number"
+[7]: https://goreportcard.com/badge/github.com/v2fly/v2ray-core "Goreportcard Badge"
+[8]: https://goreportcard.com/report/github.com/v2fly/v2ray-core "Goreportcard Result"
+[9]: https://img.shields.io/github/downloads/v2ray/v2ray-core/total.svg "v2ray/v2ray-core downloads count"
+[10]: https://github.com/v2ray/v2ray-core/releases "v2ray/v2ray-core release page"
+[11]: https://img.shields.io/github/downloads/v2fly/v2ray-core/total.svg "v2fly/v2ray-core downloads count"
+[12]: https://github.com/v2fly/v2ray-core/releases "v2fly/v2ray-core release page"
 
 Project V is a set of network tools that help you to build your own computer network. It secures your network connections and thus protects your privacy. See [our website](https://www.v2fly.org/) for more information.
 
@@ -27,9 +29,9 @@ Project V is a set of network tools that help you to build your own computer net
 
 This repo relies on the following third-party projects:
 
-* In production:
-  * [gorilla/websocket](https://github.com/gorilla/websocket)
-  * [gRPC](https://google.golang.org/grpc)
-* For testing only:
-  * [miekg/dns](https://github.com/miekg/dns)
-  * [h12w/socks](https://github.com/h12w/socks)
+- In production:
+  - [gorilla/websocket](https://github.com/gorilla/websocket)
+  - [gRPC](https://google.golang.org/grpc)
+- For testing only:
+  - [miekg/dns](https://github.com/miekg/dns)
+  - [h12w/socks](https://github.com/h12w/socks)

app/commander/commander.go

@@ -2,7 +2,7 @@
 
 package commander
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen
 
 import (
 	"context"

app/commander/config.proto

@@ -12,6 +12,7 @@ import "common/serial/typed_message.proto";
 message Config {
   // Tag of the outbound handler that handles grpc connections.
   string tag = 1;
-  // Services that supported by this server. All services must implement Service interface.
+  // Services that supported by this server. All services must implement Service
+  // interface.
   repeated v2ray.core.common.serial.TypedMessage service = 2;
 }

app/dispatcher/config.proto

@@ -8,7 +8,6 @@ option java_multiple_files = true;
 
 message SessionConfig {
   reserved 1;
-
 }
 
 message Config {

app/dispatcher/default.go

@@ -2,7 +2,7 @@
 
 package dispatcher
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen
 
 import (
 	"context"

app/dispatcher/dispatcher.go

@@ -2,4 +2,4 @@
 
 package dispatcher
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen

app/dns/config.proto

@@ -36,8 +36,9 @@ enum DomainMatchingType {
 }
 
 message Config {
-  // Nameservers used by this DNS. Only traditional UDP servers are support at the moment.
-  // A special value 'localhost' as a domain address can be set to use DNS on local system.
+  // Nameservers used by this DNS. Only traditional UDP servers are support at
+  // the moment. A special value 'localhost' as a domain address can be set to
+  // use DNS on local system.
   repeated v2ray.core.common.net.Endpoint NameServers = 1 [deprecated = true];
 
   // NameServer list used by this DNS client.
@@ -47,7 +48,8 @@ message Config {
   // Deprecated. Use static_hosts.
   map<string, v2ray.core.common.net.IPOrDomain> Hosts = 2 [deprecated = true];
 
-  // Client IP for EDNS client subnet. Must be 4 bytes (IPv4) or 16 bytes (IPv6).
+  // Client IP for EDNS client subnet. Must be 4 bytes (IPv4) or 16 bytes
+  // (IPv6).
   bytes client_ip = 3;
 
   message HostMapping {
@@ -56,8 +58,9 @@ message Config {
 
     repeated bytes ip = 3;
 
-    // ProxiedDomain indicates the mapped domain has the same IP address on this domain. V2Ray will use this domain for IP queries.
-    // This field is only effective if ip is empty.
+    // ProxiedDomain indicates the mapped domain has the same IP address on this
+    // domain. V2Ray will use this domain for IP queries. This field is only
+    // effective if ip is empty.
     string proxied_domain = 4;
   }
 

app/dns/dns.go

@@ -1,4 +1,4 @@
 // Package dns is an implementation of core.DNS feature.
 package dns
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen

app/dns/dohdns.go

@@ -14,15 +14,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	dns_feature "v2ray.com/core/features/dns"
-
 	"golang.org/x/net/dns/dnsmessage"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/protocol/dns"
 	"v2ray.com/core/common/session"
 	"v2ray.com/core/common/signal/pubsub"
 	"v2ray.com/core/common/task"
+	dns_feature "v2ray.com/core/features/dns"
 	"v2ray.com/core/features/routing"
 	"v2ray.com/core/transport/internet"
 )
@@ -221,13 +220,11 @@ func (s *DoHNameServer) sendQuery(ctx context.Context, domain string, option IPO
 	if d, ok := ctx.Deadline(); ok {
 		deadline = d
 	} else {
-		deadline = time.Now().Add(time.Second * 8)
+		deadline = time.Now().Add(time.Second * 5)
 	}
 
 	for _, req := range reqs {
-
 		go func(r *dnsRequest) {
-
 			// generate new context for each req, using same context
 			// may cause reqs all aborted if any one encounter an error
 			dnsCtx := context.Background()
@@ -245,7 +242,8 @@ func (s *DoHNameServer) sendQuery(ctx context.Context, domain string, option IPO
 			// forced to use mux for DOH
 			dnsCtx = session.ContextWithMuxPrefered(dnsCtx, true)
 
-			dnsCtx, cancel := context.WithDeadline(dnsCtx, deadline)
+			var cancel context.CancelFunc
+			dnsCtx, cancel = context.WithDeadline(dnsCtx, deadline)
 			defer cancel()
 
 			b, err := dns.PackMessage(r.msg)
@@ -269,7 +267,6 @@ func (s *DoHNameServer) sendQuery(ctx context.Context, domain string, option IPO
 }
 
 func (s *DoHNameServer) dohHTTPSContext(ctx context.Context, b []byte) ([]byte, error) {
-
 	body := bytes.NewBuffer(b)
 	req, err := http.NewRequest("POST", s.dohURL, body)
 	if err != nil {

app/dns/server.go

@@ -2,7 +2,7 @@
 
 package dns
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen
 
 import (
 	"context"
@@ -209,7 +209,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
 						ruleIter = 0
 						ruleCurr++
 					}
-				} else { // No original rule, generate one according to current domain matcher (majorly for compability with tests)
+				} else { // No original rule, generate one according to current domain matcher (majorly for compatibility with tests)
 					info.domainRuleIdx = uint16(len(rules))
 					rules = append(rules, matcher.String())
 				}

app/log/command/command.go

@@ -2,7 +2,7 @@
 
 package command
 
-//go:generate errorgen
+//go:generate go run v2ray.com/core/common/errors/errorgen
 
 import (
 	"context"