CLOUD-57217 disable shell for saltuser

akanto · akanto · commit 7c354f539522 · 2016-08-25T16:38:31.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.2.0
+VERSION=0.2.1
 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/salt_test.go b/saltboot/salt_test.go
diff --git a/saltboot/user.go b/saltboot/user.go
@@ -44,15 +44,11 @@ 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", "--password", hash, SALT_USER)
+		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/bin/false", "--password", hash, SALT_USER)
 
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
-		result, err = ExecCmd("usermod", "-G", "wheel", SALT_USER)
-		if err != nil {
-			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
-		}
 	} else {
 		log.Printf("[CreateUser] user: %s exsist", SALT_USER)
 	}

Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,11 @@ 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", "--password", hash, SALT_USER)`
	`47`	`+ result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/bin/false", "--password", hash, SALT_USER)`
`48`	`48`
`49`	`49`	`if err != nil {`
`50`	`50`	`return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`
`51`	`51`	`}`
`52`		`- result, err = ExecCmd("usermod", "-G", "wheel", SALT_USER)`
`53`		`- if err != nil {`
`54`		`- return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`
`55`		`- }`
`56`	`52`	`} else {`
`57`	`53`	`log.Printf("[CreateUser] user: %s exsist", SALT_USER)`
`58`	`54`	`}`