added unit tests for session calculations

3 files changed, 47 insertions, 6 deletions

diff --git a/spec/RestfulSpecRunner.html b/spec/RestfulSpecRunner.html
index 8203970..2b34e5d 100644
--- a/spec/RestfulSpecRunner.html
+++ b/spec/RestfulSpecRunner.html
@@ -27,7 +27,8 @@
   <!-- include spec files here... -->
   <script type="text/javascript" src="specHelper.js"></script>
   <script type="text/javascript" src="restful/signup.js"></script>
-  <script type="text/javascript" src="restful/login.js"></script>
+  <!--  <script type="text/javascript" src="restful/login.js"></script> -->
+  <script type="text/javascript" src="restful/session.js"></script>
 
   <script type="text/javascript">
 
diff --git a/spec/restful/session.js b/spec/restful/session.js
new file mode 100644
index 0000000..b7f16f0
--- /dev/null
+++ b/spec/restful/session.js
@@ -0,0 +1,39 @@
+describe("Session", function() {
+
+  // data gathered from py-srp and ruby-srp
+  var compare = {
+    username: "UC6LTQ",
+    password: "PVSQ7DCEIR0B",
+    salt: "d6ed8dba",
+    v: "c86a8c04a4f71cb10bfe3fedb74bae545b9a20e0f3e95b6334fce1cb3384a296f75d774a3829ffd63f405f13f58ffbae415fd234b08b996c11e8618c17961defcebb1d244b388b75cf36882ee97182a900ebeaf7cffa0a83eed294f3a9449a06beb88954952759d2957b80ef851f4cc4fcaa6001fee4f00c273ecdd712d48371",
+    aa: "4decb8543891f5a744b1e9b5bc375a474bfe3c5417e1db176cefcc7ba915338a14f309f8e0a4c7641bc9c9b9bd2e91c4d1beda1772c30d0350c9ba44f7c5911dfe6bb593ac2a2b30f1f6e5ec8a656cb4947c1907cf62f8d7283cbe32eb44b02158b51091ae130afa6063bb28cdea9ae159d4f222571e146f8715bfa31af09868",
+    a: "d498c3d024ec17689b5320e33fc349a3f3f91320384155b3043fa410c90eab71",
+    bb: "5f5bedd1f95b6b0d6809614f162e49753acce6979e1041f4da5bfa91e1dadd2a5470270ed102a49c5f74fd42f2b61a8a1a43218159a22b31a7cbd4670679480e56d0e4e72a22c07e07102ff063045d0c3c96085dec1cc2959453e0299890bd95af76403cec6ec5f212667a75ae6f4a8327183d72c3ee85792ca43820fbccf244",
+    m: "bc30b8781e67a657e93d0a6cf7e7847fc60f79e2b0641e9c26b3522bc8f974cc"
+  }
+
+  var session;
+
+  beforeEach(function() {
+    var srp = new SRP(jqueryRest());
+    session = new srp.Session(compare.username, compare.password);
+  });
+
+  it("has the proper username", function() {
+    expect(session.getI()).toBe(compare.username);
+  });
+
+  it("calculates the proper verifier", function() {
+    expect(session.getV(compare.salt).toString(16)).toBe(compare.v);
+  });
+
+  it("calculates the proper A", function() {
+    expect(session.calculateAndSetA(compare.a)).toBe(compare.aa);
+  });
+
+  it("calculates the proper M", function() {
+    session.calculateAndSetA(compare.a);
+    session.calculations(compare.salt, compare.bb);
+    expect(session.getM()).toBe(compare.m);
+  });
+});
diff --git a/src/srp_session.js b/src/srp_session.js
index 07c1e25..7554e4a 100644
--- a/src/srp_session.js
+++ b/src/srp_session.js
@@ -1,4 +1,4 @@
-SRP.prototype.Session = function() {
+SRP.prototype.Session = function(login, password) {
   
   // Variables session will be used in the SRP protocol
   var Nstr = "eeaf0ab9adb38dd69c33f80afa8fc5e86072618775ff3c0b9ea2314c9c256576d674df7496ea81d3383b4813d692c6e0e0d5d8e250b98be48e495c1d6089dad15dc7d7b46154d6b6ce8ef4ad69b15d4982559b297bcf1885c529f566660e57ec68edbc3c05726cc02fd4cbf4976eaa9afd5138fe8376435b9fc61d2fc0eb06e3";
@@ -20,9 +20,9 @@ SRP.prototype.Session = function() {
   var M = null;
   var M2 = null;
   var authenticated = false;
-  var I = document.getElementById("srp_username").value;
-  var pass = document.getElementById("srp_password").value;
-  var V;
+  var I = login || document.getElementById("srp_username").value;
+  var pass = password || document.getElementById("srp_password").value;
+  var x, V;
   var salt;
 
   // *** Accessor methods ***
@@ -68,7 +68,8 @@ SRP.prototype.Session = function() {
   // Calculates the X value and return it as a BigInteger
   this.calcX = function(salt)
   {
-    return new BigInteger(SHA256(hex2a(salt + SHA256(I + ":" + pass))), 16);
+    x = x || new BigInteger(SHA256(hex2a(salt + SHA256(I + ":" + pass))), 16);
+    return x;
   };
 
   this.getV = function(salt)