Compare commits

..

10 Commits

Author SHA1 Message Date
a075c84a40 go.mod added 2024-01-15 19:13:59 +01:00
ff11c335dc use conn.RemoteAddr() for remote addr 2020-08-27 18:34:20 +02:00
2d6bdd9fb5 use syscall.Exec after set(g|u)id and setgroups 2020-02-02 21:14:54 +01:00
f7be4ee72f better argument forwarding to child 2020-02-02 19:10:19 +01:00
a3d5045809 Forking model to set uid/gid introduced
If -uid is set, we fork a child process with the uid, the gid and the
supplimentary gids for that user.
2020-02-02 12:49:31 +01:00
8373a55501 rely on setcap rather than setuid/setgid 2016-03-04 09:16:30 +01:00
f30a09097d re-implemented setuid/setgid support 2016-01-02 14:49:54 +01:00
7648733aaa gofmt 2013-07-30 13:20:53 +02:00
87e9f8152f setuid/gid implemented 2013-07-30 09:08:37 +02:00
34bbc146bb env added 2013-07-29 12:34:47 +02:00
2 changed files with 134 additions and 15 deletions

3
go.mod Normal file
View File

@ -0,0 +1,3 @@
module tlsserver
go 1.21.6

View File

@ -2,34 +2,109 @@ package main
import ( import (
"crypto/tls" "crypto/tls"
"log"
"net"
"flag" "flag"
"fmt" "fmt"
"log"
"net"
"os" "os"
"os/exec" "os/exec"
"os/user"
"strconv"
"syscall"
) )
var ( var (
cfile = flag.String("cert", "cert.pem", "Certificate file in PEM format") cfile = flag.String("cert", "cert.pem", "Certificate file in PEM format")
kfile = flag.String("key", "key.pem", "Key file in PEM format") kfile = flag.String("key", "key.pem", "Key file in PEM format")
port = flag.Int("port", 1234, "Port to bind to") port = flag.String("port", ":1234", "Port to bind to")
uid = flag.Int("uid", -1, "UID to run under")
args []string args []string
nargs int
) )
func main() { const TLSSERVER = "[tlsserver]"
func main() {
flag.Parse() flag.Parse()
args = flag.Args()
nargs = flag.NArg() if flag.NArg() < 1 {
if nargs < 1 {
fmt.Println("Usage: tlsserver [options] cmd [flags for cmd]") fmt.Println("Usage: tlsserver [options] cmd [flags for cmd]")
fmt.Println("options:") fmt.Println("options:")
flag.PrintDefaults() flag.PrintDefaults()
os.Exit(1) os.Exit(1)
} }
if os.Args[0] == TLSSERVER {
log.Fatal(serve())
} else {
log.Fatal(exc())
}
}
func exc() error {
if *uid < 0 {
return serve()
}
// Collect information about the user
user, err := user.LookupId(strconv.Itoa(*uid))
if err != nil {
return err
}
// Get the primary and secondary groups
gids := []int{}
gid, err := strconv.Atoi(user.Gid)
if err != nil {
return fmt.Errorf("couldn't parse user.Gid, strconv.Atoi(%s): %v", user.Gid, err)
}
if sgids, err := user.GroupIds(); err != nil {
log.Println("weird, couldn't get supplimentary groups: %v", err)
} else {
for _, s := range sgids {
v, e := strconv.Atoi(s)
if e != nil {
log.Println("weird, strconv.Atoi(%s): %v", s, e)
continue
} else if v != gid {
gids = append(gids, v)
}
}
}
if err := setgid(gid); err != nil {
return err
}
if len(gids) > 0 {
if err = syscall.Setgroups(gids); err != nil {
return fmt.Errorf("syscall.Setgroups: %w", err)
}
}
if err = setuid(*uid); err != nil {
return err
}
// Setup the arguments that are needed
args := []string{TLSSERVER} // name of the command
for _, arg := range []string{"cert", "key", "port"} {
fl := flag.Lookup(arg)
// Only set the flag if it's value are different from the default
if fl != nil && fl.Value.String() != fl.DefValue {
args = append(args, "-"+arg, fl.Value.String())
}
}
args = append(args, flag.Args()...)
return syscall.Exec(os.Args[0], args, os.Environ())
}
func serve() error {
args = flag.Args()
// setup certs etc. for TLS-socket // setup certs etc. for TLS-socket
tconf := new(tls.Config) tconf := new(tls.Config)
cert, err := tls.LoadX509KeyPair(*cfile, *kfile) cert, err := tls.LoadX509KeyPair(*cfile, *kfile)
@ -42,8 +117,7 @@ func main() {
tconf.BuildNameToCertificate() tconf.BuildNameToCertificate()
// start listening // start listening
sport := fmt.Sprintf(":%d", *port) sock, err := tls.Listen("tcp", *port, tconf)
sock, err := tls.Listen("tcp", sport , tconf)
if err != nil { if err != nil {
fmt.Println("error with tcp-socket:", err) fmt.Println("error with tcp-socket:", err)
os.Exit(3) os.Exit(3)
@ -58,11 +132,11 @@ func main() {
continue continue
} }
log.Println("Got connection:", conn.RemoteAddr()) log.Println("Got connection:", conn.RemoteAddr())
go handleConnection(conn) go handleConnection(conn, args...)
} }
} }
func handleConnection(conn net.Conn) { func handleConnection(conn net.Conn, args ...string) {
defer conn.Close() defer conn.Close()
// setup cmd // setup cmd
@ -71,9 +145,51 @@ func handleConnection(conn net.Conn) {
cmd.Stdin = conn cmd.Stdin = conn
cmd.Stdout = conn cmd.Stdout = conn
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
err := cmd.Run()
// prepare environment according to tcp-environ(5)
lh, lp, err := net.SplitHostPort(conn.LocalAddr().String())
if err != nil { if err != nil {
log.Println(err) log.Println("net.SplitHostPort(conn.LocalAddr()):", err)
return
}
rh, rp, err := net.SplitHostPort(conn.RemoteAddr().String())
if err != nil {
log.Println("net.SplitHostPort(conn.RemoteAddr()):", err)
return
}
cmd.Env = make([]string, 0)
cmd.Env = append(cmd.Env, "PATH="+os.Getenv("PATH"))
cmd.Env = append(cmd.Env, "PROTO=TCP")
cmd.Env = append(cmd.Env, "TCPLOCALIP="+lh)
cmd.Env = append(cmd.Env, "TCPLOCALPORT="+lp)
cmd.Env = append(cmd.Env, "TCPREMOTEIP="+rh)
cmd.Env = append(cmd.Env, "TCPREMOTEPORT="+rp)
err = cmd.Run()
if err != nil {
log.Println("after Run: ", err)
} }
log.Println("Done with connection", conn.RemoteAddr()) log.Println("Done with connection", conn.RemoteAddr())
} }
// Since go1.4 the setgid syscall is deliberatelly not supported anymore, as it
// only applies to the calling thread. So we try this here:
func setgid(gid int) error {
// RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
_, _, e := syscall.RawSyscall(syscall.SYS_SETGID, uintptr(gid), 0, 0)
if e != 0 {
return fmt.Errorf("setgid: %w", e)
}
return nil
}
func setuid(uid int) error {
// RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
_, _, e := syscall.RawSyscall(syscall.SYS_SETUID, uintptr(uid), 0, 0)
if e != 0 {
return fmt.Errorf("setuid: %w", e)
}
return nil
}