Update for password generation algorithm

Sitecore · Dec 20, 2017 · 399bf45 · 399bf45
1 parent bcdb487
commit 399bf45
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 96 deletions.
diff --git a/Sitecore 8.2.5/xdb/azuredeploy.compat.json b/Sitecore 8.2.5/xdb/azuredeploy.compat.json
@@ -123,7 +123,7 @@
     "prc.core.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prc.core.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('prc.core.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('prc.core.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prccore', parameters('password.salt'))), uniqueString('prccore', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('prccore', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "prc.master.sqldatabase.username": {
       "type": "string",
@@ -133,7 +133,7 @@
     "prc.master.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prc.master.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('prc.master.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('prc.master.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcmaster', parameters('password.salt'))), uniqueString('prcmaster', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('prcmaster', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "prc.web.sqldatabase.username": {
       "type": "string",
@@ -143,7 +143,7 @@
     "prc.web.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prc.web.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('prc.web.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('prc.web.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcweb', parameters('password.salt'))), uniqueString('prcweb', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('prcweb', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "prc.reporting.sqldatabase.username": {
       "type": "string",
@@ -153,7 +153,7 @@
     "prc.reporting.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prc.reporting.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('prc.reporting.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('prc.reporting.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcreporting', parameters('password.salt'))), uniqueString('prcreporting', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('prcreporting', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
 
     "rep.hostingplan.name": {
@@ -176,7 +176,7 @@
     "rep.core.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('rep.core.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('rep.core.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('rep.core.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repcore', parameters('password.salt'))), uniqueString('repcore', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('repcore', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "rep.master.sqldatabase.username": {
       "type": "string",
@@ -186,7 +186,7 @@
     "rep.master.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('rep.master.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('rep.master.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('rep.master.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repmaster', parameters('password.salt'))), uniqueString('repmaster', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('repmaster', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "rep.web.sqldatabase.username": {
       "type": "string",
@@ -196,7 +196,7 @@
     "rep.web.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('rep.web.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('rep.web.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('rep.web.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repweb', parameters('password.salt'))), uniqueString('repweb', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('repweb', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "rep.reporting.sqldatabase.username": {
       "type": "string",
@@ -207,7 +207,7 @@
     "rep.reporting.sqldatabase.password": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('rep.reporting.sqldatabase.username'), parameters('password.salt')), toUpper(uniquestring(parameters('rep.reporting.sqldatabase.username'), parameters('password.salt'), parameters('sqlserver.password'))), uniquestring(parameters('rep.reporting.sqldatabase.username'), parameters('password.salt'), parameters('sitecore.admin.password')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repreporting', parameters('password.salt'))), uniqueString('repreporting', parameters('sqlserver.password'), parameters('password.salt')), toUpper(uniqueString('repreporting', parameters('sitecore.admin.password'), parameters('password.salt'))), '4@')]"
     },
     "rep.authentication.apikey": {
       "type": "securestring",

diff --git a/Sitecore 8.2.5/xdb/azuredeploy.json b/Sitecore 8.2.5/xdb/azuredeploy.json
@@ -152,7 +152,7 @@
     "prcCoreSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prccore', parameters('passwordSalt'))), uniqueString('prccore', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prccore', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcMasterSqlDatabaseUserName": {
       "type": "string",
@@ -162,7 +162,7 @@
     "prcMasterSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcmaster', parameters('passwordSalt'))), uniqueString('prcmaster', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcmaster', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcWebSqlDatabaseUserName": {
       "type": "string",
@@ -172,7 +172,7 @@
     "prcWebSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcweb', parameters('passwordSalt'))), uniqueString('prcweb', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcweb', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcReportingSqlDatabaseUserName": {
       "type": "string",
@@ -182,7 +182,7 @@
     "prcReportingSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcreporting', parameters('passwordSalt'))), uniqueString('prcreporting', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcreporting', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
 
     "repHostingPlanName": {
@@ -205,7 +205,7 @@
     "repCoreSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repcore', parameters('passwordSalt'))), uniqueString('repcore', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repcore', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repMasterSqlDatabaseUserName": {
       "type": "string",
@@ -215,7 +215,7 @@
     "repMasterSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repmaster', parameters('passwordSalt'))), uniqueString('repmaster', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repmaster', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repWebSqlDatabaseUserName": {
       "type": "string",
@@ -225,7 +225,7 @@
     "repWebSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repweb', parameters('passwordSalt'))), uniqueString('repweb', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repweb', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repReportingSqlDatabaseUserName": {
       "type": "string",
@@ -235,7 +235,7 @@
     "repReportingSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repreporting', parameters('passwordSalt'))), uniqueString('repreporting', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repreporting', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repAuthenticationApiKey": {
       "type": "securestring",

diff --git a/Sitecore 8.2.5/xdb/nested/application.json b/Sitecore 8.2.5/xdb/nested/application.json
@@ -116,7 +116,7 @@
     "prcCoreSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prccore', parameters('passwordSalt'))), uniqueString('prccore', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prccore', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcMasterSqlDatabaseUserName": {
       "type": "string",
@@ -126,7 +126,7 @@
     "prcMasterSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcmaster', parameters('passwordSalt'))), uniqueString('prcmaster', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcmaster', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcWebSqlDatabaseUserName": {
       "type": "string",
@@ -136,7 +136,7 @@
     "prcWebSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcweb', parameters('passwordSalt'))), uniqueString('prcweb', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcweb', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "prcReportingSqlDatabaseUserName": {
       "type": "string",
@@ -146,7 +146,7 @@
     "prcReportingSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('prcReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('prcreporting', parameters('passwordSalt'))), uniqueString('prcreporting', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('prcreporting', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
 
     "repWebAppName": {
@@ -165,7 +165,7 @@
     "repCoreSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repCoreSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repcore', parameters('passwordSalt'))), uniqueString('repcore', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repcore', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repMasterSqlDatabaseUserName": {
       "type": "string",
@@ -175,7 +175,7 @@
     "repMasterSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repMasterSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repmaster', parameters('passwordSalt'))), uniqueString('repmaster', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repmaster', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repWebSqlDatabaseUserName": {
       "type": "string",
@@ -185,7 +185,7 @@
     "repWebSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repWebSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repweb', parameters('passwordSalt'))), uniqueString('repweb', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repweb', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repReportingSqlDatabaseUserName": {
       "type": "string",
@@ -195,7 +195,7 @@
     "repReportingSqlDatabasePassword": {
       "type": "securestring",
       "minLength": 8,
-      "defaultValue": "[concat(uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt')), toUpper(uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sqlServerPassword'))), uniquestring(parameters('repReportingSqlDatabaseUserName'), parameters('passwordSalt'), parameters('sitecoreAdminPassword')))]"
+      "defaultValue": "[concat(toUpper(uniqueString('repreporting', parameters('passwordSalt'))), uniqueString('repreporting', parameters('sqlServerPassword'), parameters('passwordSalt')), toUpper(uniqueString('repreporting', parameters('sitecoreAdminPassword'), parameters('passwordSalt'))), '4@')]"
     },
     "repAuthenticationApiKey": {
       "type": "securestring",