Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec51595 authored by Felix's avatar Felix
Browse files

Merge branch 'input_validation' into 'master' 

Input validation & URL encode fix (in signup link creation)

See merge request e/priv/infra/compose!46
parents fea29e2b 62c307c7

deployment/questionnaire/questionnaire.dat

+1 −1
Original line number Diff line number Diff line 
DOMAIN=Enter your mailserver (management) domain (e.g. domainA.com):

ADD_DOMAINS=Enter additional domain(s) (comma separated, no white spaces) to handle mail for (e.g. domainB.com,domainC.com) or just press enter:

ADD_DOMAINS=Optionally enter additional domain(s) (comma separated, no white spaces) to handle mail for (e.g. domainB.com,domainC.com) or just press enter if you need none:

ALT_EMAIL=Enter alternative email:

INSTALL_ONLYOFFICE=Do you want to install OnlyOffice? [y/n]||||^[yY|nN]$;;;;Please enter 'y' or 'n'

scripts/base.sh

+29 −0
Original line number Diff line number Diff line
@@ -35,3 +35,32 @@ SMTP_FROM=$(grep ^SMTP_FROM= "$ENVFILE" | awk -F= '{ print $NF }') 
SMTP_PW=$(grep ^SMTP_PW= "$ENVFILE" | awk -F= '{ print $NF }')



SMTP_HOST=$(grep ^SMTP_HOST= "$ENVFILE" | awk -F= '{ print $NF }')





# the encoding/decoding is taken from here: https://stackoverflow.com/questions/296536/how-to-urlencode-data-for-curl-command/10660730#10660730

urlencode() {

  local string="${1}"

  local strlen=${#string}

  local encoded=""

  local pos c o



  for (( pos=0 ; pos<strlen ; pos++ )); do

     c=${string:$pos:1}

     case "$c" in

        [-_.~a-zA-Z0-9] ) o="${c}" ;;

        * )               printf -v o '%%%02x' "'$c"

     esac

     encoded+="${o}"

  done

  echo "${encoded}"    # You can either set a return variable (FASTER)

}



urldecode() {

  # This is perhaps a risky gambit, but since all escape characters must be

  # encoded, we can replace %NN with \xNN and pass the lot to printf -b, which

  # will decode hex for us



  printf -v REPLY '%b' "${1//%/\\x}" # You can either set a return variable (FASTER)



  echo "${REPLY}"  #+or echo the result (EASIER)... or both... :p

}

scripts/generate-signup-link.sh

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ fi 


AUTH_SECRET=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)

echo "$EMAIL:$AUTH_SECRET" >> /mnt/repo-base/volumes/accounts/auth.file

SIGNUP_URL="https://welcome.$DOMAIN/?authmail=$EMAIL&authsecret=$AUTH_SECRET"

SIGNUP_URL="https://welcome.$DOMAIN/?authmail=$(urlencode "$EMAIL")&authsecret=$AUTH_SECRET"

echo "The new user can sign up now at $SIGNUP_URL"



echo -e "Subject:Signup for $DOMAIN

scripts/init-repo.sh

+50 −10
Original line number Diff line number Diff line 
#!/bin/bash

set -e



function validateDomains {

    INPUT="$1"

    (INPUT=$(echo "$INPUT"| sed 's@;@,@g' | sed 's@ @,@g'); IFS=','; for DOMAIN in $INPUT; do echo "$DOMAIN" | xargs; done) | while read line; do echo "$line"; done | sort -u | while read line; do echo $line | grep -P '(?=^.{4,253}$)(^(?:[a-zA-Z0-9](?:(?:[a-zA-Z0-9\-]){0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$)'; done | tr "\n" "," | sed 's@,$@@g'

}



source <(curl -s https://gitlab.e.foundation/e/infra/bootstrap/raw/master/bootstrap-commons.sh)



cd "/mnt/repo-base/"

ENVFILE="/mnt/repo-base/.env"

rm -f "$ENVFILE"



while true;

do

    rm -f "$ENVFILE"

    # Create .env file

    generateEnvFile deployment/questionnaire/questionnaire.dat deployment/questionnaire/answers.dat "$ENVFILE"



    source /mnt/repo-base/scripts/base.sh

if [ -z "$ADD_DOMAINS" ]; then



    VALIDATED_DOMAIN=$(validateDomains "$DOMAIN")



    echo "$VALIDATED_DOMAIN" | grep -q "," && (echo "Error: You can specify only a single management domain, use the additional domains question for more domains - try again") && continue



    if [ -z "$VALIDATED_DOMAIN" ]; then

        echo "Error : Entering at least the managemnt domain is mandatory - try again"

        continue

    fi



    VALIDATED_ADD_DOMAINS=$(validateDomains "$(echo $ADD_DOMAINS | sed "s@$VALIDATED_DOMAIN@@g")")



    if [ -z "$VALIDATED_ADD_DOMAINS" ]; then

        VALIDATED_ADD_DOMAINS="[N/A]"

    fi



    echo "Your management domain is: $VALIDATED_DOMAIN"

    echo "Your additional domains are: $VALIDATED_ADD_DOMAINS"

    read -r -p "Is this correct? (yes or no) " response   

    if [[ $response =~ ^([yY][eE][sS]|[yY])$ ]]; then

        break

    fi

done



sed -i '/DOMAIN/d' "$ENVFILE"

echo "DOMAIN=$VALIDATED_DOMAIN" >> "$ENVFILE"

if [ "$VALIDATED_ADD_DOMAINS" == "[N/A]" ]; then

    sed -i '/ADD_DOMAINS/d' "$ENVFILE"

    echo "ADD_DOMAINS=$DOMAIN" >> "$ENVFILE"

    source /mnt/repo-base/scripts/base.sh

elif ! echo "$ADD_DOMAINS" | grep -q "$DOMAIN" ; then

    echo "ADD_DOMAINS=$VALIDATED_DOMAIN" >> "$ENVFILE"

elif ! echo "$VALIDATED_ADD_DOMAINS" | grep -q "$VALIDATED_DOMAIN" ; then

    sed -i '/ADD_DOMAINS/d' "$ENVFILE"

    echo "ADD_DOMAINS=$ADD_DOMAINS,$DOMAIN" >> "$ENVFILE"

    source /mnt/repo-base/scripts/base.sh

    echo "ADD_DOMAINS=$VALIDATED_ADD_DOMAINS,$VALIDATED_DOMAIN" >> "$ENVFILE"

fi

source /mnt/repo-base/scripts/base.sh



DC_DIR="templates/docker-compose/"

case $INSTALL_ONLYOFFICE in
@@ -162,4 +193,13 @@ touch /mnt/repo-base/volumes/accounts/auth.file.done 
ACCOUNTS_UID=$(docker-compose exec --user www-data accounts id -u | tr -d '\r')

chown "$ACCOUNTS_UID:$ACCOUNTS_UID" /mnt/repo-base/volumes/accounts/auth.file.done





printf "$(date): Waiting for Nextcloud to finish installation"

# sleep for 300 seconds

for i in {0..300}; do

  sleep 1

  printf "."

done





bash scripts/postinstall.sh