diff --git a/authority/server/db.js b/authority/server/db.js
index b59a2564d852e83641db8a7e6c6686c00b1760ba..4d362888e67f938fedc6eb608b8d12e761c89e55 100644
--- a/authority/server/db.js
+++ b/authority/server/db.js
@@ -277,3 +277,19 @@ exports.pubkeysForEmail = function(identity, cb) {
cb(keys);
});
};
+
+
+// FIXME: I'm not sure I'm using this data model properly
+exports.removeEmail = function(authenticated_email, email, cb) {
+ // figure out the user, and remove Email only from addressed
+ // linked to the authenticated email address
+ emailToUserID(authenticated_email, function(user_id) {
+ executeTransaction([
+ [ "delete from emails where emails.address = ? and user = ?", [ email,user_id ] ] ,
+ [ "delete from keys where email in (select address from emails where emails.address = ? and user = ?)", [ email,user_id ] ],
+ ], function (error) {
+ if (error) cb(error);
+ else cb();
+ });
+ });
+};
\ No newline at end of file
diff --git a/authority/server/wsapi.js b/authority/server/wsapi.js
index aa234fda1fcd243b8ec580dc05445e75c24fcb0d..0bfb38b9eea745ff670d4e8766aa67a361beef3a 100644
--- a/authority/server/wsapi.js
+++ b/authority/server/wsapi.js
@@ -117,6 +117,8 @@ exports.authenticate_user = function(req, resp) {
});
};
+// need CSRF protection
+
exports.add_email = function (req, resp) {
var urlobj = url.parse(req.url, true);
var getArgs = urlobj.query;
@@ -145,6 +147,27 @@ exports.add_email = function (req, resp) {
}
};
+exports.remove_email = function(req, resp) {
+ // this should really be POST, but for now I'm having trouble seeing
+ // how to get POST args properly, so it's a GET (Ben).
+ // hmmm, I really want express or some other web framework!
+ var urlobj = url.parse(req.url, true);
+ var getArgs = urlobj.query;
+
+ if (!checkParams(getArgs, resp, [ "email"])) return;
+ if (!checkAuthed(req, resp)) return;
+
+ logRequest("remove_email", getArgs);
+
+ db.removeEmail(req.session.authenticatedUser, getArgs.email, function(error) {
+ if (error) {
+ console.log("error removing email " + getArgs.email);
+ httputils.badRequest(resp, error.toString());
+ } else {
+ httputils.jsonResponse(resp, true);
+ }});
+};
+
exports.set_key = function (req, resp) {
var urlobj = url.parse(req.url, true);
var getArgs = urlobj.query;
diff --git a/authority/static/dialog/index.html b/authority/static/dialog/index.html
index 91e0202e29c97784aac34245a3b4ae2b0b5eef17..62abcaf117792047a48dee8eb37b891e323e9704 100644
--- a/authority/static/dialog/index.html
+++ b/authority/static/dialog/index.html
@@ -81,6 +81,12 @@
</div>
</div>
</div>
+<div id="forgot_password_dialog" class="dialog">
+ <div class="content">
+ <p class="prompt"><b>Forgot your password?</b> No problem, enter your email, and we'll help you reset it:</p>
+ <div class="input"> <input type="text"></input></div>
+ </div>
+</div>
<div id="sign_in_dialog" class="dialog">
<div class="content">
<p class="prompt">What email address would you like to use to log into <span class="sitename bad"></span>?</p>
diff --git a/authority/static/dialog/style.css b/authority/static/dialog/style.css
index 7830922fbd2f634e59a22500d188bbb76410a48c..c3d02b0e4783d909f8b71d7744a88250539cadbc 100644
--- a/authority/static/dialog/style.css
+++ b/authority/static/dialog/style.css
@@ -146,6 +146,10 @@ button.disabled {
text-align: center;
}
+#forgot_password_dialog {
+ display: inline;
+}
+
div.input > * {
float: left;
}
@@ -185,6 +189,16 @@ div.input input {
padding: .4em;
}
+#forgot_password_dialog input {
+ width: 80%;
+ margin: 1em 10% 0 10%;
+ font-size: 1.5em;
+ padding: 1em .5em 1em .5em;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px 4px 4px 4px;
+}
+
a {
color: rgb(65, 126, 208);
text-decoration: none;
@@ -209,7 +223,7 @@ div.subtle {
div.dialog div.attention, div.dialog div.attention_awesome, div.dialog div.attention_lame {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
- border-radius: 4px;
+ border-radius: 4px 4px 4px 4px;
width: 400px;
padding:13px;
margin: auto;
diff --git a/authority/static/dialog/underscore-min.js b/authority/static/dialog/underscore-min.js
new file mode 100644
index 0000000000000000000000000000000000000000..f502cf9f6a03e9fba4530d69ddb69e3be62ee87d
--- /dev/null
+++ b/authority/static/dialog/underscore-min.js
@@ -0,0 +1,26 @@
+// Underscore.js 1.1.6
+// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=
+0,k=a.length;e<k;e++){if(c.call(d,a[e],e,a)===m)break}else for(e in a)if(l.call(a,e)&&c.call(d,a[e],e,a)===m)break};b.map=function(a,c,b){var e=[];if(a==null)return e;if(t&&a.map===t)return a.map(c,b);h(a,function(a,g,G){e[e.length]=c.call(b,a,g,G)});return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var k=d!==void 0;a==null&&(a=[]);if(u&&a.reduce===u)return e&&(c=b.bind(c,e)),k?a.reduce(c,d):a.reduce(c);h(a,function(a,b,f){!k&&b===0?(d=a,k=!0):d=c.call(e,d,a,b,f)});if(!k)throw new TypeError("Reduce of empty array with no initial value");
+return d};b.reduceRight=b.foldr=function(a,c,d,e){a==null&&(a=[]);if(v&&a.reduceRight===v)return e&&(c=b.bind(c,e)),d!==void 0?a.reduceRight(c,d):a.reduceRight(c);a=(b.isArray(a)?a.slice():b.toArray(a)).reverse();return b.reduce(a,c,d,e)};b.find=b.detect=function(a,c,b){var e;A(a,function(a,g,f){if(c.call(b,a,g,f))return e=a,!0});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(w&&a.filter===w)return a.filter(c,b);h(a,function(a,g,f){c.call(b,a,g,f)&&(e[e.length]=a)});return e};
+b.reject=function(a,c,b){var e=[];if(a==null)return e;h(a,function(a,g,f){c.call(b,a,g,f)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=!0;if(a==null)return e;if(x&&a.every===x)return a.every(c,b);h(a,function(a,g,f){if(!(e=e&&c.call(b,a,g,f)))return m});return e};var A=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=!1;if(a==null)return e;if(y&&a.some===y)return a.some(c,d);h(a,function(a,b,f){if(e=c.call(d,a,b,f))return m});return e};b.include=b.contains=function(a,c){var b=
+!1;if(a==null)return b;if(o&&a.indexOf===o)return a.indexOf(c)!=-1;A(a,function(a){if(b=a===c)return!0});return b};b.invoke=function(a,c){var d=f.call(arguments,2);return b.map(a,function(a){return(c.call?c||a:a[c]).apply(a,d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,
+c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b<e.computed&&(e={value:a,computed:b})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,f){return{value:a,criteria:c.call(d,a,b,f)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=
+function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return f.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?f.call(a,0,b):a[0]};b.rest=b.tail=function(a,b,d){return f.call(a,b==null||d?1:b)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a){return b.reduce(a,function(a,d){if(b.isArray(d))return a.concat(b.flatten(d));
+a[a.length]=d;return a},[])};b.without=function(a){var c=f.call(arguments,1);return b.filter(a,function(a){return!b.include(c,a)})};b.uniq=b.unique=function(a,c){return b.reduce(a,function(a,e,f){if(0==f||(c===!0?b.last(a)!=e:!b.include(a,e)))a[a.length]=e;return a},[])};b.intersect=function(a){var c=f.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),
+e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(o&&a.indexOf===o)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(z&&a.lastIndexOf===z)return a.lastIndexOf(b);for(var d=a.length;d--;)if(a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);d=arguments[2]||1;for(var e=Math.max(Math.ceil((b-a)/
+d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};b.bind=function(a,b){if(a.bind===q&&q)return q.apply(a,f.call(arguments,1));var d=f.call(arguments,2);return function(){return a.apply(b,d.concat(f.call(arguments)))}};b.bindAll=function(a){var c=f.call(arguments,1);c.length==0&&(c=b.functions(a));h(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var b=c.apply(this,arguments);return l.call(d,b)?d[b]:d[b]=a.apply(this,arguments)}};b.delay=
+function(a,b){var d=f.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(f.call(arguments,1)))};var B=function(a,b,d){var e;return function(){var f=this,g=arguments,h=function(){e=null;a.apply(f,g)};d&&clearTimeout(e);if(d||!e)e=setTimeout(h,b)}};b.throttle=function(a,b){return B(a,b,!1)};b.debounce=function(a,b){return B(a,b,!0)};b.once=function(a){var b=!1,d;return function(){if(b)return d;b=!0;return d=a.apply(this,arguments)}};
+b.wrap=function(a,b){return function(){var d=[a].concat(f.call(arguments));return b.apply(this,d)}};b.compose=function(){var a=f.call(arguments);return function(){for(var b=f.call(arguments),d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,
+b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=
+typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;
+for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor||!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};
+b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=
+0;e<a;e++)b.call(d,e)};b.mixin=function(a){h(b.functions(a),function(c){H(c,b[c]=a[c])})};var I=0;b.uniqueId=function(a){var b=I++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||
+null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort",
+"splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})();
diff --git a/authority/static/manage.html b/authority/static/manage.html
index 78d65b3857af202cdfb462606779fb657e100ab7..0a3be84039b0d4d379a393790b711d9b96159f21 100644
--- a/authority/static/manage.html
+++ b/authority/static/manage.html
@@ -37,6 +37,7 @@
</div>
</body>
<script src="dialog/jquery-min.js"></script>
+<script src="dialog/underscore-min.js"></script>
<script>
function display_saved_ids()
{
@@ -46,36 +47,38 @@ function display_saved_ids()
}
$("#emailList").empty();
- for (var e in emails)
- {
- if (emails.hasOwnProperty(e))
- {
+ _(emails).each(function(data, e) {
var block = $("<div>").addClass("emailblock");
var label = $("<div>").addClass("email").text(e);
var meta = $("<div>").addClass("meta");
- var data = emails[e];
-
- var priv = $("<div class='keyblock'>").text(data.priv);
+ /*
+ var priv = $("<div class='keyblock'>").text(data.priv);
+ priv.hide();
+ */
+
var pub = $("<div class='keyblock'>").text(data.pub);
- priv.hide();
pub.hide();
var linkblock = $("<div>");
var puba = $("<a>").text("[show public key]");
- var priva = $("<a>").text("[show private key]");
+ // var priva = $("<a>").text("[show private key]");
puba.click(function() {pub.show()});
- priva.click(function() {priv.show()});
+ // priva.click(function() {priv.show()});
linkblock.append(puba);
- linkblock.append(" / ");
- linkblock.append(priva);
+ // linkblock.append(" / ");
+ // linkblock.append(priva);
- var deauth = $("<button>").text("Sign Out");
+ var deauth = $("<button>").text("Forget this Email");
meta.append(deauth);
deauth.click(function() {
var t = JSON.parse(window.localStorage.emails);
delete t[e];
window.localStorage.emails = JSON.stringify(t);
- display_saved_ids();
+ // remove email from server
+ $.get("/wsapi/remove_email", {"email" : e}, function(response) {
+ alert("response is : " +response);
+ display_saved_ids();
+ });
});
var d = new Date(data.created);
@@ -86,12 +89,11 @@ function display_saved_ids()
block.append(label);
block.append(meta);
- block.append(priv);
+ // block.append(priv);
block.append(pub);
$("#emailList").append(block);
- }
- }
+ });
}
</script>
diff --git a/verifier/server/idassertion.js b/verifier/server/idassertion.js
index ffbed8bc5b1c29a2295557db6a6feece3b9c0c00..4845f9805c59eabb1ced138cb65d64fd52061aae 100644
--- a/verifier/server/idassertion.js
+++ b/verifier/server/idassertion.js
@@ -291,7 +291,9 @@ IDAssertion.prototype =
if (token.verify(pubKey)) {
// success!
console.log("Token for " +payload.email + " verified successfully.");
- onSuccess(true);
+
+ // send back all the verified data
+ onSuccess(payload);
return;
}
} catch(e) {
diff --git a/verifier/server/run.js b/verifier/server/run.js
index 2696fd5456650c6d7c06f2ed99e257b01722d149..cc9e31fb8234ecfe307ddea152d8345573ef8f31 100644
--- a/verifier/server/run.js
+++ b/verifier/server/run.js
@@ -48,8 +48,15 @@ exports.handler = function(req, resp, serveFile) {
var assertionObj = new idassertion.IDAssertion(assertion);
assertionObj.verify(
audience,
- function(successObj) {
- httputils.jsonResponse(resp, {status:"okay"});
+ function(payload) {
+ result = {
+ status : "okay",
+ email : payload.email,
+ audience : payload.audience,
+ "valid-until" : payload["valid-until"],
+ issuer : payload.issuer
+ };
+ httputils.jsonResponse(resp, result);
},
function(errorObj) {
httputils.jsonResponse(resp, {status:"failure", reason:errorObj});