Skip to content

[RS Backup] RBAC Fix #2458

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Jun 17, 2016
Merged

[RS Backup] RBAC Fix #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5113bd9
[RS Backup] Security hot fix PS changes
Jun 10, 2016
c126f9f
[RS Backup] Security fixes - added Source Resource ID support in Enab…
Jun 14, 2016
3d32393
[RS Backup] Restore test case recordings with security fix
Jun 15, 2016
eb0b7dc
[RS Backup] Disabling restore test - passing in record mode, but fail…
Jun 15, 2016
6724941
[RS Backup] variable spelling fix
Jun 15, 2016
ca553b5
[RS Backup] Removed dll reference and introduced RecoveryServices.Bac…
Jun 16, 2016
266169d
[RS Backup] Fixing line breaks
Jun 16, 2016
63994b7
[RS Backup] Passing source resource ID in Get RP Details API
Jun 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<Reference Include="Microsoft.Azure.Common">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 2 additions & 0 deletions ...s.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RecoveryPointConversions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public static List<RecoveryPointBase> GetPSAzureRecoveryPoints(ServiceClientMode
WorkloadType = item.WorkloadType,
RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
SourceVMStorageType = recPoint.SourceVMStorageType,
SourceResourceId = item.SourceResourceId,
};
result.Add(rpBase);
}
Expand Down Expand Up @@ -98,6 +99,7 @@ public static RecoveryPointBase GetPSAzureRecoveryPoints(ServiceClientModel.Reco
Id = rpResponse.RecPoint.Id,
WorkloadType = item.WorkloadType,
RecoveryPointAdditionalInfo = recPoint.RecoveryPointAdditionalInfo,
SourceResourceId = item.SourceResourceId,
};
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion ...eManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.1-preview" targetFramework="net45" />
</packages>
5 changes: 5 additions & 0 deletions ...ices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureVmRecoveryPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public class AzureVmRecoveryPoint : RecoveryPointBase
/// </summary>
public string SourceVMStorageType { get; set; }

/// <summary>
/// ARM ID of the VM represented by the recovery point
/// </summary>
public string SourceResourceId { get; set; }

public AzureVmRecoveryPoint()
{

Expand Down
6 changes: 6 additions & 0 deletions ...rceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ public class ItemBase : ItemContext
/// </summary>
public DateTime? LatestRecoveryPoint { get; set; }

/// <summary>
/// ARM ID of the resource represented by the item
/// </summary>
public string SourceResourceId { get; set; }

public ItemBase(ServiceClientModel.ProtectedItemResource protectedItemResource,
string containerName, ContainerType containerType)
: base((ServiceClientModel.ProtectedItem)protectedItemResource.Properties, containerName, containerType)
Expand All @@ -186,6 +191,7 @@ public ItemBase(ServiceClientModel.ProtectedItemResource protectedItemResource,
Name = protectedItemResource.Name;
Id = protectedItemResource.Id;
LatestRecoveryPoint = protectedItem.LastRecoveryPoint;
SourceResourceId = protectedItem.SourceResourceId;
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...up/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion ...ceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.RecoveryServices.Backup" version="0.1.1-preview" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions ...mands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.1-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
Loading