Fixes

2 files changed, 50 insertions, 11 deletions

diff --git a/util/users.go b/util/users.go
new file mode 100644
index 0000000..92affa8
--- /dev/null
+++ b/util/users.go
@@ -0,0 +1,50 @@
+/*
+ * util.go - Functions for dealing with users
+ *
+ * Copyright 2017 Google Inc.
+ * Author: Joe Richey (joerichey@google.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package util
+
+import (
+	"fmt"
+	"os"
+	"os/user"
+	"strconv"
+)
+
+// CurrentUserID returns the uid of the effective user.
+func CurrentUserID() int {
+	return os.Geteuid()
+}
+
+// GetUser returns the user entry corresponding to the provided uid.
+func GetUser(uid int) *user.User {
+	uidString := strconv.Itoa(uid)
+	foundUser, err := user.LookupId(uidString)
+	if err != nil {
+		return &user.User{
+			Uid:      uidString,
+			Username: fmt.Sprintf("[uid=%d]", uid),
+		}
+	}
+	return foundUser
+}
+
+// CurrentUser returns the user entry for the effective user.
+func CurrentUser() *user.User {
+	return GetUser(CurrentUserID())
+}
diff --git a/util/util.go b/util/util.go
index 3de4a1a..9f62b45 100644
--- a/util/util.go
+++ b/util/util.go
@@ -27,7 +27,6 @@ import (
 	"bufio"
 	"math"
 	"os"
-	"os/user"
 	"strconv"
 	"unsafe"
 )
@@ -117,13 +116,3 @@ func AtoiOrPanic(input string) int {
 	}
 	return i
 }
-
-// EffectiveUser returns the user entry corresponding to the effective user.
-func EffectiveUser() (*user.User, error) {
-	return user.LookupId(strconv.Itoa(os.Geteuid()))
-}
-
-// IsUserRoot checks if the effective user is root.
-func IsUserRoot() bool {
-	return os.Geteuid() == 0
-}