Misc fixes

Author: dmitrizagidulin

lib/api/accounts/signin.js

@@ -10,6 +10,14 @@ function signin () {
       return res.status(400).send('This is not a valid URI')
     }
 
+    let ldp = req.app.locals.ldp
+    if (ldp.auth !== 'oidc') {
+      res
+        .status(500)
+        .send('Not implemented')
+      return
+    }
+
     request({ method: 'OPTIONS', uri: req.body.webid }, function (err, response) {
       if (err) {
         res.status(400).send('Did not find a valid endpoint')

lib/capability-discovery.js

@@ -31,26 +31,12 @@ function capabilityDiscovery (corsSettings) {
   var router = express.Router('/')
 
   // Advertise the server capability discover endpoint
-  router.options('*', serviceEndpointHeader, oidcIssuerHeader)
+  router.options('*', serviceEndpointHeader)
   router.get('/.well-known/solid', corsSettings,
     serviceCapabilityDocument(serviceConfig))
   return router
 }
 
-/**
- * Advertises the OIDC Issuer endpoint by returning a Link Relation header
- * of type `oidc.issuer` on an OPTIONS request.
- * Added to avoid an additional request to the serviceCapability document.
- * @param req
- * @param res
- * @param next
- */
-function oidcIssuerHeader (req, res, next) {
-  let oidcIssuerEndpoint = req.app.locals.oidcConfig.issuer
-  addLink(res, oidcIssuerEndpoint, 'oidc.issuer')
-  next()
-}
-
 /**
  * Advertises the server capability endpoint (adds a Link Relation
  * header of type `service`, points to the capability document).

lib/create-app.js

@@ -91,6 +91,8 @@ function createApp (argv = {}) {
 
   // OpenID Connect Auth
   if (oidcConfig && ldp.auth === 'oidc') {
+    app.options('*', oidcHandler.oidcIssuerHeader)
+    console.log('OIDC is on!')
     var oidcRpClient = new OidcRpClient()
     // TODO: ensureTrustedClient is async, fix race condition on server startup
     debug.idp('Initializing local/trusted client...')

lib/create-server.js

@@ -60,7 +60,6 @@ function createServer (argv) {
 
     if (ldp.webid && ldp.auth === 'tls') {
       credentials.requestCert = true
-      // requestCert: true
     }
 
     server = https.createServer(credentials, app)

lib/handlers/error-pages.js

@@ -12,19 +12,20 @@ function handler (err, req, res, next) {
   // If the user specifies this function
   // then, they can customize the error programmatically
   if (ldp.errorHandler) {
-    return ldp.errorHandler(req, res, next)
+    return ldp.errorHandler(err, req, res, next)
   }
 
   // If noErrorPages is set,
   // then use built-in express default error handler
   if (ldp.noErrorPages) {
-    if (err.status === 401 && req.accepts('text/html')) {
+    if (err.status === 401 &&
+        req.accepts('text/html') &&
+        ldp.auth === 'oidc') {
       debug('On error pages redirect on 401')
       res.status(err.status)
       redirectToLogin(req, res, next)
       return
     }
-
     res
       .status(err.status)
       .send(err.message + '\n' || '')

lib/handlers/oidc.js

@@ -12,6 +12,7 @@ var path = require('path')
 module.exports.api = api
 module.exports.authenticate = authenticate
 module.exports.rpCallback = rpCallback
+module.exports.oidcIssuerHeader = oidcIssuerHeader
 
 /**
  * OIDC Relying Party API middleware.
@@ -44,6 +45,20 @@ function api (corsSettings) {
   return router
 }
 
+/**
+ * Advertises the OIDC Issuer endpoint by returning a Link Relation header
+ * of type `oidc.issuer` on an OPTIONS request.
+ * Added to avoid an additional request to the serviceCapability document.
+ * @param req
+ * @param res
+ * @param next
+ */
+function oidcIssuerHeader (req, res, next) {
+  let oidcIssuerEndpoint = req.app.locals.oidcConfig.issuer
+  addLink(res, oidcIssuerEndpoint, 'oidc.issuer')
+  next()
+}
+
 /**
  * Authenticates an incoming request. Extracts & verifies access token,
  * creates an OIDC client if necessary, etc.

lib/ldp-middleware.js

@@ -3,7 +3,7 @@ module.exports = LdpMiddleware
 var express = require('express')
 var header = require('./header')
 var acl = require('./acl')
-// var authentication = require('./handlers/authentication')
+var authentication = require('./handlers/authentication')
 var get = require('./handlers/get')
 var post = require('./handlers/post')
 var put = require('./handlers/put')
@@ -21,7 +21,7 @@ function LdpMiddleware (corsSettings) {
     router.use(corsSettings)
   }
 
-  // router.use('/*', authentication)
+  router.use('/*', authentication)
   router.get('/*', index, acl.allow('Read'), get)
   router.post('/*', acl.allow('Append'), post)
   router.patch('/*', acl.allow('Append'), patch)

lib/oidc-rp-client.js

@@ -1,6 +1,4 @@
 'use strict'
-var express = require('express')
-
 const OIDClientStore = require('./oidc-client-store')
 const OIDCExpressClient = require('anvil-connect-express')
 var debug = require('./debug')