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.

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

Use certificate to authenticate devices and edge devices #2143

Merged
merged 5 commits into from
Jun 1, 2023
Merged

Use certificate to authenticate devices and edge devices #2143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bf3141
Fix code
ivanropiteaux Jun 1, 2023
c3fff79
Use DeviceName for certificates
ivanropiteaux Jun 1, 2023
496bd37
Display certificates credentials on ConnectionStringDialog
ivanropiteaux Jun 1, 2023
cbe0a06
Add on edge device screen and allow file download
ivanropiteaux Jun 1, 2023
4ab0602
Fix unit tests
kbeaugrand Jun 1, 2023
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
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal.Application/Services/IDeviceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Task<PaginatedResult<DeviceListItem>> GetDevices(

Task DeleteDevice(string deviceId);

Task<DeviceCredentials> GetCredentials(string deviceId);
Task<DeviceCredentials> GetCredentials(TDto device);

Task<IEnumerable<LoRaDeviceTelemetryDto>> GetDeviceTelemetry(string deviceId);

Expand Down
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal.Application/Services/IExternalDeviceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Task<PaginationResult<Twin>> GetAllEdgeDevice(

Task<int> GetConcentratorsCount();

Task<DeviceCredentials> GetDeviceCredentials(string deviceId);
Task<DeviceCredentials> GetDeviceCredentials(string deviceName);

Task<DeviceCredentials> GetEdgeDeviceCredentials(IoTEdgeDevice device);

Expand Down
85 changes: 67 additions & 18 deletions src/AzureIoTHub.Portal.Client/Pages/Devices/ConnectionStringDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,57 @@
@using AzureIoTHub.Portal.Models.v10
@using AzureIoTHub.Portal.Shared.Models.v10
@using System.Text

@inject ClipboardService ClipboardService
@inject IDeviceClientService DeviceClientService
@inject IJSRuntime JS

<div class="ConnectionString-dialog">
<MudDialog>
<DialogContent>
<MudCard Outlined="true">
<MudCardContent>
<MudGrid>
<MudItem xs="12">
<MudText Style="text-decoration:underline"><b>Service Endpoint</b></MudText>
<MudTextField @bind-Value="@credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ProvisioningEndpoint))"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
<MudTextField @bind-Value="@credentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.RegistrationID))" />
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
<MudTextField @bind-Value="@credentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.ScopeID))" />
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Symmetric Key</b></MudText>
<MudTextField @bind-Value="@credentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricKey))" />
</MudItem>
@if (credentials.AuthenticationMode != null && AuthenticationMode.SymmetricKey.Equals(credentials.AuthenticationMode))
{
@if (credentials.SymmetricCredentials != null)
{
<MudItem xs="12">
<MudText Style="text-decoration:underline"><b>Service Endpoint</b></MudText>
<MudTextField @bind-Value="@credentials.SymmetricCredentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricCredentials.ProvisioningEndpoint))"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Registration Id</b></MudText>
<MudTextField @bind-Value="@credentials.SymmetricCredentials.RegistrationID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricCredentials.RegistrationID))"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Scope Id</b></MudText>
<MudTextField @bind-Value="@credentials.SymmetricCredentials.ScopeID" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricCredentials.ScopeID))"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Symmetric Key</b></MudText>
<MudTextField @bind-Value="@credentials.SymmetricCredentials.SymmetricKey" Variant="Variant.Text" InputType="InputType.Password" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(credentials.SymmetricCredentials.SymmetricKey))"/>
</MudItem>
}
}
else
{
@if (credentials.CertificateCredentials != null)
{
<MudItem xs="12">
<MudText Style="text-decoration:underline"><b>Certificate Pem</b></MudText>
<MudTextField @bind-Value="@credentials.CertificateCredentials.CertificatePem" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Download" OnAdornmentClick="DownloadPemFile"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Public Key</b></MudText>
<MudTextField @bind-Value="@credentials.CertificateCredentials.PublicKey" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Download" OnAdornmentClick="DownloadPublicKeyFile"/>
</MudItem>
<MudItem Class="mt-0" xs="12">
<MudText Style="text-decoration:underline"><b>Private Key</b></MudText>
<MudTextField @bind-Value="@credentials.CertificateCredentials.PrivateKey" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Download" OnAdornmentClick="DownloadPrivateKeyFile"/>
</MudItem>
}
}
</MudGrid>
</MudCardContent>
</MudCard>
Expand All @@ -38,10 +65,10 @@
@code {
[CascadingParameter]
public Error Error { get; set; } = default!;

[CascadingParameter] MudDialogInstance MudDialog { get; set; } = default!;
[Parameter] public string deviceId { get; set; } = default!;
private SymmetricCredentials credentials = new();
private DeviceCredentials credentials = new();

protected override async Task OnInitializedAsync()
{
Expand All @@ -58,5 +85,27 @@
}
}

private async Task DownloadPemFile()
{
var stream = new DotNetStreamReference(stream: new MemoryStream(
Encoding.UTF8.GetBytes(credentials.CertificateCredentials.CertificatePem)));
await JS.InvokeVoidAsync("downloadFileFromStream", "certificate.pem", stream);
}

private async Task DownloadPublicKeyFile()
{
var stream = new DotNetStreamReference(stream: new MemoryStream(
Encoding.UTF8.GetBytes(credentials.CertificateCredentials.PublicKey)));
await JS.InvokeVoidAsync("downloadFileFromStream", "key.pub", stream);
}

private async Task DownloadPrivateKeyFile()
{
var stream = new DotNetStreamReference(stream: new MemoryStream(
Encoding.UTF8.GetBytes(credentials.CertificateCredentials.PrivateKey)));
await JS.InvokeVoidAsync("downloadFileFromStream", "key", stream);
}


void Cancel() => MudDialog.Cancel();
}
Loading