remove info messages that print out passwords

Author: Jeff McCormick

apiserver/root.go

@@ -188,8 +188,8 @@ func file2lines(filePath string) []string {
 func parseUserMap(dat string) (string, string) {
 
 	fields := strings.Split(strings.TrimSpace(dat), ":")
-	log.Infof("%v\n", fields)
-	log.Infof("username=[%s] password=[%s]\n", fields[0], fields[1])
+	//log.Infof("%v\n", fields)
+	//log.Infof("username=[%s] password=[%s]\n", fields[0], fields[1])
 	return fields[0], fields[1]
 }
 
@@ -202,7 +202,7 @@ func getCredentials() {
 	lines := file2lines(pgouserPath)
 	for _, v := range lines {
 		Username, Password = parseUserMap(v)
-		log.Debugf("username=%s password=%s\n", Username, Password)
+		//log.Debugf("username=%s password=%s\n", Username, Password)
 		Credentials[Username] = Password
 	}
 
@@ -242,7 +242,8 @@ func Authn(where string, w http.ResponseWriter, r *http.Request) error {
 		http.Error(w, "Not authenticated in apiserver", 401)
 		return errors.New("Not Authenticated")
 	}
-	log.Debugf("Authn Success %s username=[%s] password=[%s]\n", where, username, password)
+	log.Debug("Authn Success")
+	//log.Debugf("Authn Success %s username=[%s] password=[%s]\n", where, username, password)
 	return err
 
 }

apiserver/userservice/userimpl.go

@@ -95,7 +95,7 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 	clusterList := crv1.PgclusterList{}
 	err = apiserver.RESTClient.Get().
 		Resource(crv1.PgclusterResourcePlural).
-		Namespace(request.Namespace).
+		Namespace(apiserver.Namespace).
 		Param("labelSelector", myselector.String()).
 		//LabelsSelectorParam(myselector).
 		Do().
@@ -116,7 +116,7 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 	for _, cluster := range clusterList.Items {
 		sel = "pg-cluster=" + cluster.Spec.Name + ",!replica"
 		lo := meta_v1.ListOptions{LabelSelector: sel}
-		deployments, err := apiserver.Clientset.ExtensionsV1beta1().Deployments(request.Namespace).List(lo)
+		deployments, err := apiserver.Clientset.ExtensionsV1beta1().Deployments(apiserver.Namespace).List(lo)
 		if err != nil {
 			log.Error("error getting list of deployments" + err.Error())
 			resp.Status.Code = msgs.Error
@@ -125,15 +125,15 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 		}
 
 		for _, d := range deployments.Items {
-			info := getPostgresUserInfo(request.Namespace, d.ObjectMeta.Name)
+			info := getPostgresUserInfo(apiserver.Namespace, d.ObjectMeta.Name)
 
 			if request.ChangePasswordForUser != "" {
 				msg := "changing password of user " + request.ChangePasswordForUser + " on " + d.ObjectMeta.Name
 				log.Debug(msg)
 				resp.Results = append(resp.Results, msg)
 				newPassword := util.GeneratePassword(defaultPasswordLength)
 				newExpireDate := GeneratePasswordExpireDate(request.PasswordAgeDays)
-				err = updatePassword(cluster.Spec.Name, info, request.ChangePasswordForUser, newPassword, newExpireDate, request.Namespace)
+				err = updatePassword(cluster.Spec.Name, info, request.ChangePasswordForUser, newPassword, newExpireDate, apiserver.Namespace)
 				if err != nil {
 					log.Error(err.Error())
 					resp.Status.Code = msgs.Error
@@ -145,21 +145,21 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 				msg := "deleting user " + request.DeleteUser + " from " + d.ObjectMeta.Name
 				log.Debug(msg)
 				resp.Results = append(resp.Results, msg)
-				err = deleteUser(request.Namespace, cluster.Spec.Name, info, request.DeleteUser, request.ManagedUser)
+				err = deleteUser(apiserver.Namespace, cluster.Spec.Name, info, request.DeleteUser, request.ManagedUser)
 			}
 			if request.AddUser != "" {
 				msg := "adding new user " + request.AddUser + " to " + d.ObjectMeta.Name
 				log.Debug(msg)
 				resp.Results = append(resp.Results, msg)
-				err = addUser(request.UserDBAccess, request.Namespace, d.ObjectMeta.Name, info, request.AddUser, request.ManagedUser)
+				err = addUser(request.UserDBAccess, apiserver.Namespace, d.ObjectMeta.Name, info, request.AddUser, request.ManagedUser)
 				if err != nil {
 					resp.Status.Code = msgs.Error
 					resp.Status.Msg = err.Error()
 					return resp
 				}
 				newPassword := util.GeneratePassword(defaultPasswordLength)
 				newExpireDate := GeneratePasswordExpireDate(request.PasswordAgeDays)
-				err = updatePassword(cluster.Spec.Name, info, request.AddUser, newPassword, newExpireDate, request.Namespace)
+				err = updatePassword(cluster.Spec.Name, info, request.AddUser, newPassword, newExpireDate, apiserver.Namespace)
 				if err != nil {
 					log.Error(err.Error())
 					resp.Status.Code = msgs.Error
@@ -178,7 +178,7 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 						if request.UpdatePasswords {
 							newPassword := util.GeneratePassword(defaultPasswordLength)
 							newExpireDate := GeneratePasswordExpireDate(request.PasswordAgeDays)
-							err = updatePassword(cluster.Spec.Name, v.ConnDetails, v.Rolname, newPassword, newExpireDate, request.Namespace)
+							err = updatePassword(cluster.Spec.Name, v.ConnDetails, v.Rolname, newPassword, newExpireDate, apiserver.Namespace)
 							if err != nil {
 								log.Error("error in updating password")
 							}

pgo/cmd/user.go

@@ -61,8 +61,8 @@ For example:
 
 pgo user --selector=name=mycluster --update
 pgo user --expired=7 --selector=name=mycluster
-pgo user --add-user=bob --selector=sname=mycluster
-pgo user --change-password=bob --selector=sname=mycluster
+pgo user --add-user=bob --selector=name=mycluster
+pgo user --change-password=bob --selector=name=mycluster
 .`,
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Debug("user called")