kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

dockerinit: refactor error handling

Browse source
This commit is contained in:
Josh Poimboeuf 2013-12-02 16:21:29 -06:00
parent bd02d6e662
commit 1572989201
1 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

61
sysinit/sysinit.go
View file

@ -25,57 +25,61 @@ type DockerInitArgs struct {
} }
// Setup networking // Setup networking
func setupNetworking(args *DockerInitArgs) { func setupNetworking(args *DockerInitArgs) error {
if args.gateway == "" { if args.gateway == "" {
return return nil
} }
ip := net.ParseIP(args.gateway) ip := net.ParseIP(args.gateway)
if ip == nil { if ip == nil {
log.Fatalf("Unable to set up networking, %s is not a valid IP", args.gateway) return fmt.Errorf("Unable to set up networking, %s is not a valid IP", args.gateway)
return
} }
if err := netlink.AddDefaultGw(ip); err != nil { if err := netlink.AddDefaultGw(ip); err != nil {
log.Fatalf("Unable to set up networking: %v", err) return fmt.Errorf("Unable to set up networking: %v", err)
} }
return nil
} }
// Setup working directory // Setup working directory
func setupWorkingDirectory(args *DockerInitArgs) { func setupWorkingDirectory(args *DockerInitArgs) error {
if args.workDir == "" { if args.workDir == "" {
return return nil
} }
if err := syscall.Chdir(args.workDir); err != nil { if err := syscall.Chdir(args.workDir); err != nil {
log.Fatalf("Unable to change dir to %v: %v", args.workDir, err) return fmt.Errorf("Unable to change dir to %v: %v", args.workDir, err)
} }
return nil
} }
// Takes care of dropping privileges to the desired user // Takes care of dropping privileges to the desired user
func changeUser(args *DockerInitArgs) { func changeUser(args *DockerInitArgs) error {
if args.user == "" { if args.user == "" {
return return nil
} }
userent, err := utils.UserLookup(args.user) userent, err := utils.UserLookup(args.user)
if err != nil { if err != nil {
log.Fatalf("Unable to find user %v: %v", args.user, err) return fmt.Errorf("Unable to find user %v: %v", args.user, err)
} }
uid, err := strconv.Atoi(userent.Uid) uid, err := strconv.Atoi(userent.Uid)
if err != nil { if err != nil {
log.Fatalf("Invalid uid: %v", userent.Uid) return fmt.Errorf("Invalid uid: %v", userent.Uid)
} }
gid, err := strconv.Atoi(userent.Gid) gid, err := strconv.Atoi(userent.Gid)
if err != nil { if err != nil {
log.Fatalf("Invalid gid: %v", userent.Gid) return fmt.Errorf("Invalid gid: %v", userent.Gid)
} }
if err := syscall.Setgid(gid); err != nil { if err := syscall.Setgid(gid); err != nil {
log.Fatalf("setgid failed: %v", err) return fmt.Errorf("setgid failed: %v", err)
} }
if err := syscall.Setuid(uid); err != nil { if err := syscall.Setuid(uid); err != nil {
log.Fatalf("setuid failed: %v", err) return fmt.Errorf("setuid failed: %v", err)
} }
return nil
} }
// Clear environment pollution introduced by lxc-start // Clear environment pollution introduced by lxc-start
@ -90,7 +94,21 @@ func setupEnv(args *DockerInitArgs) {
} }
} }
func executeProgram(args *DockerInitArgs) { func executeProgram(args *DockerInitArgs) error {
setupEnv(args)
if err := setupNetworking(args); err != nil {
return err
}
if err := setupWorkingDirectory(args); err != nil {
return err
}
if err := changeUser(args); err != nil {
return err
}
path, err := exec.LookPath(args.args[0]) path, err := exec.LookPath(args.args[0])
if err != nil { if err != nil {
log.Printf("Unable to locate %v", args.args[0]) log.Printf("Unable to locate %v", args.args[0])
@ -100,6 +118,9 @@ func executeProgram(args *DockerInitArgs) {
if err := syscall.Exec(path, args.args, os.Environ()); err != nil { if err := syscall.Exec(path, args.args, os.Environ()); err != nil {
panic(err) panic(err)
} }
// Will never reach here
return nil
} }
// Sys Init code // Sys Init code
@ -135,9 +156,7 @@ func SysInit() {
args: flag.Args(), args: flag.Args(),
} }
setupEnv(args) if err := executeProgram(args); err != nil {
setupNetworking(args) log.Fatal(err)
setupWorkingDirectory(args) }
changeUser(args)
executeProgram(args)
} }