Release 1.17.39 - See CHANGELOG.md

tiredofit · Oct 23, 2023 · bf9fb23 · bf9fb23
1 parent 53fd6cd
commit bf9fb23
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.17.39 2023-10-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Freescout 1.8.105
+      - Add new APP_X_FRAME_OPTIONS environment variable to support embedding in Iframes
+
+
 ## 1.17.38 2023-10-13 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
 ARG FREESCOUT_VERSION
 
-ENV FREESCOUT_VERSION=${FREESCOUT_VERSION:-"1.8.104"} \
+ENV FREESCOUT_VERSION=${FREESCOUT_VERSION:-"1.8.105"} \
     FREESCOUT_REPO_URL=https://github.com/freescout-helpdesk/freescout \
     NGINX_WEBROOT=/www/html \
     NGINX_SITE_ENABLED=freescout \

diff --git a/README.md b/README.md
@@ -126,6 +126,7 @@ Be sure to view the following repositories to understand all the customizable op
 | `APPLICATION_NAME`         | Change default application name - Default `Freescout`                                           | `freescout` |         |
 | `APP_PROXY`                | Allow Application to use a proxy for fetching modules                                           |             |         |
 | `APP_NEW_FETCHING_LIBRARY` | Sets FreeScout's new_fetching_library config option                                             | `FALSE`     |         |
+| `APP_X_FRAME_OPTIONS`      | Allow to embed via iframes `TRUE` `FALSE` `DENY` `ALLOW FROM example.org`                       | `TRUE`
 | `DB_TYPE`                  | Type of the Database. Currently supported are `mysql` and `pgsql`                               | `mysql`     |         |
 | `DB_PGSQL_SSL_MODE`        | Postgresql TLS Mode                                                                             | `prefer`    |         |
 | `DB_HOST`                  | Host or container name of the Databse Server e.g. `freescout-db`                                |             | x       |

diff --git a/install/assets/defaults/30-freescout b/install/assets/defaults/30-freescout
@@ -1,11 +1,12 @@
 #!/command/with-contenv bash
 
-DB_TYPE=${DB_TYPE:-"mysql"}
-DB_PORT=${DB_PORT:-3306}
-DB_PGSQL_SSL_MODE=${DB_PGSQL_SSL_MODE:-"prefer"}
-APPLICATION_NAME=${APPLICATION_NAME:-"Freescout"}
 ADMIN_FIRST_NAME=${ADMIN_FIRST_NAME:-"Admin"}
 ADMIN_LAST_NAME=${ADMIN_LAST_NAME:-"User"}
+APPLICATION_NAME=${APPLICATION_NAME:-"Freescout"}
+APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY:-"FALSE"}
+APP_X_FRAME_OPTIONS=:-"TRUE"}
+DB_PGSQL_SSL_MODE=${DB_PGSQL_SSL_MODE:-"prefer"}
+DB_PORT=${DB_PORT:-3306}
+DB_TYPE=${DB_TYPE:-"mysql"}
 ENABLE_AUTO_UPDATE=${ENABLE_AUTO_UPDATE:-"TRUE"}
-SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
-APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY:-"FALSE"}
+SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
diff --git a/install/etc/cont-init.d/30-freescout b/install/etc/cont-init.d/30-freescout
@@ -157,6 +157,12 @@ if grep -q "APP_URL" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then
             sed -i --follow-symlinks "s#APP_NEW_FETCHING_LIBRARY=.*#APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY,,}#g" "${NGINX_WEBROOT}"/.env
         fi
 
+        if ! grep -q "APP_X_FRAME_OPTIONS" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then
+            echo "APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS}" | sudo -u "${NGINX_USER}" tee -a "${NGINX_WEBROOT}"/.env
+        else
+            sed -i --follow-symlinks "s#APP_X_FRAME_OPTIONS=.*#APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS}#g" "${NGINX_WEBROOT}"/.env
+        fi
+
     else
         print_info "Skipping Auto configuration and using in place .env"
     fi