Logging migrated to zap.SugaredLogger

hideSensitiveData reimplemented

Author: thejoeker12

jamf/jamfprointegration/auth.go

@@ -44,7 +44,6 @@ func (j *Integration) checkRefreshToken() error {
 
 	if j.auth.tokenExpired() || j.auth.tokenInBuffer() || j.auth.tokenEmpty() {
 		err = j.auth.getNewToken()
-
 		if err != nil {
 			return err
 		}

jamf/jamfprointegration/auth_basic.go

@@ -10,12 +10,14 @@ import (
 )
 
 type basicAuth struct {
+	Sugar *zap.SugaredLogger
+
 	// Set
-	baseDomain   string
-	username     string
-	password     string
-	bufferPeriod time.Duration
-	Sugar        *zap.SugaredLogger
+	baseDomain        string
+	username          string
+	password          string
+	bufferPeriod      time.Duration
+	hideSensitiveData bool
 
 	// Computed
 	// basicToken            string
@@ -50,19 +52,22 @@ func (a *basicAuth) getNewToken() error {
 	client := http.Client{}
 
 	completeBearerEndpoint := a.baseDomain + bearerTokenEndpoint
+	a.Sugar.Debugf("bearer endpoint constructed: %s", completeBearerEndpoint)
+
 	req, err := http.NewRequest("POST", completeBearerEndpoint, nil)
 	if err != nil {
 		return err
 	}
+	a.Sugar.Debugf("bearer token request constructed: %+v", req)
 
 	req.SetBasicAuth(a.username, a.password)
 
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
 	}
-
 	defer resp.Body.Close()
+	a.Sugar.Debugf("bearer token request made: %v", resp.StatusCode)
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("received non-OK response status: %d", resp.StatusCode)
@@ -74,6 +79,10 @@ func (a *basicAuth) getNewToken() error {
 		return err
 	}
 
+	if !a.hideSensitiveData {
+		a.Sugar.Debug("token recieved: %+v", tokenResp)
+	}
+
 	a.bearerToken = tokenResp.Token
 	a.bearerTokenExpiryTime = tokenResp.Expires
 	tokenDuration := time.Until(a.bearerTokenExpiryTime)

jamf/jamfprointegration/auth_oauth.go

@@ -14,12 +14,14 @@ import (
 )
 
 type oauth struct {
+	Sugar *zap.SugaredLogger
+
 	// Set
-	baseDomain   string
-	clientId     string
-	clientSecret string
-	bufferPeriod time.Duration
-	Sugar        *zap.SugaredLogger
+	baseDomain        string
+	clientId          string
+	clientSecret      string
+	bufferPeriod      time.Duration
+	hideSensitiveData bool
 
 	// Computed
 	expiryTime time.Time
@@ -46,11 +48,15 @@ func (a *oauth) getNewToken() error {
 	data.Set("grant_type", "client_credentials")
 
 	oauthComlpeteEndpoint := a.baseDomain + oAuthTokenEndpoint
+	a.Sugar.Debugf("oauth endpoint constructed: %s", oauthComlpeteEndpoint)
+
 	req, err := http.NewRequest("POST", oauthComlpeteEndpoint, strings.NewReader(data.Encode()))
 	if err != nil {
 		return err
 	}
 
+	a.Sugar.Debugf("oauth token request constructed: %+v", req)
+
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 
 	resp, err := client.Do(req)
@@ -77,6 +83,10 @@ func (a *oauth) getNewToken() error {
 		return fmt.Errorf("failed to decode OAuth response: %w", err)
 	}
 
+	if !a.hideSensitiveData {
+		a.Sugar.Debug("token recieved: %+v", oauthResp)
+	}
+
 	if oauthResp.AccessToken == "" {
 		return fmt.Errorf("empty access token received")
 	}
@@ -85,6 +95,7 @@ func (a *oauth) getNewToken() error {
 	a.expiryTime = time.Now().Add(expiresIn)
 	a.token = oauthResp.AccessToken
 
+	a.Sugar.Info("Token obtained successfully", zap.Time("Expiry", a.expiryTime))
 	return nil
 }