Merge pull request #39 from Phillezi/37-nil-pointer-dereference-when-…

…trying-to-drop-cache-and-not-logged-in fixed nil dereference on ps command while not having active session
Phillezi · Sep 19, 2024 · 14fda5b · 14fda5b
2 parents b7a927d + c6f9a15
commit 14fda5b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/pkg/v1/auth/client/deployments.go b/pkg/v1/auth/client/deployments.go
@@ -11,7 +11,10 @@ import (
 )
 
 func (c *Client) Deployments() ([]body.DeploymentRead, error) {
-	if c.Session.Resources != nil && c.Session.Resources.Deployments != nil && !c.Session.Resources.Deployments.IsExpired() {
+	if c.Session != nil &&
+		c.Session.Resources != nil &&
+		c.Session.Resources.Deployments != nil &&
+		!c.Session.Resources.Deployments.IsExpired() {
 		return c.Session.Resources.Deployments.Data, nil
 	}
 
@@ -44,7 +47,7 @@ func (c *Client) Deployments() ([]body.DeploymentRead, error) {
 }
 
 func (c *Client) DropDeploymentsCache() {
-	if c.Session.Resources != nil {
-		c.Session.Resources.DropVmsCache()
+	if c.Session != nil && c.Session.Resources != nil {
+		c.Session.Resources.DropDeploymentsCache()
 	}
 }
diff --git a/pkg/v1/auth/client/user.go b/pkg/v1/auth/client/user.go
@@ -11,7 +11,10 @@ import (
 )
 
 func (c *Client) User() (*body.UserRead, error) {
-	if c.Session.Resources != nil && c.Session.Resources.User != nil && !c.Session.Resources.User.IsExpired() {
+	if c.Session != nil &&
+		c.Session.Resources != nil &&
+		c.Session.Resources.User != nil &&
+		!c.Session.Resources.User.IsExpired() {
 		return c.Session.Resources.User.Data, nil
 	}
 
@@ -44,7 +47,7 @@ func (c *Client) User() (*body.UserRead, error) {
 }
 
 func (c *Client) DropUserCache() {
-	if c.Session.Resources != nil {
+	if c.Session != nil && c.Session.Resources != nil {
 		c.Session.Resources.DropUserCache()
 	}
 }
diff --git a/pkg/v1/auth/client/vms.go b/pkg/v1/auth/client/vms.go
@@ -11,7 +11,10 @@ import (
 )
 
 func (c *Client) Vms() ([]body.VmRead, error) {
-	if c.Session.Resources != nil && c.Session.Resources.Vms != nil && !c.Session.Resources.Vms.IsExpired() {
+	if c.Session != nil &&
+		c.Session.Resources != nil &&
+		c.Session.Resources.Vms != nil &&
+		!c.Session.Resources.Vms.IsExpired() {
 		return c.Session.Resources.Vms.Data, nil
 	}
 
@@ -44,7 +47,7 @@ func (c *Client) Vms() ([]body.VmRead, error) {
 }
 
 func (c *Client) DropVmsCache() {
-	if c.Session.Resources != nil {
+	if c.Session != nil && c.Session.Resources != nil {
 		c.Session.Resources.DropVmsCache()
 	}
 }
diff --git a/pkg/v1/auth/resources/resources.go b/pkg/v1/auth/resources/resources.go
@@ -25,13 +25,19 @@ func (r *CachedResource[T]) IsExpired() bool {
 }
 
 func (r *Resources) DropUserCache() {
-	r.User = nil
+	if r.User != nil {
+		r.User = nil
+	}
 }
 
 func (r *Resources) DropDeploymentsCache() {
-	r.Deployments = nil
+	if r.Deployments != nil {
+		r.Deployments = nil
+	}
 }
 
 func (r *Resources) DropVmsCache() {
-	r.Vms = nil
+	if r.Vms != nil {
+		r.Vms = nil
+	}
 }
diff --git a/pkg/v1/commands/ps/ps.go b/pkg/v1/commands/ps/ps.go
@@ -13,6 +13,9 @@ import (
 
 func Ps(all bool) {
 	c := client.Get()
+	if !c.HasValidSession() {
+		logrus.Fatal("no valid session, log in and try again")
+	}
 
 	c.DropDeploymentsCache()
 	depls, err := c.Deployments()