The convenient compression/decompression API now offers both gzip and deflate.

Towards #127: "support for JWT access tokens"

1 files changed, 58 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
index 6b46169..47d3834 100644
--- a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -16,11 +16,13 @@ namespace DotNetOpenAuth.Messaging {
 	using System.Linq;
 	using System.Net;
 	using System.Net.Mime;
+	using System.Runtime.Serialization.Json;
 	using System.Security;
 	using System.Security.Cryptography;
 	using System.Text;
 	using System.Web;
 	using System.Web.Mvc;
+	using System.Xml;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.Messaging.Reflection;
 
@@ -135,6 +137,21 @@ namespace DotNetOpenAuth.Messaging {
 		};
 
 		/// <summary>
+		/// The available compression algorithms.
+		/// </summary>
+		internal enum CompressionMethod {
+			/// <summary>
+			/// The Deflate algorithm.
+			/// </summary>
+			Deflate,
+
+			/// <summary>
+			/// The GZip algorithm.
+			/// </summary>
+			Gzip,
+		}
+
+		/// <summary>
 		/// Transforms an OutgoingWebResponse to an MVC-friendly ActionResult.
 		/// </summary>
 		/// <param name="response">The response to send to the user agent.</param>
@@ -838,19 +855,36 @@ namespace DotNetOpenAuth.Messaging {
 		/// Compresses a given buffer.
 		/// </summary>
 		/// <param name="buffer">The buffer to compress.</param>
+		/// <param name="method">The compression algorithm to use.</param>
 		/// <returns>The compressed data.</returns>
 		[SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "This Dispose is safe.")]
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "No apparent problem.  False positive?")]
-		internal static byte[] Compress(byte[] buffer) {
+		internal static byte[] Compress(byte[] buffer, CompressionMethod method = CompressionMethod.Deflate) {
 			Requires.NotNull(buffer, "buffer");
 			Contract.Ensures(Contract.Result<byte[]>() != null);
 
 			using (var ms = new MemoryStream()) {
-				using (var compressingStream = new DeflateStream(ms, CompressionMode.Compress, true)) {
+				Stream compressingStream = null;
+				try {
+					switch (method) {
+						case CompressionMethod.Deflate:
+							compressingStream = new DeflateStream(ms, CompressionMode.Compress, true);
+							break;
+						case CompressionMethod.Gzip:
+							compressingStream = new GZipStream(ms, CompressionMode.Compress, true);
+							break;
+						default:
+							Requires.InRange(false, "method");
+							break;
+					}
+
 					compressingStream.Write(buffer, 0, buffer.Length);
+					return ms.ToArray();
+				} finally {
+					if (compressingStream != null) {
+						compressingStream.Dispose();
+					}
 				}
-
-				return ms.ToArray();
 			}
 		}
 
@@ -858,17 +892,35 @@ namespace DotNetOpenAuth.Messaging {
 		/// Decompresses a given buffer.
 		/// </summary>
 		/// <param name="buffer">The buffer to decompress.</param>
+		/// <param name="method">The compression algorithm used.</param>
 		/// <returns>The decompressed data.</returns>
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "No apparent problem.  False positive?")]
 		[SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "This Dispose is safe.")]
-		internal static byte[] Decompress(byte[] buffer) {
+		internal static byte[] Decompress(byte[] buffer, CompressionMethod method = CompressionMethod.Deflate) {
 			Requires.NotNull(buffer, "buffer");
 			Contract.Ensures(Contract.Result<byte[]>() != null);
 
 			using (var compressedDataStream = new MemoryStream(buffer)) {
 				using (var decompressedDataStream = new MemoryStream()) {
-					using (var decompressingStream = new DeflateStream(compressedDataStream, CompressionMode.Decompress, true)) {
+					Stream decompressingStream = null;
+					try {
+						switch (method) {
+							case CompressionMethod.Deflate:
+								decompressingStream = new DeflateStream(compressedDataStream, CompressionMode.Decompress, true);
+								break;
+							case CompressionMethod.Gzip:
+								decompressingStream = new GZipStream(compressedDataStream, CompressionMode.Decompress, true);
+								break;
+							default:
+								Requires.InRange(false, "method");
+								break;
+						}
+
 						decompressingStream.CopyTo(decompressedDataStream);
+					} finally {
+						if (decompressingStream != null) {
+							decompressingStream.Dispose();
+						}
 					}
 
 					return decompressedDataStream.ToArray();