Fixed forbidden handler

Author: Miel Vander Sande

lib/controllers/WebIDControllerExtension.js

@@ -5,6 +5,7 @@ var http = require('http'),
     lru = require('lru-cache'),
     parseCacheControl = require('parse-cache-control'),
     N3 = require('n3'),
+    N3Parser = N3.Parser,
     N3Util = N3.Util,
     Util = require('../Util');
 
@@ -29,24 +30,24 @@ WebIDControllerExtension.prototype._handleRequest = function (request, response,
       certificate = request.connection.getPeerCertificate();
 
   if (!(certificate.subject && certificate.subject.subjectAltName))
-    return this._handleNotAcceptable(request, response, next);
+    return this._handleForbidden(request, response);
 
   var webID = certificate.subject.subjectAltName.replace('uniformResourceIdentifier:', '');
   this._verifyWebID(webID, certificate.modulus, parseInt(certificate.exponent, 16),
   function (verified) {
-    console.log("WebID verified: ", verified);
+    console.log('WebID ' + webID + ' verified: ', verified);
 
     if (!verified)
-      return self._handleNotAcceptable(request, response, next);
+      return self._handleForbidden(request, response, webID);
 
     next();
   });
 };
 
 // Verify webID
 WebIDControllerExtension.prototype._verifyWebID = function (webID, modulus, exponent, callback) {
-  //request & parse
-  var parser = N3.Parser(),
+  // request & parse
+  var parser = n3parser(),
       candidates = {}, verified = false;
 
   parser.parse(processTriple);
@@ -56,40 +57,43 @@ WebIDControllerExtension.prototype._verifyWebID = function (webID, modulus, expo
       console.error('Cannot parse WebID: ' + error);
     else if (triple) {
       switch (triple.predicate) {
-        case CERT_NS + 'modulus':
-          var webidModulus = N3Util.getLiteralValue(triple.object);
-          // Apply parsing method by nodejs
-          webidModulus = webidModulus.slice(webidModulus.indexOf('00:') === 0 ? 3 : 0).replace(/:/g, '').toUpperCase();
-
-          if (modulus === webidModulus) {
-            console.log('WebID modulus verified');
-            if (candidates[triple.subject] && candidates[triple.subject] === exponent)
-              verified = true;
-            else
-              candidates[triple.subject] = webidModulus;
-          } else console.log('WebID modulus mismatch: %s (webid) <> %s (cert)', webidModulus, modulus);
-          break;
-        case CERT_NS + 'exponent':
-          var webidExponent = parseInt(N3Util.getLiteralValue(triple.object));
-
-          if (webidExponent === exponent) {
-            console.log('WebID exponent verified');
-            if (candidates[triple.subject] && candidates[triple.subject] === modulus)
-              verified = true;
-            else
-              candidates[triple.subject] = webidExponent;
-          } else console.log('WebID exponent mismatch: %s (webid) <> %s (cert)', webidExponent, exponent);
-          break;
+      case CERT_NS + 'modulus':
+        var webidModulus = N3Util.getLiteralValue(triple.object);
+        // Apply parsing method by nodejs
+        webidModulus = webidModulus.slice(webidModulus.indexOf('00:') === 0 ? 3 : 0).replace(/:/g, '').toUpperCase();
+
+        if (modulus === webidModulus) {
+          console.log('WebID modulus verified');
+          if (candidates[triple.subject] && candidates[triple.subject] === exponent)
+            verified = true;
+          else
+            candidates[triple.subject] = webidModulus;
+        }
+        else console.log('WebID modulus mismatch: %s (webid) <> %s (cert)', webidModulus, modulus);
+        break;
+      case CERT_NS + 'exponent':
+        var webidExponent = parseInt(N3Util.getLiteralValue(triple.object), 16);
+
+        if (webidExponent === exponent) {
+          console.log('WebID exponent verified');
+          if (candidates[triple.subject] && candidates[triple.subject] === modulus)
+            verified = true;
+          else
+            candidates[triple.subject] = webidExponent;
+        }
+        else console.log('WebID exponent mismatch: %s (webid) <> %s (cert)', webidExponent, exponent);
+        break;
       }
-    } else callback(verified);
+    }
+    else callback(verified);
   }
 
   // Try to get WebID from cache
   var webIDFile = this._cache.get(webID);
 
   if (webIDFile) {
-     parser.addChunk(webIDFile);
-     parser.end();
+    parser.addChunk(webIDFile);
+    parser.end();
   } else {
     var req = http.request(webID, function(res) {
       res.setEncoding('utf8');
@@ -116,9 +120,9 @@ WebIDControllerExtension.prototype._verifyWebID = function (webID, modulus, expo
   }
 };
 
-WebIDControllerExtension.prototype._handleNotAcceptable = function (request, response, next) {
+WebIDControllerExtension.prototype._handleForbidden = function (request, response, webID) {
   response.writeHead(401, { 'Content-Type': Util.MIME_PLAINTEXT });
-  response.end('Access to ' + request.url + ' is not allowed, WebID verification failed.');
+  response.end('Access to ' + request.url + ' is not allowed, verification for WebID ' + (webID || '') + '  failed.');
 };
 
 module.exports = WebIDControllerExtension;