Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 7.2 into master #9590

Merged
merged 13 commits into from
May 29, 2020
8 changes: 7 additions & 1 deletion custom-words.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
AADDS
A128CBCPAD
A192CBCPAD
A256CBCPAD
AADDS
aadiam
AADP
AATP
Expand Down Expand Up @@ -115,6 +118,7 @@ australiaeast
australiasoutheast
authenticatable
Authenticode
authorityURL
authorizationrules
authprovider
authproviders
Expand Down Expand Up @@ -264,6 +268,8 @@ CIDR
CIDRs
CIFS
ciphertext
claimCondition
claimType
clfs
Clickthrough
clientaccesspolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@
"description": "The key vault client performs cryptographic key operations and vault operations against the Key Vault service.",
"version": "7.2-preview"
},
"x-ms-parameterized-host": {
"hostTemplate": "{vaultBaseUrl}",
"useSchemePrefix": false,
"positionInOperation": "first",
"parameters": [
{
"name": "vaultBaseUrl",
"description": "The vault name, for example https://myvault.vault.azure.net.",
"required": true,
"type": "string",
"in": "path",
"x-ms-skip-url-encoding": true
}
]
},
"consumes": [
"application/json"
],
Expand Down Expand Up @@ -193,6 +208,64 @@
}
}
}
},
"/keys/{keyName}/restore": {
"put": {
"tags": [
"Keys"
],
"operationId": "SelectiveKeyRestoreOperation",
"description": "Restores all key versions of a given key using user supplied SAS token pointing to a previously stored Azure Blob storage backup folder",
"parameters": [
{
"name": "keyName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the key to be restored from the user supplied backup"
},
{
"name": "restoreBlobDetails",
"in": "body",
"schema": {
"$ref": "#/definitions/SelectiveKeyRestoreOperationParameters"
},
"description": "The Azure blob SAS token pointing to a folder where the previous successful full backup was stored"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"202": {
"description": "Started selective key restore operation from the previously stored backup",
"headers": {
"Retry-After": {
"description": "The recommended number of seconds to wait before calling the URI specified in Azure-AsyncOperation.",
"type": "integer"
},
"Azure-AsyncOperation": {
"description": "The URI to poll for completion status.",
"type": "string"
}
},
"schema": {
"$ref": "#/definitions/SelectiveKeyRestoreOperation"
}
},
"default": {
"description": "Key Vault error response describing why the operation failed.",
"schema": {
"$ref": "common.json#/definitions/KeyVaultError"
}
}
},
"x-ms-examples": {
"Selectively restore key from a backup": {
"$ref": "./examples/SelectiveRestore-example.json"
}
}
}
}
},
"definitions": {
Expand All @@ -211,6 +284,52 @@
"sasTokenParameters"
]
},
"SelectiveKeyRestoreOperationParameters": {
"properties": {
"sasTokenParameters": {
"$ref": "#/definitions/SASTokenParameter"
},
"folder": {
"type": "string",
"description": "The Folder name of the blob where the previous successful full backup was stored"
}
},
"required": [
"folder",
"sasTokenParameters"
]
},
"SelectiveKeyRestoreOperation": {
"properties": {
"status": {
"type": "string",
"description": "Status of the restore operation."
},
"statusDetails": {
"type": "string",
"description": "The status details of restore operation."
},
"error": {
"$ref": "common.json#/definitions/Error",
"description": "Error encountered, if any, during the selective key restore operation."
},
"jobId": {
"type": "string",
"description": "Identifier for the selective key restore operation."
},
"startTime": {
"type": "integer",
"format": "unixtime",
"description": "The start time of the restore operation"
},
"endTime": {
"type": "integer",
"format": "unixtime",
"description": "The end time of the restore operation"
}
},
"description": "Selective Key Restore operation"
},
"SASTokenParameter": {
"properties": {
"storageResourceUri": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"key-name": "exportable-aes-key",
"api-version": "7.2-preview",
"parameters": {
"env": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdXQXkxNk5ieFJJQ3lCUzVKckJxRk5DdXdjS2YxYUVYbS1hUDVsUlJ4UEUiLCJqa3UiOiJodHRwOi8vbG9jYWxob3N0OjgwMjMva2V5cyJ9.eyJhYXMtZWhkIjoiZXlKclpYbHpJanBiZXlKbElqb2lRVkZCUWlJc0ltdGxlVjl2Y0hNaU9sc2laR1ZqY25sd2RDSXNJbVZ1WTNKNWNIUWlYU3dpYTJsa0lqb2lOVE16TmpReU5HTXRaV1kzWlMxaU1tRm1MVFU1WmprdE5HUXdPRGhtTURRMFpHVTFJaXdpYTNSNUlqb2lVbE5CSWl3aWJpSTZJbkJPYkhoWVNuRTNPSGRPUkVVd2FXMVNOa1JCWWs5alNrRXpUekp1UlZvNVdFaGtjMDVQTjB0b00xWlJRVTh5VWt0eFlqQk9iRXh4TVhwUFRVOTVZVlJPUW5rNWMzUTRjbG95TURWYU1EWTFjalY2YlRKa1FrSllkRkJUU21Sc1VtSm9WRXd0TlRCcWFFVXpiRUV4WjFVemVYcDJaR0o1U1Zob2NtMDNkWEJFVGtKemFXeFNlR1ZVUW1KUGNWOW1XSE5vT1dGMVVHeGxVM0pOWlZCR2JGbElkVmRNTjJacGNYWktiMHMyZUZSSVZFSmZUa2R1WjBWMlFrMTVPRGRxWlVsbExWbEJUbUYxWkRsRk5GYzFhWHBLZFVwNmJGOHhORkJFY1VWdWVGcFNTM0F5YW1WUGJsZEpTRXRVVm0wMWFsRmhiakZoTlVkdmJGWmxRV2szWlhoalNtRXlNaTFLZERSRWEwNHlWakZMTUZCZlR6YzJSME5ETjNCWlVYVlpTWEkxZFZWclExUmtWVVYxYmxKSWIyaFRWbTFHZVZGaldFSlVkVmxuUVdNMVJFZEpaVGQ1UjNSRFdtOW9WRjlsVmxGQ2NESldVU0lzSW5WelpTSTZJbVZ1WXlKOVhYMCIsImlzcyI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODAyMy8iLCJzZ3gtbXJlbmNsYXZlIjoiMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCIsInNneC1tcnNpZ25lciI6Ijg2Nzg4ZmU0MDQ0OGYyYTEyZTIwYmY4ZDVlN2ExYzMxMzliYzVmZGMxNDMyYjM3MGMxZGEzNDg5YWI2NDlhODUiLCJpcy1kZWJ1Z2dhYmxlIjp0cnVlLCJ0ZWUiOiJzZ3giLCJpYXQiOjE1ODc0MjUxNzMsImV4cCI6MTU4ODAyOTk3M30.CA9gO0kRMHt6e9xTKopwEnDt-Mc52oAAe6zicFwX3REZd5E0m3WzJuSYS8H9iKTGL1dfusflPx74C5xLTZiHe0D2YFHYoW3efEm3r55DwkpTbA6tbDjMY7OIC9XuC7prAf4nQ5hYRk0LATzwytYIZ-c-R08ZEt5CV5XqR5MuSDKWWslPm36BHD3l03VVNEEG4hC9KuCIZ2z9YK5ofGze-IY1J9x1EwnG-y_1RF6rDKENjOROOaOH9JvohHGIfK0FKVj8_7E6JxMTQMb7K-45GfE20tTVdCs4A4k3jXNrIRcGmSK5EMrB_LbHzk0PIc6sjl-VuPZVqGxhsaAyoH3cdA"
}
},
"responses": {
"200": {
"body": {
"attributes": {
"created": 1587425174,
"enabled": true,
"exportable": true,
"recoverableDays": 90,
"recoveryLevel": "Recoverable+Purgeable",
"updated": 1587425174
},
"key": {
"key_ops": [
"decrypt",
"encrypt"
],
"kid": "https://myvault.vault.azure.net/keys/exportable-aes-key/903fab0c1bab0b30266200be85f5f2ed",
"kty": "oct",
"key_hsm": "CxX3qVTt22ZvjwdS-fmMSsLpaQQ8IcfGAC2TYWo3FXIPnOrSmZWdWN3gLMNSLUtUOhXqwXCe6jOxH2jMr6suO4Q0mfrKurAB-IC5gbDZGGD9XksrAkyYS-0p4p4I4Q4QxEOCtCKYPYWWu91dg5xg5aYjVRyR5G3C6O0haotp1FL1FiOB1PVcW9HchDIdHMFCszsb33pbvDuYvJXPPqdSIGIT8P8ExVG9_RwYTZl2Kj3MTSbe9zjOEEW-EnA6Phr0EFO0h94dWK0Y2tPhyzGYOSBScJCWIdwD9lT1aaHNFE0rSLJ9wv0qGezR10nD7V7ALZiEscsrAcwrWTtmmCJMAIJpGf0u9rN1_JQiXuO4Q9Cf4b73nSP1kIIAPkZ3r6Fqmrm8F7NeKis"
},
"release_policy": {
"anyOf": [
{
"allOf": [
{
"claim": "sgx-mrsigner",
"condition": "equals",
"value": "86788fe40448f2a12e20bf8d5e7a1c3139bc5fdc1432b370c1da3489ab649a85"
},
{
"claim": "is-debuggable",
"condition": "equals",
"value": "false"
}
],
"authority": "http://localhost:8023/"
}
],
"version": "0.2"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"azureStorageBlobContainerUri": {
"storageResourceUri": "https://myaccount.blob.core.windows.net/sascontainer/sasContainer",
"token": "se=2018-02-01T00%3A00Z&spr=https&sv=2017-04-17&sr=b&sig=XXFNfuMCHYrBx0bhemJ7PWn0xGfImMXT6LfbXWvtRUk%3D"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"jobId": "45aacd568ab049a2803861e8dd3ae21f",
"api-version": "7.2-preview"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"parameters": {
"vaultBaseUrl": "https://myhsm.managedhsm.azure.net",
"restoreBlobDetails": {
"sasTokenParameters": {
"storageResourceUri": "https://myaccount.blob.core.windows.net/sascontainer/sasContainer",
"token": "se=2018-02-01T00%3A00Z&spr=https&sv=2017-04-17&sr=b&sig=XXFNfuMCHYrBx0bhemJ7PWn0xGfImMXT6LfbXWvtRUk%3D"
},
"folderToRestore": "1490790332"
"folderToRestore": "mhsm-mypool-20200303062926785"
},
"api-version": "7.2-preview"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net/",
"jobId": "45aacd568ab049a2803861e8dd3ae21f",
"api-version": "7.2-preview"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parameters": {
"vaultBaseUrl": "https://myvault.vault.azure.net",
"keyName": "hsm-mail-key",
"restoreBlobDetails": {
"sasTokenParameters": {
"storageResourceUri": "https://myaccount.blob.core.windows.net/sascontainer/sasContainer",
"token": "se=2018-02-01T00%3A00Z&spr=https&sv=2017-04-17&sr=b&sig=XXFNfuMCH112BxhemJ7PWn0xGfImMXT6LfbXWvtRUk%3D"
},
"folder": "mhsm-mypool-20200303062926785"
},
"api-version": "7.2-preview"
},
"responses": {
"202": {
"headers": {
"Retry-After": 5,
"Azure-AsyncOperation": "https://myvault.vault.azure.net/restore/45aacd568a23b0s49a2803861e8dd3ase21f/pending"
},
"body": {
"status": "InProgress",
"statusDetails": "Selective Key restore is in progress",
"jobId": "45aacd568a23b0s49a2803861e8dd3ase21f",
"startTime": 1490790000,
"endTime": 0
}
}
}
}
Loading