Do not apply SOGO_CONTACT for hard SPF failures

Fixes #1983 more completely

data/conf/rspamd/local.d/composites.conf

@@ -14,5 +14,5 @@ SOGO_CONTACT_EXCLUDE_FWD_HOST {
   expression = "WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
 }
 SOGO_CONTACT_SPOOFED {
-  expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL) & ~SOGO_CONTACT";
+  expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT";
 }