diff --git a/bitnami/mastodon/4.5/debian-12/Dockerfile b/bitnami/mastodon/4.5/debian-12/Dockerfile index 14df198bfc78..b45e2e40ff17 100644 --- a/bitnami/mastodon/4.5/debian-12/Dockerfile +++ b/bitnami/mastodon/4.5/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-03T14:21:59Z" \ + org.opencontainers.image.created="2026-06-09T09:30:04Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mastodon/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mastodon" \ @@ -29,7 +29,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "node-22.22.3-0-linux-${OS_ARCH}-debian-12" \ - "python-3.14.5-2-linux-${OS_ARCH}-debian-12" \ + "python-3.14.5-3-linux-${OS_ARCH}-debian-12" \ "postgresql-client-18.4.0-0-linux-${OS_ARCH}-debian-12" \ "wait-for-port-1.0.10-11-linux-${OS_ARCH}-debian-12" \ "redis-client-8.8.0-0-linux-${OS_ARCH}-debian-12" \ @@ -54,7 +54,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/mastodon/postunpack.sh ENV APP_VERSION="4.5.11" \ BITNAMI_APP_NAME="mastodon" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ LD_LIBRARY_PATH="/opt/bitnami/common/lib:/opt/bitnami/postgresql/lib" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/node/bin:/opt/bitnami/python/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/redis/bin:/opt/bitnami/ruby/bin:/opt/bitnami/mastodon/bin:$PATH" diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 5a6ff85bb43e..000000000000 --- a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -873f755a79e805bb950da235f991af2edbe89c23dad4b13cd33b089e4f1b7ff6 python-3.14.5-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 6c3f3de285fd..000000000000 --- a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -be023b204af7213748a2bae639e1eec89ce42238b376d68d6262ad364f49c1d3 python-3.14.5-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..48a3c62a836c --- /dev/null +++ b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d9e352c2f6591c7d95c29056710d9dc76298884fbf9c807bcee738fd304a11f0 python-3.14.5-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..c217f6845948 --- /dev/null +++ b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-3-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d00d2709bfb3464eb9bfc7647c59a4a42f589c0472436ffa2e8dd3df01238d05 python-3.14.5-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/mastodon/4.5/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +} diff --git a/bitnami/mastodon/4.5/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh b/bitnami/mastodon/4.5/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh index 59478fdc28f2..7c2b557c208a 100644 --- a/bitnami/mastodon/4.5/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh +++ b/bitnami/mastodon/4.5/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh @@ -141,6 +141,9 @@ mastodon_validate() { check_valid_port "MASTODON_REDIS_PORT_NUMBER" check_true_false "MASTODON_ALLOW_ALL_DOMAINS" + if is_boolean_yes "$MASTODON_ALLOW_ALL_DOMAINS"; then + warn "MASTODON_ALLOW_ALL_DOMAINS is set to true which opens up vulnerability to password-reset poisoning attacks. This is not recommended for production environments." + fi return "$error_code" } @@ -254,7 +257,7 @@ mastodon_ensure_admin_user_exists() { # encrypted_password field set and then we proceed to reset the password # https://github.com/mastodon/mastodon/blob/main/app/models/user.rb#L374 mastodon_console_execute <