Skip to content

.Net: Percent-decode non-base64 data URIs in BinaryContent #14519

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

Open
Federico Laurianti (Laurianti) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

.Net: Percent-decode non-base64 data URIs in BinaryContent #14519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions dotnet/src/SemanticKernel.Abstractions/Contents/BinaryContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Text;
using System.Text.Json.Serialization;
using Microsoft.SemanticKernel.Text;
Expand Down Expand Up @@ -306,8 +307,10 @@ private void SetData(ReadOnlyMemory<byte>? data)
}
else
{
// Defaults to UTF8 encoding if format is not provided.
this._data = Encoding.UTF8.GetBytes(parsedDataUri.Data!);
// Defaults to UTF8 encoding if format is not provided. Per RFC 2397, each %xx escape is the octet it names,
// and '+' is a literal plus, not a space as in form encoding.
byte[] bytes = Encoding.UTF8.GetBytes(parsedDataUri.Data!.Replace("+", "%2B"));
this._data = WebUtility.UrlDecodeToBytes(bytes, 0, bytes.Length);
}
}

Expand Down
14 changes: 14 additions & 0 deletions dotnet/src/SemanticKernel.UnitTests/Contents/BinaryContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,18 @@ public void ReturnUTF8EncodedWhenDataIsNotBase64(string path)
// Act & Assert
Assert.Equal("01-02-03-04", Encoding.UTF8.GetString(content.Data!.Value.ToArray()));
}

[Theory]
[InlineData("data:,A%20brief%20note", new byte[] { 0x41, 0x20, 0x62, 0x72, 0x69, 0x65, 0x66, 0x20, 0x6E, 0x6F, 0x74, 0x65 })]
[InlineData("data:application/octet-stream,%FF%00%80", new byte[] { 0xFF, 0x00, 0x80 })]
[InlineData("data:text/plain;charset=iso-8859-1,caf%E9", new byte[] { 0x63, 0x61, 0x66, 0xE9 })]
[InlineData("data:text/plain,1+1=2", new byte[] { 0x31, 0x2B, 0x31, 0x3D, 0x32 })]
public void ReturnPercentDecodedOctetsWhenDataIsNotBase64(string path, byte[] expectedData)
{
// Arrange
var content = new BinaryContent(path);

// Act & Assert
Assert.Equal(expectedData, content.Data!.Value.ToArray());
}
}
Loading