Skip to content

Commit 2855dd2

Browse files
authored
Implement AsnReader.Clone (#86913)
* Implement AsnReader.Clone * Test that the clone is created from the correct slice
1 parent 443e592 commit 2855dd2

File tree

3 files changed

+77
-0
lines changed

3 files changed

+77
-0
lines changed

src/libraries/System.Formats.Asn1/ref/System.Formats.Asn1.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public partial class AsnReader
100100
public AsnReader(System.ReadOnlyMemory<byte> data, System.Formats.Asn1.AsnEncodingRules ruleSet, System.Formats.Asn1.AsnReaderOptions options = default(System.Formats.Asn1.AsnReaderOptions)) { }
101101
public bool HasData { get { throw null; } }
102102
public System.Formats.Asn1.AsnEncodingRules RuleSet { get { throw null; } }
103+
public System.Formats.Asn1.AsnReader Clone() { throw null; }
103104
public System.ReadOnlyMemory<byte> PeekContentBytes() { throw null; }
104105
public System.ReadOnlyMemory<byte> PeekEncodedValue() { throw null; }
105106
public System.Formats.Asn1.Asn1Tag PeekTag() { throw null; }

src/libraries/System.Formats.Asn1/src/System/Formats/Asn1/AsnDecoder.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,15 @@ public ReadOnlyMemory<byte> ReadEncodedValue()
807807
return encodedValue;
808808
}
809809

810+
/// <summary>
811+
/// Clones the current reader.
812+
/// </summary>
813+
/// <returns>A clone of the current reader.</returns>
814+
/// <remarks>
815+
/// This does not create a clone of the ASN.1 data, only the reader's state is cloned.
816+
/// </remarks>
817+
public AsnReader Clone() => new AsnReader(_data, RuleSet, _options);
818+
810819
private AsnReader CloneAtSlice(int start, int length)
811820
{
812821
return new AsnReader(_data.Slice(start, length), RuleSet, _options);

src/libraries/System.Formats.Asn1/tests/Reader/ReaderStateTests.cs

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using Test.Cryptography;
45
using Xunit;
56

67
namespace System.Formats.Asn1.Tests.Reader
@@ -30,5 +31,71 @@ public static void HasDataAndThrowIfNotEmpty_StartsEmpty()
3031
// Assert.NoThrow
3132
reader.ThrowIfNotEmpty();
3233
}
34+
35+
[Fact]
36+
public static void Clone_CopiesCurrentState()
37+
{
38+
// Sequence {
39+
// SetOf {
40+
// UtcTime 500405000012Z
41+
// Null
42+
// }
43+
// }
44+
// Verify the options are preserved in the clone by observing them:
45+
// this is an incorrectly sorted SET OF with a date of 50/04/05 that should be 2050, not 1950.
46+
ReadOnlyMemory<byte> asn = "30133111170D3530303430353030303031325A0500".HexToByteArray();
47+
48+
AsnReaderOptions options = new AsnReaderOptions
49+
{
50+
UtcTimeTwoDigitYearMax = 2050,
51+
SkipSetSortOrderVerification = true,
52+
};
53+
54+
AsnReader sequence = new AsnReader(asn, AsnEncodingRules.DER, options);
55+
AsnReader reader = sequence.ReadSequence();
56+
sequence.ThrowIfNotEmpty();
57+
58+
AsnReader clone = reader.Clone();
59+
Assert.Equal(reader.RuleSet, clone.RuleSet);
60+
61+
AssertReader(reader);
62+
Assert.False(reader.HasData, "reader.HasData");
63+
Assert.True(clone.HasData, "clone.HasData");
64+
65+
AssertReader(clone);
66+
Assert.False(clone.HasData, "clone.HasData");
67+
68+
static void AssertReader(AsnReader reader)
69+
{
70+
AsnReader setOf = reader.ReadSetOf();
71+
reader.ThrowIfNotEmpty();
72+
73+
DateTimeOffset dateTime = setOf.ReadUtcTime();
74+
Assert.Equal(2050, dateTime.Year);
75+
setOf.ReadNull();
76+
setOf.ThrowIfNotEmpty();
77+
}
78+
}
79+
80+
[Fact]
81+
public static void Clone_Empty()
82+
{
83+
AsnReader reader = new AsnReader(ReadOnlyMemory<byte>.Empty, AsnEncodingRules.DER);
84+
AsnReader clone = reader.Clone();
85+
Assert.False(reader.HasData, "reader.HasData");
86+
Assert.False(clone.HasData, "clone.HasData");
87+
}
88+
89+
[Fact]
90+
public static void Clone_SameUnderlyingData()
91+
{
92+
ReadOnlyMemory<byte> data = "04050102030405".HexToByteArray();
93+
AsnReader reader = new AsnReader(data, AsnEncodingRules.DER);
94+
AsnReader clone = reader.Clone();
95+
96+
Assert.True(reader.TryReadPrimitiveOctetString(out ReadOnlyMemory<byte> readerData));
97+
Assert.True(clone.TryReadPrimitiveOctetString(out ReadOnlyMemory<byte> cloneData));
98+
Assert.True(readerData.Span == cloneData.Span, "readerData == cloneData");
99+
}
33100
}
34101
}

0 commit comments

Comments
 (0)