WIP

Author: takara9

redfish/redfish.go

@@ -167,7 +167,6 @@ func (c *redfishClient) newRequest(ctx context.Context, path string) (*http.Requ
 	}
 	req.Header.Set("X-auth-token", c.token)
 	req.Header.Set("Accept", "application/json")
-
 	req = req.WithContext(ctx)
 	return req, nil
 }
@@ -220,8 +219,8 @@ func (c *redfishClient) Login(ctx context.Context) error {
 		return fmt.Errorf("error marshaling JSON: %s", err)
 	}
 
-	url := fmt.Sprintf("%s/%s", c.endpoint, "redfish/v1/SessionService/Sessions")
-	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewBuffer(jsonBody))
+	u := c.endpoint.JoinPath("/redfish/v1/SessionService/Sessions")
+	req, err := http.NewRequestWithContext(ctx, "POST", u.String(), bytes.NewBuffer(jsonBody))
 	if err != nil {
 		return fmt.Errorf("error making NewRequest: %s", err)
 	}
@@ -232,6 +231,9 @@ func (c *redfishClient) Login(ctx context.Context) error {
 		return fmt.Errorf("error accessing rest service: %s", err)
 	}
 	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusCreated {
+		return fmt.Errorf("error response from rest service: %d", resp.StatusCode)
+	}
 
 	byteJSON, err := io.ReadAll(resp.Body)
 	if err != nil {
@@ -249,14 +251,8 @@ func (c *redfishClient) Login(ctx context.Context) error {
 }
 
 func (c *redfishClient) CheckSession(ctx context.Context) error {
-	tr := http.DefaultTransport.(*http.Transport).Clone()
-	tr.TLSClientConfig = &tls.Config{
-		InsecureSkipVerify: true, // For self-signed certificates
-	}
-	c.httpClient = &http.Client{Transport: tr, Timeout: 5 * time.Second}
-
-	url := fmt.Sprintf("%s/%s/%s", c.endpoint, "redfish/v1/SessionService/Sessions", c.sessionId)
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	u := c.endpoint.JoinPath("/redfish/v1/SessionService/Sessions")
+	req, err := http.NewRequestWithContext(ctx, "GET", u.String(), nil)
 	if err != nil {
 		return fmt.Errorf("error making NewRequest: %s", err)
 	}
@@ -267,6 +263,10 @@ func (c *redfishClient) CheckSession(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("error accessing rest service: %s", err)
 	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("error response from rest service: %d", resp.StatusCode)
+	}
 
 	var ses sessionLoginResponse
 	byteJSON, err := io.ReadAll(resp.Body)