fix: Fix cors headers

cgi/auth.pl

@@ -27,6 +27,7 @@
 use ProductOpener::Config qw/:all/;
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Lang qw/:all/;
 
@@ -76,15 +77,8 @@
 
 # The Access-Control-Allow-Origin header must be set to the value of the Origin header
 my $r = Apache2::RequestUtil->request();
-my $origin = $r->headers_in->{Origin} || '';
-
-# Only allow requests from one of our subdomains to see if a user is logged in or not
-
-if ($origin =~ /^https:\/\/[a-z0-9-.]+\.${server_domain}(:\d+)?$/) {
-	$r->err_headers_out->set("Access-Control-Allow-Credentials", "true");
-	$r->err_headers_out->set("Access-Control-Allow-Origin", $origin);
-}
-
+my $allow_credentials = 1;
+write_cors_headers($allow_credentials);
 print header(-status => $status, -type => 'application/json', -charset => 'utf-8');
 
 # 2022-10-11 - The Open Food Facts Flutter app is expecting an empty body

cgi/ingredients.pl

@@ -28,6 +28,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Tags qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Images qw/:all/;
@@ -79,7 +80,8 @@
 
 $log->debug("JSON data output", {data => $data}) if $log->is_debug();
 
-print header (-charset => 'UTF-8', -access_control_allow_origin => '*') . $data;
+write_cors_headers();
+print header (-charset => 'UTF-8') . $data;
 
 exit(0);
 

cgi/nutrients.pl

@@ -27,6 +27,7 @@
 
 use ProductOpener::Lang qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Food qw/:all/;
 use ProductOpener::Tags qw/:all/;
 
@@ -108,10 +109,10 @@
 
 my %result = (nutrients => \@table);
 my $data = encode_json(\%result);
+write_cors_headers();
 print header(
 	-type => 'application/json',
 	-content_language => $lc,
 	-charset => 'utf-8',
-	-access_control_allow_origin => '*',
 	-cache_control => 'public, max-age: 86400'
 ) . $data;

cgi/opensearch.pl

@@ -29,6 +29,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Products qw/:all/;
 use ProductOpener::Food qw/:all/;
@@ -82,9 +83,9 @@
 XML
 	;
 
+write_cors_headers();
 print header(
 	-type => 'application/opensearchdescription+xml',
 	-charset => 'utf-8',
-	-access_control_allow_origin => '*',
 	-cache_control => 'public, max-age: 10080'
 ) . $xml;

cgi/packaging.pl

@@ -28,6 +28,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Tags qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Images qw/:all/;
@@ -79,7 +80,8 @@
 
 $log->debug("JSON data output", {data => $data}) if $log->is_debug();
 
-print header (-charset => 'UTF-8', -access_control_allow_origin => '*') . $data;
+write_cors_headers();
+print header (-charset => 'UTF-8') . $data;
 
 exit(0);
 

cgi/product_image_crop.pl

@@ -28,6 +28,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Tags qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Images qw/:all/;
@@ -128,7 +129,8 @@
 
 $log->debug("JSON data output", {data => $data}) if $log->is_debug();
 
-print header(-type => 'application/json', -charset => 'utf-8', -access_control_allow_origin => '*') . $data;
+write_cors_headers();
+print header(-type => 'application/json', -charset => 'utf-8') . $data;
 
 exit(0);
 

cgi/product_jqm_multilingual.pl

@@ -40,6 +40,7 @@ =head1 DESCRIPTION
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Tags qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Images qw/:all/;
@@ -126,8 +127,8 @@ =head1 DESCRIPTION
 		$response{status_verbose} = 'Edit against edit rules';
 
 		my $data = encode_json(\%response);
-
-		print header(-type => 'application/json', -charset => 'utf-8', -access_control_allow_origin => '*') . $data;
+		write_cors_headers();
+		print header(-type => 'application/json', -charset => 'utf-8') . $data;
 
 		exit(0);
 	}
@@ -228,7 +229,8 @@ =head1 DESCRIPTION
 
 			my $data = encode_json(\%response);
 
-			print header(-type => 'application/json', -charset => 'utf-8', -access_control_allow_origin => '*') . $data;
+			write_cors_headers();
+			print header(-type => 'application/json', -charset => 'utf-8') . $data;
 
 			exit(0);
 		}
@@ -443,7 +445,8 @@ =head1 DESCRIPTION
 
 my $data = encode_json(\%response);
 
-print header(-type => 'application/json', -charset => 'utf-8', -access_control_allow_origin => '*') . $data;
+write_cors_headers();
+print header(-type => 'application/json', -charset => 'utf-8') . $data;
 
 exit(0);
 

cgi/search.pl

@@ -29,6 +29,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Products qw/:all/;
 use ProductOpener::Food qw/:all/;
@@ -805,7 +806,8 @@
 
 			my $data = encode_json(\%response);
 
-			print "Content-Type: application/json; charset=UTF-8\r\nAccess-Control-Allow-Origin: *\r\n\r\n" . $data;
+			write_cors_headers();
+			print "Content-Type: application/json; charset=UTF-8\r\n\r\n" . $data;
 		}
 
 		if (single_param('search_terms')) {

cgi/session.pl

@@ -28,6 +28,7 @@
 use ProductOpener::Store qw/:all/;
 use ProductOpener::Index qw/:all/;
 use ProductOpener::Display qw/:all/;
+use ProductOpener::HTTP qw/:all/;
 use ProductOpener::Users qw/:all/;
 use ProductOpener::Lang qw/:all/;
 
@@ -94,7 +95,8 @@
 	}
 	my $data = encode_json(\%response);
 
-	print header(-type => 'application/json', -charset => 'utf-8', -access_control_allow_origin => '*') . $data;
+	write_cors_headers();
+	print header(-type => 'application/json', -charset => 'utf-8') . $data;
 
 }
 else {

cgi/suggest.pl

@@ -184,10 +184,10 @@ =head3 limit - max number of suggestions
 my $data = encode_json(\@suggestions);
 
 # send response
+write_cors_headers();
 print header(
 	-type => 'application/json',
 	-charset => 'utf-8',
-	-access_control_allow_origin => '*'
 );
 if ($cache_max_age) {
 	print header(-cache_control => 'public, max-age=' . $cache_max_age,);

conf/expires-no-json-xml.include

@@ -0,0 +1 @@
+nginx/expires-no-json-xml.conf

conf/nginx.conf

@@ -14,6 +14,13 @@
 # Default server configuration
 #
 
+# we need to have main domain for CORS (see nginx-cors includes)
+map $host $main_domain {
+    default ...;
+    ~*.*\.(?<host_main_domain>[^.]+\.[^.]+) $host_main_domain;
+}
+
+
 server {
 	listen 80;
 	listen [::]:80;
@@ -31,40 +38,8 @@ server {
 	# Add index.php to the list if you are using PHP
 	index index.html index.htm index.nginx-debian.html;
 
-	# Warning: headers added by add_header are overriden by
-	# other add_header directives at the same level.
-	#location ~* \.(json|csv)$ {
-	#	add_header Access-Control-Allow-Origin *;
-	#}
-
 	location /data/ {
-     if ($request_method = 'OPTIONS') {
-        add_header Access-Control-Allow-Origin *;
-        add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-        #
-        # Custom headers and headers various browsers *should* be OK with but aren't
-        #
-        add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,If-None-Match';
-        #
-        # Tell client that this pre-flight info is valid for 20 days
-        #
-        add_header Access-Control-Max-Age 1728000;
-        add_header Content-Type 'text/plain; charset=utf-8';
-        add_header Content-Length 0;
-        return 204;
-     }
-     if ($request_method = 'POST') {
-        add_header Access-Control-Allow-Origin *;
-        add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-        add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,If-None-Match';
-        add_header Access-Control-Expose-Headers 'Content-Length,Content-Range';
-     }
-     if ($request_method = 'GET') {
-        add_header Access-Control-Allow-Origin *;
-        add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-        add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,If-None-Match';
-        add_header Access-Control-Expose-Headers 'Content-Length,Content-Range';
-     }
+		include conf.d/off.cors-headers.include;
 		# First attempt to serve request as file, then
 		# as directory, then fall back to displaying a 404.
 		try_files $uri $uri/ =404;
@@ -73,33 +48,38 @@ server {
 	# Add index.php to the list if you are using PHP
 	index index.html index.htm index.nginx-debian.html;
 
+	# handling expirations
+	include conf.d/expires-no-json-xml.include;
+
 	location ~ ^/images/products/ {
+		include conf.d/off.cors-headers.include;
 		add_header Link "<https://creativecommons.org/licenses/by-sa/3.0/>; rel='license'; title='CC-BY-SA 3.0'";
-		add_header Access-Control-Allow-Origin *;
-	        add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
-		add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,If-None-Match';
-		add_header Access-Control-Expose-Headers 'Content-Length,Content-Range';
 	}
 
 	# Static files are served directly by NGINX
 
 	location ~ ^/(.well-known|fonts|images|js|css|rss|data|files|resources)/ {
 		# First attempt to serve request as file, then
 		# as directory, then fall back to displaying a 404.
-		add_header Access-Control-Allow-Origin *;
+		#add_header Access-Control-Allow-Origin *;
 		try_files $uri $uri/ =404;
 	}
 
 	location ~ /(favicon\.ico|robots\.txt)$ {
+		include conf.d/off.cors-headers.include;
 		try_files $uri $uri/ =404;
 	}
 
+	# redirects of some locations
+    include conf.d/off.locations-redirects.include;
+
 	# Dynamically generated files and CGI scripts are passed
 	# to the Apache + mod_perl server running on the backend container
 
-        # this is the internal Docker DNS, cache only for 30s
-        resolver 127.0.0.11 valid=30s;
+	# this is the internal Docker DNS, cache only for 30s
+	resolver 127.0.0.11 valid=30s;
 	location ~ /donate\/.*$ {
+		include conf.d/off.cors-headers.include;
 		try_files $uri  =404;
 	}
 	location / {

conf/nginx/expires-no-json-xml.conf

@@ -23,6 +23,7 @@ location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
   expires 10d;
 #  expires 1M;
   access_log off;
+  # FIXME: add_header here may hide CORS headers (and other headers, we should better use map)
   add_header Cache-Control "public";
 }