From 823e4dd3344c14059d1052ebe081313259aa03a0 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 15:50:59 -0700 Subject: [PATCH 1/7] Fix for no admin cred present. --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/script.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index cfdd2dd..50df248 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index 178ac04..cb6bb68 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -3,6 +3,7 @@ ERR_APT_INSTALL_TIMEOUT=9 # Timeout installing required apt packages ERR_MISSING_CRT_FILE=10 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section ERR_MISSING_KEY_FILE=11 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section +ERR_MISSING_USER_CREDENTIAL=12 # Missing any user credential to connect to server ERR_REGISTRY_NOT_RUNNING=13 # The container registry failed to start successfully ERR_MOBY_APT_LIST_TIMEOUT=25 # Timeout waiting for moby apt sources ERR_MS_GPG_KEY_DOWNLOAD_TIMEOUT=26 # Timeout waiting for MS GPG key download @@ -126,6 +127,12 @@ fetchCredentials() { "${secret}?api-version=2016-10-01" -H "Authorization: Bearer ${TOKEN}" | jq -r .value) htpasswd -Bb .htpasswd ${SECRET_NAME} ${SECRET_VALUE} done + + if [ ! -s .htpasswd ]; then + echo ".htpasswd file is empty." + return 1 + fi + } fetchStorageKeys() { RESOURCE=$(jq -r .authentication.audiences[0] ${ENDPOINTS}) @@ -204,7 +211,7 @@ fetchStorageKeys echo fetching user credentials HTPASSWD_DIR="/root/auth" mkdir -p $HTPASSWD_DIR -fetchCredentials +fetchCredentials || exit $ERR_MISSING_USER_CREDENTIAL cp .htpasswd $HTPASSWD_DIR/.htpasswd echo starting registry container From aa3dcdd12607d43498721ec49a4be4f822739595 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 16:09:15 -0700 Subject: [PATCH 2/7] updating secret creation. --- registry/Scripts/pre-reqs.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/registry/Scripts/pre-reqs.ps1 b/registry/Scripts/pre-reqs.ps1 index 4eb48f1..074f95c 100644 --- a/registry/Scripts/pre-reqs.ps1 +++ b/registry/Scripts/pre-reqs.ps1 @@ -7,6 +7,8 @@ $pfxSecret = "" $pfxPath = "" $pfxPass = "" $spnName = "" +$userName = "" +$userPass = "" # RESOURCE GROUP @@ -68,6 +70,6 @@ $tp = Get-PfxCertificate -FilePath $pfxPath Write-Host "=> Certificate URL:" $kvSecret.Id Write-Host "=> Certificate thumbprint:" $tp.Thumbprint -# Write-Host "Storing secret for sample user: admin" -# $userSecret = ConvertTo-SecureString -String "admin" -AsPlainText -Force -# Set-AzureKeyVaultSecret -VaultName $kvName -Name "admin" -SecretValue $userSecret | out-null +Write-Host "Storing secret for sample user: $userName" +$userSecret = ConvertTo-SecureString -String $userPass -AsPlainText -Force +Set-AzureKeyVaultSecret -VaultName $kvName -Name $userName -SecretValue $userSecret -ContentType login | out-null From 4e2a63afa58c81a3c484d8749d379889c4a4f887 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 17:02:53 -0700 Subject: [PATCH 3/7] incorporated comments. --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/pre-reqs.ps1 | 2 +- registry/Scripts/script.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index 50df248..900e216 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/pre-reqs.ps1 b/registry/Scripts/pre-reqs.ps1 index 074f95c..bcac597 100644 --- a/registry/Scripts/pre-reqs.ps1 +++ b/registry/Scripts/pre-reqs.ps1 @@ -72,4 +72,4 @@ Write-Host "=> Certificate thumbprint:" $tp.Thumbprint Write-Host "Storing secret for sample user: $userName" $userSecret = ConvertTo-SecureString -String $userPass -AsPlainText -Force -Set-AzureKeyVaultSecret -VaultName $kvName -Name $userName -SecretValue $userSecret -ContentType login | out-null +Set-AzureKeyVaultSecret -VaultName $kvName -Name $userName -SecretValue $userSecret -ContentType "user credential" | out-null diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index cb6bb68..fdb3407 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -130,9 +130,8 @@ fetchCredentials() { if [ ! -s .htpasswd ]; then echo ".htpasswd file is empty." - return 1 + return $ERR_MISSING_USER_CREDENTIAL fi - } fetchStorageKeys() { RESOURCE=$(jq -r .authentication.audiences[0] ${ENDPOINTS}) @@ -211,7 +210,7 @@ fetchStorageKeys echo fetching user credentials HTPASSWD_DIR="/root/auth" mkdir -p $HTPASSWD_DIR -fetchCredentials || exit $ERR_MISSING_USER_CREDENTIAL +fetchCredentials cp .htpasswd $HTPASSWD_DIR/.htpasswd echo starting registry container From eed87b78683e58f5f9206fa0ae86ee6ed625f4a3 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 17:24:21 -0700 Subject: [PATCH 4/7] fix names. --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/pre-reqs.ps1 | 2 +- registry/Scripts/script.sh | 4 ++-- registry/manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index 900e216..a0cb5f0 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/pre-reqs.ps1 b/registry/Scripts/pre-reqs.ps1 index bcac597..7897114 100644 --- a/registry/Scripts/pre-reqs.ps1 +++ b/registry/Scripts/pre-reqs.ps1 @@ -72,4 +72,4 @@ Write-Host "=> Certificate thumbprint:" $tp.Thumbprint Write-Host "Storing secret for sample user: $userName" $userSecret = ConvertTo-SecureString -String $userPass -AsPlainText -Force -Set-AzureKeyVaultSecret -VaultName $kvName -Name $userName -SecretValue $userSecret -ContentType "user credential" | out-null +Set-AzureKeyVaultSecret -VaultName $kvName -Name $userName -SecretValue $userSecret -ContentType "user credentials" | out-null diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index fdb3407..b360eac 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -3,7 +3,7 @@ ERR_APT_INSTALL_TIMEOUT=9 # Timeout installing required apt packages ERR_MISSING_CRT_FILE=10 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section ERR_MISSING_KEY_FILE=11 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section -ERR_MISSING_USER_CREDENTIAL=12 # Missing any user credential to connect to server +ERR_MISSING_USER_CREDENTIALS=12 # No user credentials secret found on given key vault ERR_REGISTRY_NOT_RUNNING=13 # The container registry failed to start successfully ERR_MOBY_APT_LIST_TIMEOUT=25 # Timeout waiting for moby apt sources ERR_MS_GPG_KEY_DOWNLOAD_TIMEOUT=26 # Timeout waiting for MS GPG key download @@ -130,7 +130,7 @@ fetchCredentials() { if [ ! -s .htpasswd ]; then echo ".htpasswd file is empty." - return $ERR_MISSING_USER_CREDENTIAL + return $ERR_MISSING_USER_CREDENTIALS fi } fetchStorageKeys() { diff --git a/registry/manifest.json b/registry/manifest.json index e265fa8..4156c0c 100644 --- a/registry/manifest.json +++ b/registry/manifest.json @@ -2,7 +2,7 @@ "$schema": "https://gallery.azure.com/schemas/2015-10-01/manifest.json#", "name": "AzureStackDockerContainerRegistry", "publisher": "Microsoft", - "version": "0.1.3", + "version": "0.1.4", "displayName": "ms-resource:displayName", "publisherDisplayName": "ms-resource:publisherDisplayName", "publisherLegalName": "ms-resource:publisherDisplayName", From 4560fee0dfcbe5e8e9639f1af320971a893bb480 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 17:26:00 -0700 Subject: [PATCH 5/7] fix names. --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index a0cb5f0..7fb856f 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index b360eac..bfe5578 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -3,7 +3,7 @@ ERR_APT_INSTALL_TIMEOUT=9 # Timeout installing required apt packages ERR_MISSING_CRT_FILE=10 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section ERR_MISSING_KEY_FILE=11 # Bad cert thumbprint OR pfx not in key vault OR template misconfigured VM secrets section -ERR_MISSING_USER_CREDENTIALS=12 # No user credentials secret found on given key vault +ERR_MISSING_USER_CREDENTIALS=12 # No user credentials secret found on given key vault ERR_REGISTRY_NOT_RUNNING=13 # The container registry failed to start successfully ERR_MOBY_APT_LIST_TIMEOUT=25 # Timeout waiting for moby apt sources ERR_MS_GPG_KEY_DOWNLOAD_TIMEOUT=26 # Timeout waiting for MS GPG key download From e18cf8b41e3f3cf7a7206df8e57daf927046537c Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 17:52:49 -0700 Subject: [PATCH 6/7] Add exception after the return function --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/script.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index 7fb856f..e58263c 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index bfe5578..0710b17 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -130,7 +130,7 @@ fetchCredentials() { if [ ! -s .htpasswd ]; then echo ".htpasswd file is empty." - return $ERR_MISSING_USER_CREDENTIALS + return 1 fi } fetchStorageKeys() { @@ -210,7 +210,7 @@ fetchStorageKeys echo fetching user credentials HTPASSWD_DIR="/root/auth" mkdir -p $HTPASSWD_DIR -fetchCredentials +fetchCredentials || exit $ERR_MISSING_USER_CREDENTIALS cp .htpasswd $HTPASSWD_DIR/.htpasswd echo starting registry container From 0b1e01982b2e0f00d2192104750e92028742de23 Mon Sep 17 00:00:00 2001 From: Rohit Jaini Date: Wed, 11 Sep 2019 18:12:39 -0700 Subject: [PATCH 7/7] fix to return proper error. --- registry/DeploymentTemplates/azuredeploy.json | 2 +- registry/Scripts/script.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/registry/DeploymentTemplates/azuredeploy.json b/registry/DeploymentTemplates/azuredeploy.json index e58263c..9b7f299 100644 --- a/registry/DeploymentTemplates/azuredeploy.json +++ b/registry/DeploymentTemplates/azuredeploy.json @@ -147,7 +147,7 @@ "osProfile": { "computerName": "[concat(variables('rgname'),'-vm')]", "adminUsername": "[parameters('adminUsername')]", - "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", + "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n- path: \"/opt/azure/registry/script.sh\"\n permissions: \"0744\"\n encoding: gzip\n owner: \"root\"\n content: !!binary |\n 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'))]", "linuxConfiguration": { "disablePasswordAuthentication": true, "ssh": { diff --git a/registry/Scripts/script.sh b/registry/Scripts/script.sh index 0710b17..6a9bebc 100644 --- a/registry/Scripts/script.sh +++ b/registry/Scripts/script.sh @@ -130,7 +130,7 @@ fetchCredentials() { if [ ! -s .htpasswd ]; then echo ".htpasswd file is empty." - return 1 + return $ERR_MISSING_USER_CREDENTIALS fi } fetchStorageKeys() { @@ -210,7 +210,12 @@ fetchStorageKeys echo fetching user credentials HTPASSWD_DIR="/root/auth" mkdir -p $HTPASSWD_DIR -fetchCredentials || exit $ERR_MISSING_USER_CREDENTIALS +fetchCredentials +returnCode=$? +if [[ $returnCode != 0 ]]; then + exit $returnCode +fi + cp .htpasswd $HTPASSWD_DIR/.htpasswd echo starting registry container