diff --git a/authority/server/run.js b/authority/server/run.js index 7a625172044dd5425f551f489a186877aa65a009..6f8ed9155cedb41e93e7f3f0f7e17c539d50b742 100644 --- a/authority/server/run.js +++ b/authority/server/run.js @@ -48,7 +48,7 @@ exports.setup = function(server) { var week = (7 * 24 * 60 * 60 * 1000); server.use(sessions({ secret: COOKIE_SECRET, - session_key: "browserid_state", + session_key: "primary_state", path: '/' })); } diff --git a/authority/static/dialog/main.js b/authority/static/dialog/main.js index e676e27f0bf7603ff35f0fa8cccb52f66d740c0b..fc75faafcebcd08770c81e9ce06d0283712c22a4 100644 --- a/authority/static/dialog/main.js +++ b/authority/static/dialog/main.js @@ -650,7 +650,6 @@ var keypair = CryptoStubs.genKeyPair(); persistAddressAndKeyPair(args.email, keypair); - console.log("TRUSTED registerVerifiedEmail done - returning " + keypair.pub); return keypair.pub; }); diff --git a/authority/static/dialog/register_iframe.js b/authority/static/dialog/register_iframe.js index 4d5c82c405d569d0eebb2629ef630b2f9c659822..f6e127599a10e12a4bb5bf8f1162b7d78ff914ea 100644 --- a/authority/static/dialog/register_iframe.js +++ b/authority/static/dialog/register_iframe.js @@ -33,5 +33,6 @@ var keypair = CryptoStubs.genKeyPair(); persistAddressAndKeyPair(args.email, keypair); + return keypair.pub; }); })(); diff --git a/authority/static/include.js b/authority/static/include.js index c2de1f7009e36ec04835ae87dbb2cdcd327f6700..7b51d9124d2992c8b7de01d393ce3bc22e0e4121 100644 --- a/authority/static/include.js +++ b/authority/static/include.js @@ -606,6 +606,7 @@ if (!navigator.id.getVerifiedEmail || navigator.id._getVerifiedEmailIsShimmed) method: "registerVerifiedEmail", params: {email:email}, success: function(rv) { + console.log("registerVerifiedEmail channel returned: rv is " + rv); if (onsuccess) { onsuccess(rv); } diff --git a/primary/server/wsapi.js b/primary/server/wsapi.js index 4f84ba5122e70c68fe256bc11621f9d68d5e15cd..c29382d631d9113dd96ba5f5c374ce306edd3f4f 100644 --- a/primary/server/wsapi.js +++ b/primary/server/wsapi.js @@ -102,11 +102,18 @@ exports.add_key = function (req, resp) { var urlobj = url.parse(req.url, true); var getArgs = urlobj.query; - if (!checkParams(getArgs, resp, [ "pubkey" ])) return; - if (!checkAuthed(req, resp)) return; + if (!checkParams(getArgs, resp, [ "pubkey" ])) { + logRequest("add_key", "Missing required pubkey"); + return; + } + if (!checkAuthed(req, resp)) { + logRequest("add_key", "Not authed - req.session is " + req.session); + return; + } - logRequest("set_key", getArgs); + logRequest("add_key", getArgs); db.addKeyToAccount(req.session.userid, getArgs.pubkey, function (rv) { + logRequest("add_key", "Success"); httputils.jsonResponse(resp, rv); }); }; diff --git a/primary/static/.well-known/host-meta b/primary/static/.well-known/host-meta index f96a548972c015172efab6b25ddec3f5c5ec8d4f..ee6f0e17124389479903a9b7d24122f9747f5b04 100644 --- a/primary/static/.well-known/host-meta +++ b/primary/static/.well-known/host-meta @@ -5,7 +5,7 @@ <hm:Host xmlns='http://host-meta.net/xrd/1.0'>authority.mozilla.org</hm:Host> - <Link rel='lrdd' template='http://authority.mozilla.org/users/{uri}.xml'></Link> + <Link rel='lrdd' template='http://primary.mozilla.org/users/{uri}.xml'></Link> <Link rel='other' value='something-different'></Link> </XRD> diff --git a/primary/static/main.js b/primary/static/main.js index 368fa292edb2b75e78af2e258d9f1f36eb9d9e73..561c6133eb845a0714e9ed22375173d7ec7ad092 100644 --- a/primary/static/main.js +++ b/primary/static/main.js @@ -75,7 +75,8 @@ if (result) { runConfirmationDialog(username); try { - + console.log("About to register verified email."); + navigator.id.registerVerifiedEmail(username + "@primary.mozilla.org", function(publicKey) { $.ajax({ url: '/wsapi/add_key?pubkey=' + encodeURIComponent(publicKey), @@ -91,6 +92,7 @@ "There was a technical problem while trying to register your address. Sorry."); }); + } catch (e) { alert("Whoops, unable to register verified email: " + e); } diff --git a/verifier/server/idassertion.js b/verifier/server/idassertion.js index 304a8bba2e125e4337724c5514bd4a0bdebd9b44..6fb36993e0adebeb58c0e4a34eaebaeaed83ae70 100644 --- a/verifier/server/idassertion.js +++ b/verifier/server/idassertion.js @@ -154,6 +154,7 @@ var Webfinger = (function() { method: 'GET', headers: { "Host": parsedurl.host} }; + console.log("Verifier: loading " + JSON.stringify(options)); var req = http.request(options, function(res) { res.setEncoding('utf8');