Merge branch 'ffsync-update' of https://github.com/mreid-tt/spksrc into ffsync-update

Author: hgy59

spk/ffsync/src/service-setup.sh

@@ -46,7 +46,7 @@ service_postinst ()
     if [ "${SYNOPKG_PKG_STATUS}" = "INSTALL" ]; then
         # login as root sql user using whatever creds you set up for that
         # this sets up a user for sync storage and sets up the databases
-        ${MYSQL} -u root -p ${wizard_mysql_password_root} <<EOF
+        ${MYSQL} -u root -p"${wizard_mysql_password_root}" <<EOF
 CREATE USER "${DBUSER}"@"localhost" IDENTIFIED BY "${wizard_password_ffsync}";
 CREATE DATABASE syncstorage_rs;
 CREATE DATABASE tokenserver_rs;
@@ -63,7 +63,8 @@ EOF
             migration --migration-dir tokenserver-db/migrations run
 
         # Add sync endpoint to database
-        ${MYSQL} -u ${DBUSER} -p "$(wizard_password_ffsync)" <<EOF
+        ${MYSQL} -u ${SPK_NAME} -p"${wizard_password_ffsync}" <<EOF
+        ${MYSQL} -u ${DBUSER} -p"$(wizard_password_ffsync)" <<EOF
 USE tokenserver_rs
 INSERT INTO services (id, service, pattern) VALUES
     (1, "sync-1.5", "{node}/1.5/{uid}");

spk/ffsync/src/wizard/install_uifile.sh

@@ -16,7 +16,7 @@ page_append ()
     fi
 }
 
-getPasswordValidator()
+getRootPasswordValidator()
 {
     validator=$(/bin/cat<<EOF
 {
@@ -28,6 +28,18 @@ EOF
     echo "$validator" | quote_json
 }
 
+getUserPasswordValidator()
+{
+    validator=$(/bin/cat<<EOF
+{
+    var password = arguments[0];
+    return -1 !== password.search("(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[^A-Za-z0-9])(?=.{10,})") && ! password.includes("ffsync");
+}
+EOF
+)
+    echo "$validator" | quote_json
+}
+
 PAGE_FFSYNC_SETUP=$(/bin/cat<<EOF
 {
     "step_title": "Firefox Sync Server 1.5 database configuration",
@@ -38,9 +50,9 @@ PAGE_FFSYNC_SETUP=$(/bin/cat<<EOF
         "subitems": [{
             "key": "wizard_mysql_password_root",
             "desc": "Root password",
-            "invalidText": "Invalid password. Please ensure it has at least one uppercase letter, one lowercase letter, one digit, one special character, a minimum length of 10 characters, and does not contain the word 'root'.",
+            "invalidText": "Password does not meet the current strength rules. The minimum password length is 10 characters and must include mixed case, numeric characters, and special characters; it must also exclude common passwords or using username as password.",
             "validator": {
-                "fn": "$(getPasswordValidator)"
+                "fn": "$(getRootPasswordValidator)"
             }
         }]
     }, {
@@ -49,9 +61,9 @@ PAGE_FFSYNC_SETUP=$(/bin/cat<<EOF
         "subitems": [{
             "key": "wizard_password_ffsync",
             "desc": "ffsync password",
-            "invalidText": "Invalid password. Please ensure it has at least one uppercase letter, one lowercase letter, one digit, one special character, a minimum length of 10 characters, and does not contain the word 'root'.",
+            "invalidText": "Password does not meet the current strength rules. The minimum password length is 10 characters and must include mixed case, numeric characters, and special characters; it must also exclude common passwords or using username as password.",
             "validator": {
-                "fn": "$(getPasswordValidator)"
+                "fn": "$(getUserPasswordValidator)"
             }
         }]
     }]

spk/ffsync/src/wizard/uninstall_uifile.sh

@@ -40,7 +40,7 @@ PAGE_FFSYNC_REMOVE=$(/bin/cat<<EOF
 		"subitems": [{
 			"key": "wizard_mysql_password_root",
 			"desc": "Root password",
-			"invalidText": "Invalid password. Please ensure it has at least one uppercase letter, one lowercase letter, one digit, one special character, a minimum length of 10 characters, and does not contain the word 'root'.",
+			"invalidText": "Password does not meet the current strength rules. The minimum password length is 10 characters and must include mixed case, numeric characters, and special characters; it must also exclude common passwords or using username as password.",
 			"validator": {
 				"fn": "$(getPasswordValidator)"
 			}