Skip to content

Add tests and null checks around MAC address functionality #4458

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 2 commits into from
Aug 11, 2017
Merged

Add tests and null checks around MAC address functionality #4458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f94da0b
Add null checks for MAC address functionality, add initial test for e…
cormacpayne Aug 11, 2017
6a1ba6a
Resolve cod review feedback
cormacpayne Aug 11, 2017
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
11 changes: 7 additions & 4 deletions src/Common/Commands.Common/MetricHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,13 @@ private static string HashMacAddress
{
if (_hashMacAddress == string.Empty)
{
var macAddress = NetworkInterface.GetAllNetworkInterfaces()
.FirstOrDefault(nic => nic.OperationalStatus == OperationalStatus.Up)?
var macAddress = NetworkInterface.GetAllNetworkInterfaces()?
.FirstOrDefault(nic => nic != null &&
nic.OperationalStatus == OperationalStatus.Up &&
nic.GetPhysicalAddress() != null &&
!string.IsNullOrWhiteSpace(nic.GetPhysicalAddress().ToString()))?
.GetPhysicalAddress()?.ToString();
_hashMacAddress = macAddress == null ? null : GenerateSha256HashString(macAddress).Replace("-", string.Empty).ToLowerInvariant();
_hashMacAddress = string.IsNullOrWhiteSpace(macAddress) ? null : GenerateSha256HashString(macAddress)?.Replace("-", string.Empty)?.ToLowerInvariant();
}

return _hashMacAddress;
Expand Down Expand Up @@ -246,7 +249,7 @@ public static string GenerateSha256HashString(string originInput)
{
if (string.IsNullOrWhiteSpace(originInput))
{
throw new ArgumentNullException("originInput");
return string.Empty;
}

using (var sha256 = new SHA256CryptoServiceProvider())
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ protected override void InitializeQosEvent()
if (this.DefaultProfile != null &&
this.DefaultProfile.DefaultContext != null &&
this.DefaultProfile.DefaultContext.Account != null &&
this.DefaultProfile.DefaultContext.Account.Id != null)
!string.IsNullOrWhiteSpace(this.DefaultProfile.DefaultContext.Account.Id))
{
_qosEvent.Uid = MetricHelper.GenerateSha256HashString(
this.DefaultProfile.DefaultContext.Account.Id.ToString());
Expand Down
18 changes: 16 additions & 2 deletions src/ResourceManager/Profile/Commands.Profile.Test/TelemetryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.WindowsAzure.Commands.ScenarioTest;
using Moq;
using System;
using System.Net.NetworkInformation;
using Xunit;

namespace Microsoft.Azure.Commands.Profile.Test
Expand All @@ -23,9 +25,11 @@ public class TelemetryTests
{
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void HashOfNullValueThrowsAppropriateException()
public void HashOfNullOrWhitespaceValueReturnsEmptyString()
{
Assert.Throws<ArgumentNullException>(() => MetricHelper.GenerateSha256HashString(null));
Assert.Equal(string.Empty, MetricHelper.GenerateSha256HashString(null));
Assert.Equal(string.Empty, MetricHelper.GenerateSha256HashString(string.Empty));
Assert.Equal(string.Empty, MetricHelper.GenerateSha256HashString(" "));
}

[Fact]
Expand All @@ -38,5 +42,15 @@ public void HashOfValidValueSucceeds()
Assert.True(hash.Length > 0);
Assert.NotEqual<string>(inputValue, hash, StringComparer.OrdinalIgnoreCase);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void NetworkInterfaceWithEmptyAddressReturnsEmptyString()
{
var address = new PhysicalAddress(new byte[] { } );
Assert.Equal(string.Empty, address.ToString());
var hashAddress = MetricHelper.GenerateSha256HashString(address.ToString());
Assert.Equal(string.Empty, hashAddress);
}
}
}
2 changes: 1 addition & 1 deletion src/ServiceManagement/Common/Commands.ServiceManagement.Common/AzureSMCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ protected override void InitializeQosEvent()

if (this.DefaultContext != null &&
this.DefaultContext.Account != null &&
this.DefaultContext.Account.Id != null)
!string.IsNullOrEmpty(this.DefaultContext.Account.Id))
{
_qosEvent.Uid = MetricHelper.GenerateSha256HashString(
this.DefaultContext.Account.Id.ToString());
Expand Down