add login page;

add test case for sub-grammar - not passed!
edithli · May 6, 2016 · 2846f30 · 2846f30
1 parent e3c9dbc
commit 2846f30
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 14 deletions.
diff --git a/background.js b/background.js
@@ -18,8 +18,6 @@ loadJSON('data/grammar.cfg', function(text){
 	grammar = JSON.parse(text); 
 	console.log('grammar done');
 	initialize();
-	// test
-	// var pt = parse("alaama777$rte_");
 	// derive(pt);
 	// var arr = encodePwd("8802667aafb");
 	// decodePwd(arr);
@@ -38,6 +36,12 @@ loadJSON('data/vault_dist.cfg', function(text) {
 		vaultDist[key]._total = total;
 	}
 	console.log('vault dist done');
+	// test
+	var pt = parse("alaama777$rte_");
+	var pt2 = parse("aslife323234$@");
+	var sg = new SubGrammar(pt.concat(pt2));
+	var arr = sg.encodeSubGrammar();
+	sg.decodeSubGrammar(arr);
 });
 chrome.runtime.onMessage.addListener(function(request, sender, sendResponse){
 	console.log("enter listener");
@@ -560,9 +564,10 @@ function SubGrammar(rules) {
 				this.__subgrammar[lhs][rhs]._count++;
 			}
 		}
+		console.log("build subgrammar: \n" + this.__subgrammar.toString());
 	}
 	this.encodeSubGrammar = function(){
-		_buildSubGrammar(rules);
+		this._buildSubGrammar(rules);
 		// for (var i = 0; i < this.pwdList.length; i++){
 		// 	var pt = parse(this.pwdList[i]);
 		// 	for (var j = 0; j < pt.length; j++){
@@ -578,7 +583,6 @@ function SubGrammar(rules) {
 		// 		}
 		// 	}
 		// }
-		console.log("subgrammar: \n" + this.__subgrammar.toString());
 		var sgarr = new Uint32Array(ARR_LEN * MAX_SG_LEN);
 		window.crypto.getRandomValues(sgarr);
 		var index = 0;
@@ -588,18 +592,18 @@ function SubGrammar(rules) {
 			var lhs = stack.pop();
 			done.push(lhs);
 			// encode rule size first
-			var size = this.__subgrammar[key]._count;
-			if (!vaultDist[key][size])
-				console.err("rule size exceed max length for " + key);
+			var size = this.__subgrammar[lhs]._count;
+			if (!vaultDist[lhs][size])
+				console.err("rule size exceed max length for " + lhs);
 			// get cumulative frequency
 			var cf;
-			for (var sn in vaultDist[key]){
+			for (var sn in vaultDist[lhs]){
 				if (size != parseInt(sn))
-					cf += vaultDist[key][sn];
+					cf += vaultDist[lhs][sn];
 				else break;
 			}
-			var p = parseInt(""+(Math.random() * vaultDist[key][size])) + cf;
-			var arr = encodeProb(p, vaultDist[key]._total);
+			var p = parseInt(""+(Math.random() * vaultDist[lhs][size])) + cf;
+			var arr = encodeProb(p, vaultDist[lhs]._total);
 			for (var i = 0; i < arr.length; i++, index++)
 				sgarr[index] = arr[i];
 			// encode each grammar with lhs and get the nonTList
@@ -664,7 +668,7 @@ function SubGrammar(rules) {
 					stack.push(nonTList[i]);
 			}
 		}
-		_buildSubGrammar(sgrules);
+		this._buildSubGrammar(sgrules);
 	}
 
 }

diff --git a/login.html b/login.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>登录</title>
+</head>
+<body>
+	<div>
+		<form>
+			<label>用户名：</label>
+			<input id="login-username" type="text" />
+			<label>主密码：</label>
+			<input id="login-mpw" type="password" />
+			<button>取消</button>
+			<button>登录</button>
+		</form>
+		<button>忘记密码</button>
+	</div>
+
+</body>
+</html>
diff --git a/popup.js b/popup.js
@@ -21,13 +21,12 @@ document.addEventListener('DOMContentLoaded', function() {
 			var ln = links[i];
 			var dst = ln.href;
 			ln.onclick = function(){
+				// need to check whether user has logged in
 				console.log('link clicked - jump to : ' + dst);
 				chrome.tabs.create({active: true, url: dst});
 			};
 		})();
 	}
-
-
 });
 
 console.log('popup.js end');