refact acquisition/appsec: happy path (#4183)

Author: mmetc

pkg/acquisition/modules/appsec/config.go

@@ -293,20 +293,26 @@ func (w *Source) checkAuth(ctx context.Context, apiKey string) error {
 		return nil
 	}
 
-	if now.After(expiration) { // Key is expired, recheck the value OR keep it if we cannot contact LAPI
-		isAuth, err := w.isValidKey(ctx, apiKey)
-		if isAuth {
-			w.AuthCache.Set(apiKey, now.Add(*w.config.AuthCacheDuration))
-		} else if err != nil { // General error when querying LAPI, consider the key still valid
-			w.logger.Errorf("Error checking auth for API key: %s, extending cache duration", err)
-			w.AuthCache.Set(apiKey, now.Add(*w.config.AuthCacheDuration))
-		} else { // Key is not valid, remove it from cache
-			w.AuthCache.Delete(apiKey)
-			return errInvalidAPIKey
-		}
+	if !now.After(expiration) {
+		return nil
 	}
 
-	return nil
+	// Key is expired, recheck the value OR keep it if we cannot contact LAPI
+	isAuth, err := w.isValidKey(ctx, apiKey)
+	if err != nil { // General error when querying LAPI, consider the key still valid
+		w.logger.Errorf("Error checking auth for API key: %s, extending cache duration", err)
+		w.AuthCache.Set(apiKey, now.Add(*w.config.AuthCacheDuration))
+		return nil
+	}
+
+	if isAuth {
+		w.AuthCache.Set(apiKey, now.Add(*w.config.AuthCacheDuration))
+		return nil
+	}
+
+	// Key is not valid, remove it from cache
+	w.AuthCache.Delete(apiKey)
+	return errInvalidAPIKey
 }
 
 // should this be in the runner ?

pkg/acquisition/modules/appsec/rx_operator.go

@@ -39,21 +39,23 @@ func newRX(options plugintypes.OperatorOptions) (plugintypes.Operator, error) {
 }
 
 func (o *rx) Evaluate(tx plugintypes.TransactionState, value string) bool {
-	if tx.Capturing() {
-		match := o.re.FindStringSubmatch(value)
-		if len(match) == 0 {
-			return false
-		}
-		for i, c := range match {
-			if i == 9 {
-				return true
-			}
-			tx.CaptureField(i, c)
+	if !tx.Capturing() {
+		return o.re.MatchString(value)
+	}
+
+	match := o.re.FindStringSubmatch(value)
+	if len(match) == 0 {
+		return false
+	}
+
+	for i, c := range match {
+		if i == 9 {
+			return true
 		}
-		return true
+		tx.CaptureField(i, c)
 	}
 
-	return o.re.MatchString(value)
+	return true
 }
 
 // RegisterRX registers the rx operator using a WASI implementation instead of Go.