updated dependencies

vendor/git.giftfish.de/ston1th/godrop/lookup_cgo.go

@@ -1,23 +0,0 @@
-// Copyright (C) 2017 Marius Schellenberger
-
-// +build cgo
-
-package godrop
-
-import "os/user"
-
-func lookupUID(username string) (string, error) {
-	u, err := user.Lookup(username)
-	if err != nil {
-		return "", err
-	}
-	return u.Uid, err
-}
-
-func lookupGID(name string) (string, error) {
-	g, err := user.LookupGroup(name)
-	if err != nil {
-		return "", err
-	}
-	return g.Gid, err
-}

vendor/git.giftfish.de/ston1th/godrop/lookup_nocgo.go

@@ -1,43 +0,0 @@
-// Copyright (C) 2017 Marius Schellenberger
-
-// +build darwin dragonfly freebsd android linux netbsd openbsd solaris
-// +build !cgo
-
-package godrop
-
-import (
-	"io/ioutil"
-	"os"
-	"regexp"
-)
-
-func readFile(name, file string) (id string, err error) {
-	id = "-1"
-	if name == "" {
-		return
-	}
-	f, err := os.Open(file)
-	if err != nil {
-		return
-	}
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return
-	}
-	r := regexp.MustCompile(name + `:.*?:(\d+):`)
-	m := r.FindAllStringSubmatch(string(b), 1)
-	if len(m) == 1 {
-		if len(m[0]) == 2 {
-			return m[0][1], nil
-		}
-	}
-	return
-}
-
-func lookupUID(username string) (string, error) {
-	return readFile(username, "/etc/passwd")
-}
-
-func lookupGID(name string) (string, error) {
-	return readFile(name, "/etc/group")
-}

vendor/git.giftfish.de/ston1th/godrop/v2/.gitignore

@@ -1,2 +1,3 @@
 port80
+port80fg
 port80and443

vendor/git.giftfish.de/ston1th/godrop/v2/go.mod

@@ -0,0 +1 @@
+module git.giftfish.de/ston1th/godrop/v2

vendor/git.giftfish.de/ston1th/godrop/v2/godrop.go

@@ -1,10 +1,11 @@
-// Copyright (C) 2017 Marius Schellenberger
+// Copyright (C) 2018 Marius Schellenberger
+
+// +build go1.11
 
 // Package godrop provides a simple privileges dropping library
 package godrop
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -13,8 +14,8 @@ import (
 	"syscall"
 )
 
-func errf(err error) error {
-	return fmt.Errorf("godrop: %s", err)
+func errf(i interface{}) error {
+	return fmt.Errorf("godrop: %s", i)
 }
 
 // Config represents the drop config
@@ -45,7 +46,7 @@ func MultiDrop(c Config, f func() ([]net.Listener, error)) error {
 		return errf(err)
 	}
 	if uid == 0 {
-		return errf(errors.New("unable to drop privileges to uid 0 (root)"))
+		return errf("unable to drop privileges to uid 0 (root)")
 	}
 	gid, err := groupID(c.Group)
 	if err != nil {
@@ -68,20 +69,14 @@ func MultiDrop(c Config, f func() ([]net.Listener, error)) error {
 				f, err = l.File()
 				l.Close()
 			default:
-				return errf(fmt.Errorf("index: %d listener is not type of either *net.TCPListener or *net.UnixListener", i))
+				return errf(fmt.Sprintf("index %d listener is not type of either *net.TCPListener or *net.UnixListener", i))
 			}
 			if err != nil {
-				return errf(fmt.Errorf("index: %d %s", i, err))
+				return errf(fmt.Sprintf("index %d %s", i, err))
 			}
 			cmd.ExtraFiles = append(cmd.ExtraFiles, f)
 		}
 
-		if c.Foreground {
-			cmd.Stdin = os.Stdin
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-		}
-
 		cmd.SysProcAttr = &syscall.SysProcAttr{
 			Chroot: c.Chroot,
 			Credential: &syscall.Credential{
@@ -91,16 +86,31 @@ func MultiDrop(c Config, f func() ([]net.Listener, error)) error {
 			Setsid: true,
 		}
 
+		if c.Foreground {
+			cmd.Stdin = os.Stdin
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+		}
+
 		if err := cmd.Start(); err != nil {
 			return errf(err)
 		}
 
 		if c.Foreground {
 			go func() {
+				term := make(chan os.Signal)
+				signal.Notify(term, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 				sigs := make(chan os.Signal)
-				signal.Notify(sigs, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
-				sig := <-sigs
-				cmd.Process.Signal(sig)
+				signal.Notify(sigs, syscall.SIGSTOP, syscall.SIGCONT, syscall.SIGUSR1, syscall.SIGUSR2)
+				for {
+					select {
+					case sig := <-term:
+						cmd.Process.Signal(sig)
+						return
+					case sig := <-sigs:
+						cmd.Process.Signal(sig)
+					}
+				}
 			}()
 			_ = cmd.Wait()
 			os.Exit(int(cmd.ProcessState.Sys().(syscall.WaitStatus)))
@@ -110,7 +120,7 @@ func MultiDrop(c Config, f func() ([]net.Listener, error)) error {
 	case uid:
 		return nil
 	}
-	return errf(errors.New("dropping priviledges failed"))
+	return errf("dropping priviledges failed")
 }
 
 // GetListener returns the listener socket of file descriptor 3
@@ -120,6 +130,9 @@ func GetListener() (net.Listener, error) {
 
 // GetListenerFd returns the listener socket of the given file descriptor
 func GetListenerFd(fd int) (net.Listener, error) {
+	if fd < 3 {
+		return nil, errf("fd is less than 3")
+	}
 	f := os.NewFile(uintptr(fd), "")
 	defer f.Close()
 	return net.FileListener(f)

vendor/git.giftfish.de/ston1th/godrop/v2/lookup.go

@@ -1,8 +1,13 @@
-// Copyright (C) 2017 Marius Schellenberger
+// Copyright (C) 2018 Marius Schellenberger
+
+// +build go1.11
 
 package godrop
 
-import "strconv"
+import (
+	"os/user"
+	"strconv"
+)
 
 func atoi(a string) (int, error) {
 	i, err := strconv.Atoi(a)
@@ -12,18 +17,18 @@ func atoi(a string) (int, error) {
 	return i, nil
 }
 
-func userID(username string) (uid int, err error) {
-	id, err := lookupUID(username)
+func userID(username string) (int, error) {
+	u, err := user.Lookup(username)
 	if err != nil {
 		return -1, err
 	}
-	return atoi(id)
+	return atoi(u.Uid)
 }
 
 func groupID(name string) (int, error) {
-	id, err := lookupGID(name)
+	g, err := user.LookupGroup(name)
 	if err != nil {
 		return -1, err
 	}
-	return atoi(id)
+	return atoi(g.Gid)
 }

vendor/git.giftfish.de/ston1th/jwt/v3/go.mod

@@ -0,0 +1 @@
+module git.giftfish.de/ston1th/jwt/v3