Skip to content

Minor performance improvements #93

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
alex-jitbit merged 3 commits into from
Oct 26, 2025
Merged

Minor performance improvements #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef9f4e
Minor performance improvements
TheTrueColonel Oct 25, 2025
b522fbf
Update Saml.cs
TheTrueColonel Oct 25, 2025
db57781
Reverted URL encoding method
TheTrueColonel Oct 25, 2025
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
63 changes: 29 additions & 34 deletions AspNetSaml/Saml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Use this freely under the Apache license (see https://choosealicense.com/license
using System.Security.Cryptography.Xml;
using System.IO.Compression;
using System.Text;
using System.Runtime;

namespace Saml
{
Expand Down Expand Up @@ -283,35 +282,35 @@ protected override bool IsExpired()

public abstract class BaseRequest
{
public string _id;
protected string _issue_instant;

protected string _issuer;

public BaseRequest(string issuer)
{
_id = "_" + Guid.NewGuid().ToString();
protected readonly string _id;
protected readonly string _issue_instant;
protected readonly string _issuer;

protected static readonly XmlWriterSettings _xmlSettings = new XmlWriterSettings {
OmitXmlDeclaration = true,
Encoding = new UTF8Encoding(false)
};

protected BaseRequest(string issuer) {
_id = $"_{Guid.NewGuid()}";
_issue_instant = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ", System.Globalization.CultureInfo.InvariantCulture);

_issuer = issuer;
}

public abstract string GetRequest();

protected static string ConvertToBase64Deflated(string input)
{
//byte[] toEncodeAsBytes = System.Text.ASCIIEncoding.ASCII.GetBytes(input);
//return System.Convert.ToBase64String(toEncodeAsBytes);
protected static string ConvertToBase64Deflated(MemoryStream streamInput) {
streamInput.Seek(0, SeekOrigin.Begin);

//https://stackoverflow.com/questions/25120025/acs75005-the-request-is-not-a-valid-saml2-protocol-message-is-showing-always%3C/a%3E
var memoryStream = new MemoryStream();
using (var writer = new StreamWriter(new DeflateStream(memoryStream, CompressionMode.Compress, true), new UTF8Encoding(false)))
{
writer.Write(input);
writer.Close();
using (var compressed = new MemoryStream()) {
using (var deflate = new DeflateStream(compressed, CompressionMode.Compress, leaveOpen: true)) {
streamInput.CopyTo(deflate);
}

return Convert.ToBase64String(compressed.GetBuffer(), 0, (int)compressed.Length, Base64FormattingOptions.None);
}
string result = Convert.ToBase64String(memoryStream.GetBuffer(), 0, (int)memoryStream.Length, Base64FormattingOptions.None);
return result;
}

/// <summary>
Expand All @@ -322,7 +321,7 @@ protected static string ConvertToBase64Deflated(string input)
/// <returns></returns>
public string GetRedirectUrl(string samlEndpoint, string relayState = null)
{
var queryStringSeparator = samlEndpoint.Contains("?") ? "&" : "?";
var queryStringSeparator = samlEndpoint.Contains('?') ? '&' : '?';

var url = samlEndpoint + queryStringSeparator + "SAMLRequest=" + Uri.EscapeDataString(GetRequest());

Expand All @@ -337,7 +336,7 @@ public string GetRedirectUrl(string samlEndpoint, string relayState = null)

public class AuthRequest : BaseRequest
{
private string _assertionConsumerServiceUrl;
private readonly string _assertionConsumerServiceUrl;

/// <summary>
/// Initializes new instance of AuthRequest
Expand Down Expand Up @@ -369,11 +368,9 @@ public enum AuthRequestFormat
/// <returns></returns>
public override string GetRequest()
{
using (StringWriter sw = new StringWriter())
using (var ms = new MemoryStream())
{
XmlWriterSettings xws = new XmlWriterSettings { OmitXmlDeclaration = true };

using (XmlWriter xw = XmlWriter.Create(sw, xws))
using (var xw = XmlWriter.Create(ms, _xmlSettings))
{
xw.WriteStartElement("samlp", "AuthnRequest", "urn:oasis:names:tc:SAML:2.0:protocol");
xw.WriteAttributeString("ID", _id);
Expand Down Expand Up @@ -403,7 +400,7 @@ public override string GetRequest()
xw.WriteEndElement();
}

return ConvertToBase64Deflated(sw.ToString());
return ConvertToBase64Deflated(ms);
}
}
}
Expand All @@ -413,20 +410,18 @@ public override string GetRequest()
/// </summary>
public class SignoutRequest : BaseRequest
{
private string _nameId;
private readonly string _nameId;

public SignoutRequest(string issuer, string nameId) : base(issuer)
{
_nameId = nameId;
}

public override string GetRequest()
{
using (StringWriter sw = new StringWriter())
using (var ms = new MemoryStream())
{
XmlWriterSettings xws = new XmlWriterSettings { OmitXmlDeclaration = true };

using (XmlWriter xw = XmlWriter.Create(sw, xws))
using (var xw = XmlWriter.Create(ms, _xmlSettings))
{
xw.WriteStartElement("samlp", "LogoutRequest", "urn:oasis:names:tc:SAML:2.0:protocol");
xw.WriteAttributeString("ID", _id);
Expand All @@ -444,7 +439,7 @@ public override string GetRequest()
xw.WriteEndElement();
}

return ConvertToBase64Deflated(sw.ToString());
return ConvertToBase64Deflated(ms);
}
}
}
Expand Down