Merge pull request #22 from Rabbit-Company/dev

v8.0.2

.env.example

@@ -72,10 +72,10 @@ BACKUP_LOCATION=
 # Provide SMTP credentials
 MAIL_ENABLED=false
 MAIL_HOST=
-MAIL_PORT=
+MAIL_PORT=465
 MAIL_USERNAME=
 MAIL_PASSWORD=
-MAIL_USE_TLS=
+MAIL_USE_TLS=true
 
 #
 # ACCOUNT SETTINGS

api/composer.json

@@ -2,6 +2,6 @@
 	"require": {
 		"paragonie/constant_time_encoding": "^2",
 		"pragmarx/google2fa": "v8.0.1",
-		"phpmailer/phpmailer": "^6.6"
+		"phpmailer/phpmailer": "^6.7"
 	}
 }

api/src/Database.php

@@ -948,7 +948,7 @@ public static function forgotUsername(string $email) : string{
 				$mail->SMTPAuth = true;
 				$mail->Username = Settings::getMailUsername();
 				$mail->Password = Settings::getMailPassword();
-				$mail->SMTPSecure = (Settings::getMailTLS()) ? PHPMailer::ENCRYPTION_STARTTLS : PHPMailer::ENCRYPTION_SMTPS;
+				$mail->SMTPSecure = (Settings::getMailTLS()) ? PHPMailer::ENCRYPTION_SMTPS : PHPMailer::ENCRYPTION_STARTTLS;
 				$mail->Port = Settings::getMailPort();
 
 				$mail->setFrom(Settings::getMailUsername(), 'Passky');

api/src/Settings.php

@@ -9,7 +9,7 @@ class Settings{
 */
 
 	public static function getVersion() : string{
-		return '8.0.1';
+		return '8.0.2';
 	}
 
 	public static function getLocation() : string{
@@ -135,7 +135,7 @@ public static function getMailHost() : string{
 	}
 
 	public static function getMailPort() : int{
-		return getenv('MAIL_PORT', true) ?: getenv('MAIL_PORT') ?: 587;
+		return getenv('MAIL_PORT', true) ?: getenv('MAIL_PORT') ?: 465;
 	}
 
 	public static function getMailUsername() : string{

api/src/website/actions/login.php

@@ -12,6 +12,7 @@
 $result = file_get_contents('https://challenges.cloudflare.com/turnstile/v0/siteverify', false, $context);
 $result = json_decode($result, true);
 
+if(Settings::getCFTSiteKey() === '1x00000000000000000000AA') $result['action'] = 'login';
 if($result['success'] !== true || $result['action'] !== 'login'){
 	header('Location: ../..');
 	exit();

installer.sh

@@ -209,7 +209,7 @@ then
 
 	echo -e "\n${blue}${bold}Provide SMTP port.${blue}"
 	echo -e "Setting up SMTP is not required."
-	echo -e "Example: 587"
+	echo -e "Example: 465"
 	printf "\n${green}SMTP port: "
 	read MAIL_PORT
 	while [[ ! "$MAIL_PORT" =~ ^[0-9]{1,5}$ ]];
@@ -248,10 +248,10 @@ then
 	echo "MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
 else
 	echo "MAIL_HOST=" >> .env
-	echo "MAIL_PORT=" >> .env
+	echo "MAIL_PORT=465" >> .env
 	echo "MAIL_USERNAME=" >> .env
 	echo "MAIL_PASSWORD=" >> .env
-	echo "MAIL_USE_TLS=" >> .env
+	echo "MAIL_USE_TLS=true" >> .env
 fi
 
 echo -e "\n\n${gray}----------------------------------------------------------------------------------------------------------------------------------${none}"

installerGUI.sh

@@ -83,10 +83,10 @@ then
 	MAIL_HOST=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP host.\n\nSetting up SMTP is not required." 12 78 mail.passky.org 3>&1 1>&2 2>&3)
 	echo "MAIL_HOST=${MAIL_HOST}" >> .env
 
-	MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required." 12 78 587 3>&1 1>&2 2>&3)
+	MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required." 12 78 465 3>&1 1>&2 2>&3)
 	while [[ ! "$MAIL_PORT" =~ ^[0-9]{1,5}$ ]];
 	do
-		MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required.\n\n'${MAIL_PORT}' is not a valid port. Port must be a number between 1 and 65535." 14 78 587 3>&1 1>&2 2>&3)
+		MAIL_PORT=$(whiptail --title "Passky Installer - Mail Settings" --inputbox "Provide SMTP port.\n\nSetting up SMTP is not required.\n\n'${MAIL_PORT}' is not a valid port. Port must be a number between 1 and 65535." 14 78 465 3>&1 1>&2 2>&3)
 	done
 	echo "MAIL_PORT=${MAIL_PORT}" >> .env
 
@@ -104,10 +104,10 @@ then
 else
 	echo "MAIL_ENABLED=false" >> .env
 	echo "MAIL_HOST=" >> .env
-	echo "MAIL_PORT=" >> .env
+	echo "MAIL_PORT=465" >> .env
 	echo "MAIL_USERNAME=" >> .env
 	echo "MAIL_PASSWORD=" >> .env
-	echo "MAIL_USE_TLS=" >> .env
+	echo "MAIL_USE_TLS=true" >> .env
 fi
 
 if (whiptail --title "Passky Installer - Mail Settings" --yesno "Do you want backups to be enabled?\n\nBackup perform every day and will export database to external server thru SSH (Using SCP).\n\nIf you don't have any external server ready for backups, leave it disabled." 14 78);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "passky-server",
   "description": "Server for Passky (password manager)",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "tailwind.config.js",
   "scripts": {
     "build": "npx tailwindcss -i ./tailwind.css -o ./api/src/website/css/tailwind.min.css --minify"