Set CORS headers for both http/https in SSVM apache config

Author: salfers

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -1204,10 +1204,6 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
             logger.debug(String.format("Boot args for machine profile [%s]: [%s].", profile.toString(), bootArgs));
         }
 
-        boolean useHttpsToUpload = BooleanUtils.toBooleanDefaultIfNull(VolumeApiService.UseHttpsToUpload.value(), true);
-        logger.debug(String.format("Setting UseHttpsToUpload config on cmdline with [%s] value.", useHttpsToUpload));
-        buf.append(" useHttpsToUpload=").append(useHttpsToUpload);
-
         addSecondaryStorageServerAddressToBuffer(buf, secStores, vmName);
 
         return true;

systemvm/debian/etc/apache2/vhost.template

@@ -39,8 +39,8 @@
         Allow from 127.0.0.0/255.0.0.0 ::1/128
     </Directory>
 
-    # Include HTTP configuration **IF SET**
-    IncludeOptional /etc/apache2/http.conf
+	# Include CORS configuration **IF SET**
+	IncludeOptional /etc/apache2/cors.conf
 
 </VirtualHost>
 
@@ -86,8 +86,8 @@
 		Allow from 127.0.0.0/255.0.0.0 ::1/128
 	</Directory>
 
-	# Include HTTPS configuration **IF SET**
-	IncludeOptional /etc/apache2/https.conf
+	# Include CORS configuration **IF SET**
+	IncludeOptional /etc/apache2/cors.conf
 
 	#   SSL Engine Switch:
 	#   Enable/Disable SSL for this virtual host.

systemvm/debian/opt/cloud/bin/setup/common.sh

@@ -918,9 +918,6 @@ parse_cmd_line() {
         privateMtu)
           export PRIVATEMTU=$VALUE
           ;;
-        useHttpsToUpload)
-          export USEHTTPS=$VALUE
-          ;;
         vncport)
           export VNCPORT=$VALUE
           ;;

systemvm/debian/opt/cloud/bin/setup/secstorage.sh

@@ -50,33 +50,14 @@ setup_secstorage() {
   a2enmod proxy_http
   a2enmod headers
 
-  if [ -z $USEHTTPS ] | $USEHTTPS ; then
-    if [ -f /etc/apache2/http.conf ]; then
-      rm -rf /etc/apache2/http.conf
-    fi
-      cat >/etc/apache2/https.conf <<HTTPS
+  cat >/etc/apache2/cors.conf <<CORS
 RewriteEngine On
-RewriteCond %{HTTPS} =on
 RewriteCond %{REQUEST_METHOD} =POST
 RewriteRule ^/upload/(.*) http://127.0.0.1:8210/upload?uuid=\$1 [P,L]
 Header always set Access-Control-Allow-Origin "*"
 Header always set Access-Control-Allow-Methods "POST, OPTIONS"
 Header always set Access-Control-Allow-Headers "x-requested-with, content-type, origin, authorization, accept, client-security-token, x-signature, x-metadata, x-expires"
-HTTPS
-  else
-    if [ -f /etc/apache2/https.conf ]; then
-      rm -rf /etc/apache2/https.conf
-    fi
-      cat >/etc/apache2/http.conf <<HTTP
-RewriteEngine On
-RewriteCond %{REQUEST_METHOD} =POST
-RewriteRule ^/upload/(.*) http://127.0.0.1:8210/upload?uuid=\$1 [P,L]
-Header always set Access-Control-Allow-Origin "*"
-Header always set Access-Control-Allow-Methods "POST, OPTIONS"
-Header always set Access-Control-Allow-Headers "x-requested-with, content-type, origin, authorization, accept, client-security-token, x-signature, x-metadata, x-expires"
-HTTP
-  fi
-
+CORS
 
   disable_rpfilter
   enable_fwding 0