CLOUD-57217 disable shell for saltuser with /sbin/nologin

akanto · akanto · commit f777995a012c · 2016-08-25T17:23:03.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.2.1
+VERSION=0.2.2
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/sequenceiq/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/sequenceiq/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 
diff --git a/saltboot/user.go b/saltboot/user.go
@@ -44,7 +44,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
-		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/bin/false", "--password", hash, SALT_USER)
+		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
 
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {`
`44`	`44`	`if err != nil {`
`45`	`45`	`return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`
`46`	`46`	`}`
`47`		`- result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/bin/false", "--password", hash, SALT_USER)`
	`47`	`+ result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)`
`48`	`48`
`49`	`49`	`if err != nil {`
`50`	`50`	`return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`