Upgrading server package dependencies (#12559)

vendor/github.com/corpix/uarand/.travis.yml

@@ -1,11 +1,3 @@
-language: go
+language: nix
 
-go:
-  - 1.8
-  - 1.9
-  - 1.10
-  - 1.11
-  - 1.12
-  - master
-
-script: make test
+script: nix-shell --pure --command "make lint test"

vendor/github.com/corpix/uarand/Makefile

@@ -14,17 +14,19 @@ test:
 
 .PHONY: lint
 lint:
-	go vet ./...
+.PHONY: lint
+lint:
+	golangci-lint --color=always                                                       \
+		--exclude='uses unkeyed fields'                                            \
+		--exclude='type .* is unused'                                              \
+		--exclude='should merge variable declaration with assignment on next line' \
+		--deadline=120s                                                            \
+		run ./...
 
 .PHONY: check
 check: lint test
 
 .PHONY: useragents.go
 useragents.go:
-	curl -Ls -H'User-Agent: gotohellwithyour403'                            \
-		http://techpatterns.com/downloads/firefox/useragentswitcher.xml \
-	| ./scripts/extract-user-agents                                         \
-	| ./scripts/generate-useragents-go $(name)                              \
-	> $@
+	./scripts/fetch-user-agents | ./scripts/generate-useragents-go $(name) > $@
 	go fmt $@
-

vendor/github.com/corpix/uarand/README.md

@@ -35,4 +35,4 @@ Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41
 
 ## License
 
-MIT
+[Unlicense](https://unlicense.org/)

vendor/github.com/corpix/uarand/shell.nix

@@ -1,15 +1,17 @@
 let
   nixpkgs = builtins.fetchTarball {
-    url    = "https://github.com/nixos/nixpkgs/archive/03050e9749e1548f1648aae5c062c954eaad546e.tar.gz";
-    sha256 = "00hfkldmf853ynnd8a9d7a778ifcrdjxdndxyykzbpxfki5s5qsb";
+    url    = "https://github.com/nixos/nixpkgs/archive/ddf38a8241089d79c3bcd1777781b6438ab88d84.tar.gz";
+    sha256 = "0fjk69mn58h0gjzgxgnkfkhhf1l707bg2cn4823ma9xbjxbhl0ya";
   };
 in with import nixpkgs {};
 stdenv.mkDerivation {
   name = "nix-shell";
   buildInputs = [
-    go
+    coreutils bashInteractive jq curl gcc git gnumake
+    go golangci-lint cacert openssl
   ];
   shellHook = ''
     unset GOPATH
+    export NIX_PATH=nixpkgs=${nixpkgs}
   '';
 }

vendor/github.com/corpix/uarand/uarand.go

@@ -2,6 +2,7 @@ package uarand
 
 import (
 	"math/rand"
+	"sync"
 	"time"
 )
 
@@ -24,11 +25,17 @@ type Randomizer interface {
 type UARand struct {
 	Randomizer
 	UserAgents []string
+
+	mutex sync.Mutex
 }
 
 // GetRandom returns a random user agent from UserAgents slice.
 func (u *UARand) GetRandom() string {
-	return u.UserAgents[u.Intn(len(u.UserAgents))]
+	u.mutex.Lock()
+	n := u.Intn(len(u.UserAgents))
+	u.mutex.Unlock()
+
+	return u.UserAgents[n]
 }
 
 // GetRandom returns a random user agent from UserAgents slice.
@@ -39,11 +46,18 @@ func GetRandom() string {
 
 // New return UserAgent randomizer settings with default user-agents list
 func New(r Randomizer) *UARand {
-	return &UARand{r, UserAgents}
+	return &UARand{
+		Randomizer: r,
+		UserAgents: UserAgents,
+		mutex:      sync.Mutex{},
+	}
 }
 
 // NewWithCustomList return UserAgent randomizer settings with custom user-agents list
 func NewWithCustomList(userAgents []string) *UARand {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return &UARand{r, userAgents}
+	return &UARand{
+		Randomizer: rand.New(rand.NewSource(time.Now().UnixNano())),
+		UserAgents: userAgents,
+		mutex:      sync.Mutex{},
+	}
 }