Fix SSS updates in optional mode

cla-backend-go/v2/sign/service.go

@@ -3074,13 +3074,15 @@ func (s *service) checkCompanyCompliance(ctx context.Context, company *v1Models.
 	}
 	log.WithFields(f).Infof("SSS GetOrganizationStatus result for company %s: status=%q (domain=%s, mode=%s)", company.CompanyID, result.Status, req.Domain, sssMode)
 
-	sanctioned := result.Status == sss.StatusFlagged
-
-	// In required mode, only an explicit "clean" is acceptable — any other status blocks.
-	if s.sssRequired && result.Status != sss.StatusClean && result.Status != sss.StatusFlagged {
-		return false, fmt.Errorf("checkCompanyCompliance: unexpected SSS status %q for company %s (required mode blocks on ambiguous results)", result.Status, company.CompanyID)
+	// Only an explicit clean/flagged is actionable. Any other status is ambiguous: block
+	// when required; otherwise honor the persisted sanction state without clearing or
+	// caching (never auto-clear an SSS-origin block on an unknown status).
+	if result.Status != sss.StatusClean && result.Status != sss.StatusFlagged {
+		return s.complianceUnavailable(f, company, fmt.Errorf("checkCompanyCompliance: unexpected SSS status %q for company %s", result.Status, company.CompanyID))
 	}
 
+	sanctioned := result.Status == sss.StatusFlagged
+
 	// Persist result and reflect it on the in-memory model so downstream gates in this
 	// same request (e.g. ProcessEmployeeSignature) see the just-updated state instead of
 	// the stale value loaded before this check ran.

cla-backend-go/v2/sign/service_sss_test.go

@@ -5,6 +5,7 @@ package sign
 
 import (
 	"context"
+	"errors"
 	"sync"
 	"testing"
 	"time"
@@ -82,6 +83,42 @@ func newTestSSSClient(t *testing.T) *sss.Client {
 	return client
 }
 
+// checkCompanyCompliance routes an unexpected (non-clean/non-flagged) SSS status through
+// complianceUnavailable; these cover its decision so an ambiguous status never auto-clears
+// or caches a sanction.
+func TestComplianceUnavailableRequiredBlocks(t *testing.T) {
+	svc := &service{sssRequired: true}
+	blocked, err := svc.complianceUnavailable(logrus.Fields{}, &models.Company{CompanyID: "company-id"}, errors.New(`unexpected SSS status "weird"`))
+	if err == nil {
+		t.Fatal("expected required mode to block (error) on an ambiguous result")
+	}
+	if blocked {
+		t.Fatal("expected blocked=false alongside the error in required mode")
+	}
+}
+
+func TestComplianceUnavailableOptionalAllowsUnsanctioned(t *testing.T) {
+	svc := &service{sssRequired: false}
+	blocked, err := svc.complianceUnavailable(logrus.Fields{}, &models.Company{CompanyID: "company-id", IsSanctioned: false}, errors.New(`unexpected SSS status "weird"`))
+	if err != nil {
+		t.Fatalf("optional mode should not error on an ambiguous result, got %v", err)
+	}
+	if blocked {
+		t.Fatal("optional mode with no persisted sanction should allow")
+	}
+}
+
+func TestComplianceUnavailableOptionalHonorsPersistedSanction(t *testing.T) {
+	svc := &service{sssRequired: false}
+	blocked, err := svc.complianceUnavailable(logrus.Fields{}, &models.Company{CompanyID: "company-id", IsSanctioned: true, SanctionOrigin: "sss"}, errors.New(`unexpected SSS status "weird"`))
+	if err != nil {
+		t.Fatalf("optional mode should not error on an ambiguous result, got %v", err)
+	}
+	if !blocked {
+		t.Fatal("optional mode must keep blocking a persisted sanction (no auto-clear) on an ambiguous result")
+	}
+}
+
 func TestCheckCompanyComplianceRequiredBlocksMissingExternalID(t *testing.T) {
 	svc := &service{sssRequired: true, sssClient: newTestSSSClient(t)}
 

cla-backend-legacy/internal/api/handlers.go

@@ -8997,13 +8997,19 @@ func (h *Handlers) checkCompanyCompliance(ctx context.Context, company map[strin
 	}
 	logging.Infof("SSS GetOrganizationStatus result for company %s: status=%q (domain=%s, mode=%s)", companyID, result.Status, req.Domain, sssMode)
 
-	sanctioned := result.Status == sss.StatusFlagged
-
-	// In required mode, only an explicit "clean" is acceptable — any other status blocks.
-	if h.sssRequired && result.Status != sss.StatusClean && result.Status != sss.StatusFlagged {
-		return false, fmt.Errorf("checkCompanyCompliance: unexpected SSS status %q for company %s (required mode blocks on ambiguous results)", result.Status, companyID)
+	// Only an explicit clean/flagged is actionable. Any other status is ambiguous: block
+	// when required; otherwise honor the persisted sanction state without clearing (never
+	// auto-clear an SSS-origin block on an unknown status).
+	if result.Status != sss.StatusClean && result.Status != sss.StatusFlagged {
+		if h.sssRequired {
+			return false, fmt.Errorf("checkCompanyCompliance: unexpected SSS status %q for company %s", result.Status, companyID)
+		}
+		logging.Warnf("unexpected SSS status %q for company %s; SSS is not required, honoring persisted sanction state", result.Status, companyID)
+		return isSanctioned, nil
 	}
 
+	sanctioned := result.Status == sss.StatusFlagged
+
 	// Persist result: set origin="sss" on flagged; conditionally clear on clean (only if sss-origin).
 	if sanctioned {
 		logging.Warnf("SSS returned flagged status for company %s, persisting sanction with origin=sss", companyID)