-
Notifications
You must be signed in to change notification settings - Fork 4k
Changes for end to end ssl and SSLPolicy in application gateways #2684
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
716fe66
Changes for end to end ssl and SSLPolicy in application gateways
vinatara 862b7e8
Including @vinayada's changes. Also bumping up the network package ve…
vinatara 9cd5e53
Added SupportsSouldProcess and ShouldProcess for the new cmdlets.
vinatara bb52ebf
Adding help for the new cmdlets (ApplicationGatewayAuthenticationCert…
vinatara 4be8d29
Adding credential scanner exceptions for test certificates
vinatara 9c90e92
Undoing changes to csproj files made by VS/nuget plugin
vinatara b3ea980
Changing the test certificate path from relative to absolute.
vinatara 25a37a4
Reverting changes in unrelated csproj
vinatara 57969e3
Adding SupportsShouldProcess for ApplicationGatewaSslPolicy cmdlets
vinatara File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+851 Bytes
...ceManager/Network/Commands.Network.Test/ScenarioTests/Data/ApplicationGatewayAuthCert.cer
Binary file not shown.
4,267 changes: 2,966 additions & 1,301 deletions
4,267
...mmands.Network.Test.ScenarioTests.ApplicationGatewayTests/TestApplicationGatewayCRUD.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...y/AuthenticationCertificate/AddAzureApplicationGatewayAuthenticationCertificateCommand.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.Network.Models; | ||
| using System; | ||
| using System.Linq; | ||
| using System.Management.Automation; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Network | ||
| { | ||
| [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayAuthenticationCertificate", SupportsShouldProcess = true), | ||
| OutputType(typeof(PSApplicationGateway))] | ||
| public class AddAzureApplicationGatewayAuthenticationCertificateCommand : AzureApplicationGatewayAuthenticationCertificateBase | ||
| { | ||
| [Parameter( | ||
| Mandatory = true, | ||
| ValueFromPipeline = true, | ||
| HelpMessage = "The applicationGateway")] | ||
| public PSApplicationGateway ApplicationGateway { get; set; } | ||
|
|
||
| public override void ExecuteCmdlet() | ||
| { | ||
| base.ExecuteCmdlet(); | ||
|
|
||
| if (ShouldProcess(Name, Microsoft.Azure.Commands.Network.Properties.Resources.CreatingResourceMessage)) | ||
| { | ||
| var authCertificate = this.ApplicationGateway.AuthenticationCertificates.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase)); | ||
|
|
||
| if (authCertificate != null) | ||
| { | ||
| throw new ArgumentException("Authentication certificate with the specified name already exists"); | ||
| } | ||
|
|
||
| authCertificate = base.NewObject(); | ||
| this.ApplicationGateway.AuthenticationCertificates.Add(authCertificate); | ||
|
|
||
| WriteObject(this.ApplicationGateway); | ||
| } | ||
| } | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...Gateway/AuthenticationCertificate/AzureApplicationGatewayAuthenticationCertificateBase.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.Network.Models; | ||
| using System; | ||
| using System.Management.Automation; | ||
| using System.Security.Cryptography.X509Certificates; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Network | ||
| { | ||
| public class AzureApplicationGatewayAuthenticationCertificateBase : NetworkBaseCmdlet | ||
| { | ||
| [Parameter( | ||
| Mandatory = true, | ||
| HelpMessage = "The name of the authentication certificate")] | ||
| [ValidateNotNullOrEmpty] | ||
| public string Name { get; set; } | ||
|
|
||
| [Parameter( | ||
| Mandatory = true, | ||
| HelpMessage = "Path of certificate CER file")] | ||
| [ValidateNotNullOrEmpty] | ||
| public string CertificateFile { get; set; } | ||
|
|
||
| public PSApplicationGatewayAuthenticationCertificate NewObject() | ||
| { | ||
| X509Certificate2 cert = new X509Certificate2(CertificateFile); | ||
|
|
||
| var authCertificate = new PSApplicationGatewayAuthenticationCertificate(); | ||
|
|
||
| authCertificate.Name = this.Name; | ||
| authCertificate.Data = Convert.ToBase64String(cert.Export(X509ContentType.Cert)); | ||
| authCertificate.Id = | ||
| ApplicationGatewayChildResourceHelper.GetResourceNotSetId( | ||
| this.NetworkClient.NetworkManagementClient.SubscriptionId, | ||
| Microsoft.Azure.Commands.Network.Properties.Resources.ApplicationGatewayAuthenticationCertificateName, | ||
| this.Name); | ||
|
|
||
| return authCertificate; | ||
| } | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
...y/AuthenticationCertificate/GetAzureApplicationGatewayAuthenticationCertificateCommand.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.Network.Models; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Management.Automation; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Network | ||
| { | ||
| [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayAuthenticationCertificate"), | ||
| OutputType(typeof(PSApplicationGatewayAuthenticationCertificate), typeof(IEnumerable<PSApplicationGatewayAuthenticationCertificate>))] | ||
| public class GetAzureApplicationGatewayAuthenticationCertificateCommand : NetworkBaseCmdlet | ||
| { | ||
| [Parameter( | ||
| Mandatory = false, | ||
| HelpMessage = "The name of the authentication certificate")] | ||
| [ValidateNotNullOrEmpty] | ||
| public string Name { get; set; } | ||
|
|
||
| [Parameter( | ||
| Mandatory = true, | ||
| ValueFromPipeline = true, | ||
| HelpMessage = "The applicationGateway")] | ||
| public PSApplicationGateway ApplicationGateway { get; set; } | ||
|
|
||
| public override void ExecuteCmdlet() | ||
| { | ||
| base.ExecuteCmdlet(); | ||
|
|
||
| if (!string.IsNullOrEmpty(this.Name)) | ||
| { | ||
| var authCertificate = | ||
| this.ApplicationGateway.AuthenticationCertificates.First( | ||
| resource => | ||
| string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase)); | ||
|
|
||
| WriteObject(authCertificate); | ||
| } | ||
| else | ||
| { | ||
| var authCertificates = this.ApplicationGateway.AuthenticationCertificates; | ||
| WriteObject(authCertificates, true); | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
...y/AuthenticationCertificate/NewAzureApplicationGatewayAuthenticationCertificateCommand.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Microsoft.Azure.Commands.Network.Models; | ||
| using System.Management.Automation; | ||
|
|
||
| namespace Microsoft.Azure.Commands.Network | ||
| { | ||
| [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayAuthenticationCertificate", SupportsShouldProcess = true), | ||
| OutputType(typeof(PSApplicationGatewayAuthenticationCertificate))] | ||
| public class NewAzureApplicationGatewayAuthenticationCertificateCommand : AzureApplicationGatewayAuthenticationCertificateBase | ||
| { | ||
| public override void ExecuteCmdlet() | ||
| { | ||
| if (ShouldProcess(Name, Microsoft.Azure.Commands.Network.Properties.Resources.CreatingResourceMessage)) | ||
| { | ||
| base.ExecuteCmdlet(); | ||
| WriteObject(base.NewObject()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add SUpportsShouldProcess=true to the Cmdlet attribute