Merge pull request #61 from liquidweb/gosec-issues

Latest gosec reported some new issues

Author: sgsullivan

instance/plan.go

@@ -63,8 +63,8 @@ func (ci *Client) ProcessPlan(plan *Plan) error {
 		}
 	}
 
-	for _, x := range plan.Ssh {
-		if err := ci.processPlanSsh(&x); err != nil {
+	for i, _ := range plan.Ssh {
+		if err := ci.processPlanSsh(&plan.Ssh[i]); err != nil {
 			return err
 		}
 	}
@@ -104,22 +104,22 @@ func (ci *Client) processPlanSsh(params *SshParams) (err error) {
 func (ci *Client) processPlanCloudServer(server *PlanCloudServer) error {
 
 	if server.Create != nil {
-		for _, c := range server.Create {
-			if err := ci.processPlanCloudServerCreate(&c); err != nil {
+		for i, _ := range server.Create {
+			if err := ci.processPlanCloudServerCreate(&server.Create[i]); err != nil {
 				return err
 			}
 		}
 	}
 	if server.Resize != nil {
-		for _, r := range server.Resize {
-			if err := ci.processPlanCloudServerResize(&r); err != nil {
+		for i, _ := range server.Resize {
+			if err := ci.processPlanCloudServerResize(&server.Resize[i]); err != nil {
 				return err
 			}
 		}
 	}
 	if server.Reboot != nil {
-		for _, r := range server.Reboot {
-			if err := ci.processPlanCloudServerReboot(&r); err != nil {
+		for i, _ := range server.Reboot {
+			if err := ci.processPlanCloudServerReboot(&server.Reboot[i]); err != nil {
 				return err
 			}
 		}
@@ -168,8 +168,8 @@ func (ci *Client) processPlanCloudServerReboot(params *CloudServerRebootParams)
 func (ci *Client) processPlanCloudTemplate(template *PlanCloudTemplate) error {
 
 	if template.Restore != nil {
-		for _, c := range template.Restore {
-			if err := ci.processPlanCloudTemplateRestore(&c); err != nil {
+		for i, _ := range template.Restore {
+			if err := ci.processPlanCloudTemplateRestore(&template.Restore[i]); err != nil {
 				return err
 			}
 		}
@@ -198,16 +198,16 @@ func (ci *Client) processPlanCloudNetwork(network *PlanCloudNetwork) error {
 func (ci *Client) processPlanCloudNetworkPublic(public *PlanCloudNetworkPublic) error {
 
 	if public.Add != nil {
-		for _, c := range public.Add {
-			if err := ci.processPlanCloudNetworkPublicAdd(&c); err != nil {
+		for i, _ := range public.Add {
+			if err := ci.processPlanCloudNetworkPublicAdd(&public.Add[i]); err != nil {
 				return err
 			}
 		}
 	}
 
 	if public.Remove != nil {
-		for _, c := range public.Remove {
-			if err := ci.processPlanCloudNetworkPublicRemove(&c); err != nil {
+		for i, _ := range public.Remove {
+			if err := ci.processPlanCloudNetworkPublicRemove(&public.Remove[i]); err != nil {
 				return err
 			}
 		}
@@ -219,16 +219,16 @@ func (ci *Client) processPlanCloudNetworkPublic(public *PlanCloudNetworkPublic)
 func (ci *Client) processPlanCloudNetworkPrivate(private *PlanCloudNetworkPrivate) error {
 
 	if private.Attach != nil {
-		for _, c := range private.Attach {
-			if err := ci.processPlanCloudNetworkPrivateAttach(&c); err != nil {
+		for i, _ := range private.Attach {
+			if err := ci.processPlanCloudNetworkPrivateAttach(&private.Attach[i]); err != nil {
 				return err
 			}
 		}
 	}
 
 	if private.Detach != nil {
-		for _, c := range private.Detach {
-			if err := ci.processPlanCloudNetworkPrivateDetach(&c); err != nil {
+		for i, _ := range private.Detach {
+			if err := ci.processPlanCloudNetworkPrivateDetach(&private.Detach[i]); err != nil {
 				return err
 			}
 		}

utils/utils.go

@@ -16,11 +16,10 @@ limitations under the License.
 package utils
 
 import (
+	"crypto/rand"
 	"fmt"
-	"math/rand"
 	"net"
 	"os"
-	"time"
 
 	"github.com/k0kubun/go-ansi"
 )
@@ -43,14 +42,18 @@ func IpRangeIsValid(cidr string) bool {
 
 func RandomString(length int) string {
 	charset := "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + "0123456789"
-	var seededRand *rand.Rand = rand.New(
-		rand.NewSource(time.Now().UnixNano()))
 
-	b := make([]byte, length)
-	for i := range b {
-		b[i] = charset[seededRand.Intn(len(charset))]
+	bytes := make([]byte, length)
+
+	if _, err := rand.Read(bytes); err != nil {
+		panic(err)
+	}
+
+	for i, b := range bytes {
+		bytes[i] = charset[b%byte(len(charset))]
 	}
-	return string(b)
+
+	return string(bytes)
 }
 
 func FileExists(file string) bool {