Cloudfront Firefox CORS issues

Question

We host our assets on S3 using CloudFront. Unfortunately once the asset is cached on CF, the CORS origin header does not change for any subsequent requests. That is problematic, because Firefox won't load fonts if the CORS origin is not an exact match.

I'm using the "solution" suggested here adjusting the query for each host.

Unfortunately that would require that I provide a different asset set for every possible origin

• http://example.com
• http://www.example.com
• https://example.com
• https://www.example.com
• http://sub.example.com
• etc...

with an adjusted query just for it, since I cannot modify the CSS file in the browser.

So I'm back at square one. Anyone solved this problem yet, preferably without an extra dedicated nginx instance that just rewrites the query based on the origin?