Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): Add mcrypt extension to fix PrestaShop 1.6 RIJNDAEL required by back-office #13

Merged
merged 5 commits into from
Oct 30, 2023
Merged

fix(build): Add mcrypt extension to fix PrestaShop 1.6 RIJNDAEL required by back-office #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
964bc98
Fix PrestaShop 1.6 RIJNDAEL with mcrypt extension
jokesterfr Oct 30, 2023
55e908b
Still build for PS>1.6
jokesterfr Oct 30, 2023
afa7ee2
Fix
jokesterfr Oct 30, 2023
65210ab
Fix lint
jokesterfr Oct 30, 2023
0b9fdcd
Fix patch
jokesterfr Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions assets/patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,8 @@ patch_1_6 () {
# Add robots file
echo "User-agent: *" > "${PS_FOLDER}/robots.txt"
echo "Disallow: /" >> "${PS_FOLDER}/robots.txt"

# Fix the _RIJNDAEL_KEY_ warnings
sed -i "s/(_RIJNDAEL_KEY_, _RIJNDAEL_IV_)/('_RIJNDAEL_KEY_', '_RIJNDAEL_IV_')/" \
"$PS_FOLDER/classes/Cookie.php"
sed -i "s/MCRYPT_RIJNDAEL_128/'MCRYPT_RIJNDAEL_128'/" \
"$PS_FOLDER/classes/Rijndael.php"
sed -i "s/MCRYPT_MODE_CBC/'MCRYPT_MODE_CBC'/" \
"$PS_FOLDER/classes/Rijndael.php"

# Fix the Rijndael keys length
# shellcheck disable=SC2016
sed -i 's/$this->_key = $key/$this->_key = openssl_random_pseudo_bytes(32)/' \
"$PS_FOLDER/classes/Rijndael.php"
# shellcheck disable=SC2016
sed -i 's/$this->_iv = base64_decode($iv)/$this->_iv = openssl_random_pseudo_bytes(16)/' \
"$PS_FOLDER/classes/Rijndael.php"
}

echo "$PS_VERSION" | grep "^1.6" > /dev/null && patch_1_6 || echo "coucou"
if echo "$PS_VERSION" | grep "^1.6" > /dev/null; then
patch_1_6;
fi
10 changes: 6 additions & 4 deletions docker/alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ RUN apk --no-cache add -U \
bash less vim geoip git tzdata zip curl jq \
nginx nginx-mod-http-headers-more nginx-mod-http-geoip \
nginx-mod-stream nginx-mod-stream-geoip ca-certificates \
libmcrypt gnu-libiconv php-common mariadb-client sudo
gnu-libiconv php-common mariadb-client sudo

# Install PHP requirements
# see: https://olvlvl.com/2019-06-install-php-ext-source
RUN apk --no-cache add -U zlib-dev libjpeg-turbo-dev libpng-dev libzip-dev icu-dev \
&& ([ "7.1" = "$PHP_VERSION" ] && docker-php-ext-configure gd --with-gd --with-jpeg --with-jpeg-dir --with-zlib-dir || docker-php-ext-configure gd --with-jpeg) \
&& docker-php-ext-install gd pdo_mysql zip intl;
RUN apk --no-cache add -U zlib-dev libjpeg-turbo-dev libpng-dev libzip-dev icu-dev libmcrypt-dev \
&& if [ "7.1" = "$PHP_VERSION" ]; then docker-php-ext-configure gd --with-gd --with-jpeg --with-jpeg-dir --with-zlib-dir && docker-php-ext-install gd pdo_mysql zip intl mcrypt; \
else \
docker-php-ext-configure gd --with-jpeg && docker-php-ext-install gd pdo_mysql zip intl; \
fi;

# TODO check opcache configuration
# RUN docker-php-ext-enable opcache
Expand Down
10 changes: 6 additions & 4 deletions docker/debian.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV PS_FOLDER=/var/www/html
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy \
bash less vim git tzdata zip unzip curl jq netcat-traditional ca-certificates \
lsb-release libgnutls30 gnupg libmcrypt4 libiconv-hook1 \
lsb-release libgnutls30 gnupg libiconv-hook1 \
nginx libnginx-mod-http-headers-more-filter libnginx-mod-http-geoip \
libnginx-mod-http-geoip libnginx-mod-stream mariadb-client sudo

Expand All @@ -26,11 +26,13 @@ RUN curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.or
&& echo "deb [trusted=yes] https://packages.sury.org/php/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/php.list \
&& rm /etc/apt/preferences.d/no-debian-php;
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy php-gd libghc-zlib-dev libjpeg-dev libpng-dev libzip-dev libicu-dev \
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy php-gd libghc-zlib-dev libjpeg-dev libpng-dev libzip-dev libicu-dev libmcrypt-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& ([ "7.1" = "$PHP_VERSION" ] && docker-php-ext-configure gd --with-gd --with-jpeg --with-jpeg-dir --with-zlib-dir || docker-php-ext-configure gd --with-jpeg) \
&& docker-php-ext-install gd pdo_mysql zip intl;
&& if [ "7.1" = "$PHP_VERSION" ]; then docker-php-ext-configure gd --with-gd --with-jpeg --with-jpeg-dir --with-zlib-dir && docker-php-ext-install gd pdo_mysql zip intl mcrypt; \
else \
docker-php-ext-configure gd --with-jpeg && docker-php-ext-install gd pdo_mysql zip intl; \
fi;

# Configure php-fpm and nginx
RUN rm -rf /var/log/php* /etc/php*/php-fpm.conf /etc/php*/php-fpm.d \
Expand Down