diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/jqueryRest.js | 101 | ||||
| -rw-r--r-- | src/srp.js | 86 | ||||
| -rw-r--r-- | src/srp_session.js | 21 |
3 files changed, 96 insertions, 112 deletions
diff --git a/src/jqueryRest.js b/src/jqueryRest.js index 54a0908..c439f67 100644 --- a/src/jqueryRest.js +++ b/src/jqueryRest.js @@ -1,38 +1,75 @@ -jqueryRest = function() { +srp.remote = (function(){ + var jqueryRest = (function() { - // we do not fetch the salt from the server - function register(session, callback) - { - sendVerifier(session, callback); - } + // we do not fetch the salt from the server + function register(session) { + return $.post("users.json", { user: session.signup() }); + } - function sendVerifier(session, callback) { - var salt = session.getSalt(); - $.post("users.json", { user: - { login: session.getI(), - password_salt: salt, - password_verifier: session.getV(salt).toString(16)} - }, callback); - } + function handshake(session) { + return $.post("sessions.json", session.handshake()); + } - function handshake(session, callback) { - $.post("sessions.json", { login: session.getI(), - A: session.getAstr()}, callback); - } + function authenticate(session) { + return $.ajax({ + url: "sessions/" + session.getI() + ".json", + type: 'PUT', + data: {client_auth: session.getM()} + }); + } - function authenticate(session, success) { - $.ajax({ - url: "sessions/" + session.getI() + ".json", - type: 'PUT', - data: {client_auth: session.getM()}, - success: success - }); - } + return { + register: register, + handshake: handshake, + authenticate: authenticate + }; + }()); - return { - register: register, - register_send_verifier: sendVerifier, - handshake: handshake, - authenticate: authenticate + + function signup(){ + jqueryRest.register(srp.session) + .success(srp.signedUp) + .error(srp.error) }; -}; + + function login(){ + jqueryRest.handshake(srp.session) + .success(receiveSalts) + .error(srp.error) + }; + + function receiveSalts(response){ + // B = 0 will make the algorithm always succeed + // -> refuse such a server answer + if(response.B === 0) { + srp.error("Server send random number 0 - could not login."); + } + else if(! response.salt || response.salt === 0) { + srp.error("Server failed to send salt - could not login."); + } + else + { + srp.session.calculations(response.salt, response.B); + jqueryRest.authenticate(srp.session) + .success(confirmAuthentication) + .error(srp.error); + } + }; + + // Receive M2 from the server and verify it + // If an error occurs, raise it as an alert. + function confirmAuthentication(response) + { + if (srp.session.validate(response.M2)) + srp.loggedIn(); + else + srp.error("Server key does not match"); + }; + + + return { + signup: signup, + login: login + } + +}()); @@ -1,86 +1,18 @@ -function SRP(remote, session) -{ - var srp = this; - session = session || new this.Session(); - remote = remote || new this.Remote(); - remote.onError = remote.onError || this.error; - session.onError = session.onError || this.error; - this.remote = remote; - this.session = session; +var srp = (function(){ - // Start the login process by identifying the user - this.identify = function(success, error) + function signup() { - store_callbacks(success, error); - remote.handshake(session, receive_salts); - - // Receive login salts from the server, start calculations - function receive_salts(response) - { - // B = 0 will make the algorithm always succeed - // -> refuse such a server answer - if(response.B === 0) { - srp.error("Server send random number 0 - could not login."); - } - else if(! response.salt || response.salt === 0) { - srp.error("Server failed to send salt - could not login."); - } - else - { - session.calculations(response.salt, response.B); - remote.authenticate(session, confirm_authentication); - } - } - - // Receive M2 from the server and verify it - // If an error occurs, raise it as an alert. - function confirm_authentication(response) - { - if (session.validate(response.M2)) - srp.success(); - else - srp.error("Server key does not match"); - }; - }; - - // Initiate the registration process - this.register = function(success, error) - { - store_callbacks(success, error); - remote.register(session, srp.registered_user); - }; - - // The user has been registered successfully, now login - this.registered_user = function(response) - { - if(response.errors) { - srp.error(response.errors) - } - else { - srp.identify(); - } - }; - - // Minimal error handling - set remote.onError to sth better to overwrite. - this.error = function(text) - { - alert(text); + this.remote.signup(); }; - // This function is called when authentication is successful. - // It's a dummy. Please hand the real thing to the call to identify. - this.success = function() + function login() { - alert("Login successful."); + this.remote.login(); }; - function store_callbacks(success, error) { - if (typeof success == "function") { - srp.success = success; - } - if (typeof error == "function") { - srp.error = error; - } + return { + signup: signup, + login: login } -}; +}()); diff --git a/src/srp_session.js b/src/srp_session.js index 8f45a44..b278993 100644 --- a/src/srp_session.js +++ b/src/srp_session.js @@ -1,4 +1,4 @@ -SRP.prototype.Session = function(login, password) { +srp.Session = function(login, password) { // Variables session will be used in the SRP protocol var Nstr = "eeaf0ab9adb38dd69c33f80afa8fc5e86072618775ff3c0b9ea2314c9c256576d674df7496ea81d3383b4813d692c6e0e0d5d8e250b98be48e495c1d6089dad15dc7d7b46154d6b6ce8ef4ad69b15d4982559b297bcf1885c529f566660e57ec68edbc3c05726cc02fd4cbf4976eaa9afd5138fe8376435b9fc61d2fc0eb06e3"; @@ -35,6 +35,22 @@ SRP.prototype.Session = function(login, password) { return Astr; }; + this.signup = function() { + var salt = this.getSalt(); + return { + login: this.getI(), + password_salt: salt, + password_verifier: this.getV(salt).toString(16) + }; + }; + + this.handshake = function() { + return { + login: this.getI(), + A: this.getAstr() + }; + }; + this.getAstr = function() { return Astr; } @@ -154,6 +170,5 @@ SRP.prototype.Session = function(login, password) { } return str; } +}; - -} |