summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2014-06-30 18:29:32 (UTC)
committer Michael Krelin <hacker@klever.net>2014-06-30 18:29:32 (UTC)
commit44963f7c48fa76b2bbf1cc8b63b84519c0cc4c6e (patch) (unidiff)
tree341198729a5462ef560c06ae8a93bdb3c653acf2
parent9d4ae3e240e8d82a5e500c1bfbf3b4e8a43c62c6 (diff)
downloadclipperz-44963f7c48fa76b2bbf1cc8b63b84519c0cc4c6e.zip
clipperz-44963f7c48fa76b2bbf1cc8b63b84519c0cc4c6e.tar.gz
clipperz-44963f7c48fa76b2bbf1cc8b63b84519c0cc4c6e.tar.bz2
reject zero A from the client (as per CLP-01-017)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/clipperz.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index 72b6c9f..842de31 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -152,48 +152,50 @@ var CLIPPERZ = module.exports = function(CONFIG) {
152 if(req.session.u!=r.u.u_id) return cb(new Error('user/OTP mismatch')); 152 if(req.session.u!=r.u.u_id) return cb(new Error('user/OTP mismatch'));
153 PG.Q( 153 PG.Q(
154 "UPDATE clipperz.theotp AS otp" 154 "UPDATE clipperz.theotp AS otp"
155 +" SET" 155 +" SET"
156 +" otps_id=CASE WHEN s.otps_code='REQUESTED' THEN (" 156 +" otps_id=CASE WHEN s.otps_code='REQUESTED' THEN ("
157 +" SELECT ss.otps_id FROM clipperz.otpstatus AS ss WHERE ss.otps_code='USED'" 157 +" SELECT ss.otps_id FROM clipperz.otpstatus AS ss WHERE ss.otps_code='USED'"
158 +" ) ELSE otp.otps_id END," 158 +" ) ELSE otp.otps_id END,"
159 +" otp_utime=current_timestamp" 159 +" otp_utime=current_timestamp"
160 +" FROM clipperz.otpstatus AS s, clipperz.theotp AS o" 160 +" FROM clipperz.otpstatus AS s, clipperz.theotp AS o"
161 +" WHERE" 161 +" WHERE"
162 +" o.otp_id=otp.otp_id AND otp.otps_id=s.otps_id" 162 +" o.otp_id=otp.otp_id AND otp.otps_id=s.otps_id"
163 +" AND otp.otp_id=$1 AND otp.u_id=$2" 163 +" AND otp.otp_id=$1 AND otp.u_id=$2"
164 +" RETURNING o.otps_id!=otp.otps_id AS yes, o.otp_ref", 164 +" RETURNING o.otps_id!=otp.otps_id AS yes, o.otp_ref",
165 [ req.session.otp, req.session.u ], 165 [ req.session.otp, req.session.u ],
166 function(e,r) { 166 function(e,r) {
167 if(e) return cb(e); 167 if(e) return cb(e);
168 if(!r.rowCount) return cb(new Error('no OTP found')); 168 if(!r.rowCount) return cb(new Error('no OTP found'));
169 r=r.rows[0]; 169 r=r.rows[0];
170 if(!r.yes) return cb(new Error('OTP is in a sorry state')); 170 if(!r.yes) return cb(new Error('OTP is in a sorry state'));
171 cb(null,{ref:r.otp_ref}); 171 cb(null,{ref:r.otp_ref});
172 }); 172 });
173 }] 173 }]
174 },function(e,r) { 174 },function(e,r) {
175 if(e) return cb(e); 175 if(e) return cb(e);
176 var A = BIGNUM(ppp.A,16);
177 if(A.eq(0)) return cb(new Error('Ground Zero'));
176 req.session.C = ppp.C; req.session.A = ppp.A; 178 req.session.C = ppp.C; req.session.A = ppp.A;
177 req.session.s = r.u.u_srp_s; req.session.v = r.u.u_srp_v; 179 req.session.s = r.u.u_srp_s; req.session.v = r.u.u_srp_v;
178 req.session.u = r.u.u_id; 180 req.session.u = r.u.u_id;
179 req.session.b = clipperz_random(); 181 req.session.b = clipperz_random();
180 req.session.B = srp_k.mul(BIGNUM(req.session.v,16)).add(srp_g.powm(BIGNUM(req.session.b,16),srp_n)).toString(16); 182 req.session.B = srp_k.mul(BIGNUM(req.session.v,16)).add(srp_g.powm(BIGNUM(req.session.b,16),srp_n)).toString(16);
181 var rv = {s:req.session.s,B:req.session.B} 183 var rv = {s:req.session.s,B:req.session.B}
182 if(r.otp && r.otp.otp_ref) rv.oneTimePassword=r.otp.otp_ref; 184 if(r.otp && r.otp.otp_ref) rv.oneTimePassword=r.otp.otp_ref;
183 res.res(rv); 185 res.res(rv);
184 }); 186 });
185 187
186 case 'credentialCheck': 188 case 'credentialCheck':
187 var u = clipperz_hash(BIGNUM(req.session.A,16).toString(10)+BIGNUM(req.session.B,16).toString(10)); 189 var u = clipperz_hash(BIGNUM(req.session.A,16).toString(10)+BIGNUM(req.session.B,16).toString(10));
188 var A = BIGNUM(req.session.A,16); 190 var A = BIGNUM(req.session.A,16);
189 var S = A.mul(BIGNUM(req.session.v,16).powm(BIGNUM(u,16),srp_n)).powm(BIGNUM(req.session.b,16),srp_n); 191 var S = A.mul(BIGNUM(req.session.v,16).powm(BIGNUM(u,16),srp_n)).powm(BIGNUM(req.session.b,16),srp_n);
190 var K = clipperz_hash(S.toString(10)); 192 var K = clipperz_hash(S.toString(10));
191 var M1 = clipperz_hash( 193 var M1 = clipperz_hash(
192 srp_hn 194 srp_hn
193 +clipperz_hash(req.session.C) 195 +clipperz_hash(req.session.C)
194 +BIGNUM(req.session.s,16).toString(10) 196 +BIGNUM(req.session.s,16).toString(10)
195 +A.toString(10) 197 +A.toString(10)
196 +BIGNUM(req.session.B,16).toString(10) 198 +BIGNUM(req.session.B,16).toString(10)
197 +K ); 199 +K );
198 if(M1!=ppp.M1) return res.res({error:'?'}); 200 if(M1!=ppp.M1) return res.res({error:'?'});
199 req.session.K = K; 201 req.session.K = K;