feat(): add token authentication

pull/43/head
Magicalex 2018-12-26 18:26:51 +01:00
parent 7ffd8fe563
commit 0afc7db182
No known key found for this signature in database
GPG Key ID: A89B48B1788C3CB5
2 changed files with 45 additions and 13 deletions

View File

@ -255,4 +255,24 @@ my_private_repo|{"type":"path","url":"extensions/*/"}
my_public_repo|{"type":"vcs","url":"https://github.com/my/repo"} my_public_repo|{"type":"vcs","url":"https://github.com/my/repo"}
``` ```
Example for a private repository in github
Add this in `/mnt/docker/flarum/extensions/composer.repositories.txt`
```
username|{"type":"vcs","url":"https://github.com/username/my-private-repo"}
```
Create a token in github with full control of privates repository
https://github.com/settings/tokens
Add your token in the file `/mnt/docker/flarum/extensions/auth.token.txt` replace <TOKEN> by your token
```
github|<TOKEN>
```
Add your repo in the list file `/mnt/docker/flarum/extensions/list`
```
username/my-private-repo:0.1.0
```
https://getcomposer.org/doc/03-cli.md#modifying-repositories https://getcomposer.org/doc/03-cli.md#modifying-repositories

View File

@ -10,26 +10,26 @@ DEBUG=${DEBUG:-false}
LOG_TO_STDOUT=${LOG_TO_STDOUT:-false} LOG_TO_STDOUT=${LOG_TO_STDOUT:-false}
# Required env variables # Required env variables
if [ -z "$DB_PASS" ]; then if [ -z "${DB_PASS}" ]; then
echo "[ERROR] Mariadb database password must be set !" echo "[ERROR] Mariadb database password must be set !"
exit 1 exit 1
fi fi
if [ -z "$FORUM_URL" ]; then if [ -z "${FORUM_URL}" ]; then
echo "[ERROR] Forum url must be set !" echo "[ERROR] Forum url must be set !"
exit 1 exit 1
fi fi
# Set file config for nginx and php # Set file config for nginx and php
sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/php7/php-fpm.conf sed -i "s/<UPLOAD_MAX_SIZE>/${UPLOAD_MAX_SIZE}/g" /etc/nginx/nginx.conf /etc/php7/php-fpm.conf
sed -i "s/<PHP_MEMORY_LIMIT>/$PHP_MEMORY_LIMIT/g" /etc/php7/php-fpm.conf sed -i "s/<PHP_MEMORY_LIMIT>/${PHP_MEMORY_LIMIT}/g" /etc/php7/php-fpm.conf
sed -i "s/<OPCACHE_MEMORY_LIMIT>/$OPCACHE_MEMORY_LIMIT/g" /etc/php7/conf.d/00_opcache.ini sed -i "s/<OPCACHE_MEMORY_LIMIT>/${OPCACHE_MEMORY_LIMIT}/g" /etc/php7/conf.d/00_opcache.ini
# Set permissions # Set permissions
chown -R $UID:$GID /services /var/log /var/lib/nginx chown -R $UID:$GID /services /var/log /var/lib/nginx
# Set log output to STDOUT if wanted (LOG_TO_STDOUT=true) # Set log output to STDOUT if wanted (LOG_TO_STDOUT=true)
if [ "$LOG_TO_STDOUT" = true ]; then if [ "${LOG_TO_STDOUT}" = true ]; then
echo "[INFO] Logging to stdout activated" echo "[INFO] Logging to stdout activated"
chmod o+w /dev/stdout chmod o+w /dev/stdout
sed -i "s/.*error_log.*$/error_log \/dev\/stdout warn;/" /etc/nginx/nginx.conf sed -i "s/.*error_log.*$/error_log \/dev\/stdout warn;/" /etc/nginx/nginx.conf
@ -38,13 +38,25 @@ fi
cd /flarum/app cd /flarum/app
# add token authentication (eg. for privates extensions)
if [ -f '/flarum/app/extensions/composer.repositories.txt' ]; then
while read line; do
site=$(echo $line | cut -d '|' -f1)
token=$(echo $line | cut -d '|' -f2)
if [$site = 'github']; then
echo "[INFO] Adding ${site} token authentication"
su-exec $UID:$GID composer config github-oauth.github.com $token
fi
done < /flarum/app/extensions/auth.token.txt
fi
# Custom repositories (eg. for privates extensions) # Custom repositories (eg. for privates extensions)
if [ -f '/flarum/app/extensions/composer.repositories.txt' ]; then if [ -f '/flarum/app/extensions/composer.repositories.txt' ]; then
while read line; do while read line; do
repository=$(echo $line | cut -d '|' -f1) repository=$(echo $line | cut -d '|' -f1)
json=$(echo $line | cut -d '|' -f2) json=$(echo $line | cut -d '|' -f2)
echo "[INFO] Adding ${repository} composer repository" echo "[INFO] Adding ${repository} composer repository"
composer config repositories.${repository} "${json}" su-exec $UID:$GID composer config repositories.$repository "${json}"
done < /flarum/app/extensions/composer.repositories.txt done < /flarum/app/extensions/composer.repositories.txt
fi fi
@ -76,13 +88,13 @@ if [ -e '/flarum/app/public/assets/installed.txt' ]; then
LIST_FILE=/flarum/app/extensions/list LIST_FILE=/flarum/app/extensions/list
# Download extra extensions installed with composer wrapup script # Download extra extensions installed with composer wrapup script
if [ -s "$LIST_FILE" ]; then if [ -s "${LIST_FILE}" ]; then
echo "[INFO] Install extra bundled extensions" echo "[INFO] Install extra bundled extensions"
while read line; do while read line; do
extension="$extension $line" extension="${extension} ${line}"
done < /flarum/app/extensions/list done < /flarum/app/extensions/list
command="composer require $extension" command="composer require ${extension}"
COMPOSER_CACHE_DIR="$CACHE_DIR" su-exec $UID:$GID $command COMPOSER_CACHE_DIR="${CACHE_DIR}" su-exec $UID:$GID $command
echo "[INFO] Install extra bundled extensions: DONE." echo "[INFO] Install extra bundled extensions: DONE."
else else
echo "[INFO] No installed extensions" echo "[INFO] No installed extensions"
@ -93,7 +105,7 @@ else
echo "[INFO] First launch, installation..." echo "[INFO] First launch, installation..."
rm -rf /flarum/app/config.php rm -rf /flarum/app/config.php
if [ -z "$FLARUM_ADMIN_USER" ] || [ -z "$FLARUM_ADMIN_PASS" ] || [ -z "$FLARUM_ADMIN_MAIL" ]; then if [ -z "${FLARUM_ADMIN_USER}" ] || [ -z "${FLARUM_ADMIN_PASS}" ] || [ -z "${FLARUM_ADMIN_MAIL}" ]; then
echo "[ERROR] User admin info of flarum must be set !" echo "[ERROR] User admin info of flarum must be set !"
exit 1 exit 1
fi fi
@ -112,7 +124,7 @@ else
-e "s|<FLARUM_TITLE>|${FLARUM_TITLE}|g" /flarum/app/config.yml -e "s|<FLARUM_TITLE>|${FLARUM_TITLE}|g" /flarum/app/config.yml
# Install flarum # Install flarum
php /flarum/app/flarum install --file=/flarum/app/config.yml su-exec $UID:$GID php /flarum/app/flarum install --file=/flarum/app/config.yml
echo "[INFO] End of flarum installation" echo "[INFO] End of flarum installation"
echo "Done" > /flarum/app/public/assets/installed.txt echo "Done" > /flarum/app/public/assets/installed.txt