Enhance JwtHeader class

Author: codingstill

JwtManager/Helpers/Algorithm.cs

@@ -7,6 +7,8 @@ namespace JwtManager.Helpers
  public enum Algorithm
  {
  HMAC = 1,
- RSA = 2
+ RSA = 2,
+ ECDSA = 3,
+ RSASSA = 4
  }
 }

JwtManager/Helpers/KeySize.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace JwtManager.Helpers
+{
+ public enum KeySize
+ {
+ S256 = 256,
+ S384 = 384,
+ S512 = 512
+ }
+}

JwtManager/Jwt.cs

@@ -6,9 +6,6 @@ namespace JwtManager
 {
  public abstract class Jwt
  {
- public string Algorithm { get; set; }
- public string Digest { get; set; }
-
  /// <summary>
  /// Creates and signs a Jwt token for the given payload with the given private key
  /// </summary>
@@ -22,10 +19,5 @@ public abstract class Jwt
  /// <param name="token">A token to validate</param>
  /// <returns>The serialized payload if the token can be validated</returns>
  public abstract string Validate(string token);
-
- public static Jwt Create(string algorithm, int digest)
- {
- return new RsJwt();
- }
  }
 }

JwtManager/JwtHeader.cs

@@ -4,9 +4,42 @@
 
 namespace JwtManager
 {
- class JwtHeader
+ public class JwtHeader
  {
  public string alg { get; set; }
  public string typ { get; set; }
+
+ public void Set(Helpers.Algorithm algorithm, Helpers.KeySize size)
+ {
+ if(!Enum.IsDefined(typeof(Helpers.Algorithm), algorithm) || !Enum.IsDefined(typeof(Helpers.KeySize), size))
+ {
+ throw new Exception("Invalid values for algorithm or size.");
+ }
+
+ string algstr = "";
+
+ switch(algorithm)
+ {
+ case Helpers.Algorithm.RSA:
+ algstr = "RS";
+ break;
+ case Helpers.Algorithm.HMAC:
+ algstr = "HS";
+ break;
+ case Helpers.Algorithm.ECDSA:
+ algstr = "ES";
+ break;
+ case Helpers.Algorithm.RSASSA:
+ if(size == Helpers.KeySize.S512)
+ {
+ throw new Exception("Invalid size for algorithm.");
+ }
+ algstr = "PS";
+ break;
+ }
+
+ alg = algstr + ((int)size).ToString();
+ typ = "JWT";
+ }
  }
 }

JwtManager/RsJwt.cs

@@ -15,7 +15,7 @@ public class RsJwt : Jwt
  {
  public string PrivateKey { get; set; }
  public string PublicKey { get; set; }
- public int KeySize { get; set; }
+ public Helpers.KeySize KeySize { get; set; }
 
  public override string Sign(string payload)
  {
@@ -92,7 +92,9 @@ private JwtHeader Header
  {
  get
  {
- return new JwtHeader { alg = "RS" + KeySize.ToString(), typ = "JWT" };
+ JwtHeader header = new JwtHeader();
+ header.Set(Helpers.Algorithm.RSA, KeySize);
+ return Header;
  }
  }
 

JwtManagerTests/JwtHeaderTests.cs

@@ -0,0 +1,79 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace JwtManagerTests
+{
+ [TestClass]
+ public class JwtHeaderTests
+ {
+ class TestResult
+ {
+ public JwtManager.Helpers.Algorithm algorithm { get; set; }
+ public JwtManager.Helpers.KeySize size { get; set; }
+ public string alg { get; set; }
+ public string typ { get; set; }
+ }
+
+ [TestMethod]
+ public void ValidCases()
+ {
+ JwtManager.JwtHeader header = new JwtManager.JwtHeader();
+
+ TestResult[] tests = {
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.RSA, size = JwtManager.Helpers.KeySize.S256, alg = "RS256", typ = "JWT" },
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.RSA, size = JwtManager.Helpers.KeySize.S384, alg = "RS384", typ = "JWT" },
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.RSA, size = JwtManager.Helpers.KeySize.S512, alg = "RS512", typ = "JWT" },
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.HMAC, size = JwtManager.Helpers.KeySize.S256, alg = "HS256", typ = "JWT" },
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.HMAC, size = JwtManager.Helpers.KeySize.S384, alg = "HS384", typ = "JWT" },
+ new TestResult { algorithm = JwtManager.Helpers.Algorithm.HMAC, size = JwtManager.Helpers.KeySize.S512, alg = "HS512", typ = "JWT" }
+ };
+
+ foreach(TestResult test in tests)
+ {
+ header.Set(test.algorithm, test.size);
+ Assert.AreEqual(header.alg, test.alg);
+ Assert.AreEqual(header.typ, test.typ);
+ }
+ }
+
+ [TestMethod]
+ public void CheckEP512Exception()
+ {
+ JwtManager.JwtHeader header = new JwtManager.JwtHeader();
+ Exception e = null;
+
+ try
+ {
+ header.Set(JwtManager.Helpers.Algorithm.RSASSA, JwtManager.Helpers.KeySize.S512);
+ }
+ catch(Exception ex)
+ {
+ e = ex;
+ }
+
+ Assert.IsNotNull(e);
+ Assert.AreEqual(e.Message, "Invalid size for algorithm.");
+ }
+
+ [TestMethod]
+ public void CheckNonValidOptions()
+ {
+ JwtManager.JwtHeader header = new JwtManager.JwtHeader();
+ Exception e = null;
+
+ try
+ {
+ header.Set(JwtManager.Helpers.Algorithm.RSASSA, (JwtManager.Helpers.KeySize)555);
+ }
+ catch (Exception ex)
+ {
+ e = ex;
+ }
+
+ Assert.IsNotNull(e);
+ Assert.AreEqual(e.Message, "Invalid values for algorithm or size.");
+ }
+ }
+}

JwtManagerTests/RsJwtTests.cs

@@ -244,7 +244,7 @@ public void SignDataWithInvalidHashAlgorithm()
  Exception e = null;
  JwtManager.RsJwt jwt = new JwtManager.RsJwt
  {
- KeySize = 555,
+ KeySize = (JwtManager.Helpers.KeySize)555,
  PrivateKey = PrivateKey
  };
 
@@ -274,7 +274,7 @@ public void ValidateWithInvalidHashAlgorithm()
  };
  JwtManager.RsJwt vJwt = new JwtManager.RsJwt
  {
- KeySize = 555,
+ KeySize = (JwtManager.Helpers.KeySize)555,
  PublicKey = PublicKey
  };
 
@@ -294,7 +294,7 @@ public void ValidateWithInvalidHashAlgorithm()
  Assert.AreEqual(e.Message, "Given key size is not valid.");
  }
 
- protected abstract int HashKeySize();
+ protected abstract JwtManager.Helpers.KeySize HashKeySize();
  }
 
  [TestClass]
@@ -326,9 +326,9 @@ public static void ClassCleanup()
  }
  #endregion
 
- protected override int HashKeySize()
+ protected override JwtManager.Helpers.KeySize HashKeySize()
  {
- return 256;
+ return JwtManager.Helpers.KeySize.S256;
  }
  }
 
@@ -361,9 +361,9 @@ public static void ClassCleanup()
  }
  #endregion
 
- protected override int HashKeySize()
+ protected override JwtManager.Helpers.KeySize HashKeySize()
  {
- return 384;
+ return JwtManager.Helpers.KeySize.S384;
  }
  }
 
@@ -396,9 +396,9 @@ public static void ClassCleanup()
  }
  #endregion
 
- protected override int HashKeySize()
+ protected override JwtManager.Helpers.KeySize HashKeySize()
  {
- return 512;
+ return JwtManager.Helpers.KeySize.S512;
  }
  }
 }