Remove exif metadata from images uploaded to gnusocial/postactiv

src/freedombone-app-gnusocial

@@ -359,7 +359,7 @@ function upgrade_gnusocial {
     fi
 
     gnusocial_block_user_script
-    gnusocial_block_domain_script gnusocial
+    gnusocial_block_domain_script gnusocial $GNUSOCIAL_DOMAIN_NAME
 
     gnusocial_hourly_script gnusocial $GNUSOCIAL_DOMAIN_NAME
     upgrade_pleroma "$GNUSOCIAL_DOMAIN_NAME" "gnusocial" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE"
@@ -536,7 +536,7 @@ function install_gnusocial_main {
     repair_databases_script
 
     apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
-    apt-get -yq install php5-memcached php5-intl
+    apt-get -yq install php5-memcached php5-intl exiftool
 
     if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
         mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME
@@ -769,7 +769,7 @@ function install_gnusocial_main {
 
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a gnusocial -p "$GNUSOCIAL_ADMIN_PASSWORD"
     gnusocial_block_user_script
-    gnusocial_block_domain_script gnusocial
+    gnusocial_block_domain_script gnusocial "$GNUSOCIAL_DOMAIN_NAME"
 
     set_completion_param "gnusocial domain" "$GNUSOCIAL_DOMAIN_NAME"
 

src/freedombone-app-postactiv

@@ -362,7 +362,7 @@ function upgrade_postactiv {
     postactiv_running_script
 
     gnusocial_block_user_script
-    gnusocial_block_domain_script postactiv
+    gnusocial_block_domain_script postactiv "$POSTACTIV_DOMAIN_NAME"
 
     upgrade_pleroma "$POSTACTIV_DOMAIN_NAME" "postactiv" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
     postactiv_customise_logo
@@ -534,7 +534,7 @@ function install_postactiv_main {
     repair_databases_script
 
     apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
-    apt-get -yq install php5-memcached php5-intl
+    apt-get -yq install php5-memcached php5-intl exiftool
 
     if [ ! -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
         mkdir /var/www/$POSTACTIV_DOMAIN_NAME
@@ -771,7 +771,7 @@ function install_postactiv_main {
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a postactiv -p "$POSTACTIV_ADMIN_PASSWORD"
 
     gnusocial_block_user_script
-    gnusocial_block_domain_script postactiv
+    gnusocial_block_domain_script postactiv "$POSTACTIV_DOMAIN_NAME"
 
     set_completion_param "postactiv domain" "$POSTACTIV_DOMAIN_NAME"
 

src/freedombone-utils-gnusocialtools

@@ -547,6 +547,18 @@ function gnusocial_block_domain_script {
     echo '        /usr/bin/gnusocial-delete-user "$database_name" "$block" "$GNUSOCIAL_DOMAIN_NAME"' >> /usr/bin/${database_name}-firewall
     echo '    fi' >> /usr/bin/${database_name}-firewall
     echo 'done <$FIREWALL_DOMAINS' >> /usr/bin/${database_name}-firewall
+    echo '' >> /usr/bin/${database_name}-firewall
+    echo '# remove any metadata from images uploaded in the last 2 minutes' >> /usr/bin/${database_name}-firewall
+    echo 'if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs ]; then' >> /usr/bin/${database_name}-firewall
+    echo '    cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs' >> /usr/bin/${database_name}-firewall
+    echo '    declare -a recent_image=$(find file ! -name thumb-* -mmin -2 -type f -exec ls -l {} + | awk -F '"'"'file/'"'"' '"'"'{print $2}'"'"')' >> /usr/bin/${database_name}-firewall
+    echo '    for f in ${recent_image[@]}' >> /usr/bin/${database_name}-firewall
+    echo '    do' >> /usr/bin/${database_name}-firewall
+    echo '        if [ ${#f} -gt 1 ]; then' >> /usr/bin/${database_name}-firewall
+    echo '            exiftool -q -all= "file/${f}"' >> /usr/bin/${database_name}-firewall
+    echo '        fi' >> /usr/bin/${database_name}-firewall
+    echo '    done' >> /usr/bin/${database_name}-firewall
+    echo 'fi' >> /usr/bin/${database_name}-firewall
     chmod +x /usr/bin/${database_name}-firewall
 
     if ! grep -q "${database_name}-firewall" /etc/crontab; then