Add shell attribute to User (#89)

goss-org · Jun 9, 2016 · 8662b7c · 8662b7c
1 parent 917b0aa
commit 8662b7c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/integration-tests/goss/centos6/goss-expected.json b/integration-tests/goss/centos6/goss-expected.json
@@ -70,7 +70,8 @@
             "groups": [
                 "apache"
             ],
-            "home": "/var/www"
+            "home": "/var/www",
+            "shell": "/sbin/nologin"
         },
         "foobar": {
             "exists": false

diff --git a/integration-tests/goss/precise/goss-expected.json b/integration-tests/goss/precise/goss-expected.json
@@ -73,7 +73,8 @@
             "groups": [
                 "www-data"
             ],
-            "home": "/var/www"
+            "home": "/var/www",
+            "shell": "/bin/sh"
         }
     },
     "group": {

diff --git a/integration-tests/goss/wheezy/goss-expected.json b/integration-tests/goss/wheezy/goss-expected.json
@@ -73,7 +73,8 @@
             "groups": [
                 "www-data"
             ],
-            "home": "/var/www"
+            "home": "/var/www",
+            "shell": "/bin/sh"
         }
     },
     "group": {

diff --git a/resource/user.go b/resource/user.go
@@ -16,6 +16,7 @@ type User struct {
 	GID      matcher `json:"gid,omitempty" yaml:"gid,omitempty"`
 	Groups   matcher `json:"groups,omitempty" yaml:"groups,omitempty"`
 	Home     matcher `json:"home,omitempty" yaml:"home,omitempty"`
+	Shell    matcher `json:"shell,omitempty" yaml:"shell,omitempty"`
 }
 
 func (u *User) ID() string      { return u.Username }
@@ -45,6 +46,9 @@ func (u *User) Validate(sys *system.System) []TestResult {
 	if u.Groups != nil {
 		results = append(results, ValidateValue(u, "groups", u.Groups, sysuser.Groups))
 	}
+	if u.Shell != nil {
+		results = append(results, ValidateValue(u, "shell", u.Shell, sysuser.Shell))
+	}
 
 	return results
 }
@@ -76,5 +80,10 @@ func NewUser(sysUser system.User, config util.Config) (*User, error) {
 			u.Home = home
 		}
 	}
+	if !contains(config.IgnoreList, "shell") {
+		if shell, err := sysUser.Shell(); err == nil {
+			u.Shell = shell
+		}
+	}
 	return u, nil
 }
diff --git a/system/system.go b/system/system.go
@@ -34,11 +34,11 @@ type System struct {
 	NewProcess  func(string, *System, util2.Config) Process
 	NewGossfile func(string, *System, util2.Config) Gossfile
 	dbus        *dbus.Conn
-	ports       map[string][]GOnetstat.Process
 	dbusOnce    sync.Once
+	ports       map[string][]GOnetstat.Process
 	portsOnce   sync.Once
-	procOnce    sync.Once
 	procMap     map[string][]ps.Process
+	procOnce    sync.Once
 }
 
 func (s *System) Ports() map[string][]GOnetstat.Process {

diff --git a/system/user.go b/system/user.go
@@ -15,6 +15,7 @@ type User interface {
 	GID() (int, error)
 	Groups() ([]string, error)
 	Home() (string, error)
+	Shell() (string, error)
 }
 
 type DefUser struct {
@@ -64,6 +65,15 @@ func (u *DefUser) Home() (string, error) {
 	return user.Home, nil
 }
 
+func (u *DefUser) Shell() (string, error) {
+	user, err := user.LookupUser(u.username)
+	if err != nil {
+		return "", err
+	}
+
+	return user.Shell, nil
+}
+
 func (u *DefUser) Groups() ([]string, error) {
 	user, err := user.LookupUser(u.username)
 	if err != nil {