@@ -6,45 +6,50 @@ var debug = require('./logging').login;
66
77function loginHandler ( req , res , next ) {
88 var ldp = req . app . locals . ldp ;
9+
10+ // No webid required? skip
911 if ( ! ldp . webid ) {
1012 setEmptySession ( req ) ;
1113 return next ( ) ;
1214 }
15+
16+ // User already logged in? skip
1317 if ( req . session . userId && req . session . identified ) {
1418 debug ( "User: " + req . session . userId ) ;
1519 res . set ( 'User' , req . session . userId ) ;
1620 return next ( ) ;
17- } else {
18- var certificate = req . connection . getPeerCertificate ( ) ;
19- if ( ! ( certificate === null || Object . keys ( certificate ) . length === 0 ) ) {
20- var verifAgent = new webid . VerificationAgent ( certificate ) ;
21- verifAgent . verify ( function ( err , result ) {
22- if ( err ) {
23- debug ( "Error processing certificate: " + err ) ;
24- setEmptySession ( req ) ;
25- var authError = new Error ( ) ;
26- authError . status = 403 ;
27- authError . message = err ;
28- return next ( authError ) ;
29- } else {
30- req . session . userId = result ;
31- req . session . identified = true ;
32- debug ( "Identified user: " + req . session . userId ) ;
33- res . set ( 'User' , req . session . userId ) ;
34- return next ( ) ;
35- }
36- } ) ;
37- } else {
38- debug ( "No client certificate found in the request. Did the user click on a cert?" ) ;
39- setEmptySession ( req ) ;
40- next ( ) ;
41- }
4221 }
4322
44- function setEmptySession ( req ) {
45- req . session . userId = "" ;
46- req . session . identified = false ;
23+ var certificate = req . connection . getPeerCertificate ( ) ;
24+ // Certificate is empty? skip
25+ if ( certificate === null || Object . keys ( certificate ) . length === 0 ) {
26+ debug ( "No client certificate found in the request. Did the user click on a cert?" ) ;
27+ setEmptySession ( req ) ;
28+ return next ( ) ;
4729 }
30+ var verifAgent = new webid . VerificationAgent ( certificate ) ;
31+
32+ // Verify webid
33+ verifAgent . verify ( function ( err , result ) {
34+ if ( err ) {
35+ debug ( "Error processing certificate: " + err ) ;
36+ setEmptySession ( req ) ;
37+ var authError = new Error ( ) ;
38+ authError . status = 403 ;
39+ authError . message = err ;
40+ return next ( authError ) ;
41+ }
42+ req . session . userId = result ;
43+ req . session . identified = true ;
44+ debug ( "Identified user: " + req . session . userId ) ;
45+ res . set ( 'User' , req . session . userId ) ;
46+ return next ( ) ;
47+ } ) ;
48+ }
49+
50+ function setEmptySession ( req ) {
51+ req . session . userId = "" ;
52+ req . session . identified = false ;
4853}
4954
5055exports . loginHandler = loginHandler ;
0 commit comments