Fixed all tests, rebased on v5.0.0

Author: megoth

bin/lib/cli-utils.js

@@ -6,6 +6,7 @@ const AccountManager = require('../../lib/models/account-manager')
 const SolidHost = require('../../lib/models/solid-host')
 
 module.exports.getAccountManager = getAccountManager
+module.exports.loadAccounts = loadAccounts
 module.exports.loadConfig = loadConfig
 module.exports.loadUsernames = loadUsernames
 
@@ -47,11 +48,23 @@ function loadConfig (program, options) {
   return argv
 }
 
-function loadUsernames (config) {
-  const files = fs.readdirSync(config.root)
-  const hostname = new URL(config.serverUri).hostname
+/**
+ *
+ * @param root
+ * @param [serverUri] If not set, hostname must be set
+ * @param [hostname] If not set, serverUri must be set
+ * @returns {*}
+ */
+function loadAccounts ({ root, serverUri, hostname }) {
+  const files = fs.readdirSync(root)
+  hostname = hostname || new URL(serverUri).hostname
   const isUserDirectory = new RegExp(`.${hostname}$`)
   return files
     .filter(file => isUserDirectory.test(file))
+}
+
+function loadUsernames ({ root, serverUri }) {
+  const hostname = new URL(serverUri).hostname
+  return loadAccounts({ root, hostname })
     .map(userDirectory => userDirectory.substr(0, userDirectory.length - hostname.length - 1))
 }

bin/lib/updateIndex.js

@@ -4,9 +4,10 @@ const cheerio = require('cheerio')
 const LDP = require('../../lib/ldp')
 const { URL } = require('url')
 const debug = require('../../lib/debug')
+const { readFile } = require('../../lib/common/fs-utils')
 
 const { compileTemplate, writeTemplate } = require('../../lib/common/template-utils')
-const { getAccountManager, loadConfig, loadUsernames } = require('./cli-utils')
+const { loadConfig, loadAccounts } = require('./cli-utils')
 const { getName, getWebId } = require('../../lib/common/user-utils')
 const { initConfigDir, initTemplateDirs } = require('../../lib/server-config')
 
@@ -21,21 +22,20 @@ module.exports = function (program) {
       const indexTemplatePath = path.join(templates.account, 'index.html')
       const indexTemplate = await compileTemplate(indexTemplatePath)
       const ldp = new LDP(config)
-      const accountManager = getAccountManager(config, { ldp })
-      const usernames = loadUsernames(config)
-      const usersProcessed = usernames.map(async username => {
-        const accountDirectory = accountManager.accountDirFor(username)
-        const indexFilePath = path.join(accountDirectory, 'index.html')
+      const accounts = loadAccounts(config)
+      const usersProcessed = accounts.map(async account => {
+        const accountDirectory = path.join(config.root, account)
+        const indexFilePath = path.join(accountDirectory, '/index.html')
         if (!isUpdateAllowed(indexFilePath)) {
           return
         }
-        const accountUrl = getAccountUrl(username, config)
+        const accountUrl = getAccountUrl(account, config)
         try {
-          const webId = await getWebId(accountDirectory, accountUrl, { ldp })
-          const name = await getName(webId, { ldp })
+          const webId = await getWebId(accountDirectory, accountUrl, ldp.suffixMeta, (filePath) => readFile(filePath))
+          const name = await getName(webId, ldp.fetchGraph)
           writeTemplate(indexFilePath, indexTemplate, { name, webId })
         } catch (err) {
-          debug.errors(`Failed to create new index for ${username}: ${JSON.stringify(err, null, 2)}`)
+          debug.errors(`Failed to create new index for ${account}: ${JSON.stringify(err, null, 2)}`)
         }
       })
       await Promise.all(usersProcessed)

lib/common/template-utils.js

@@ -49,17 +49,3 @@ function writeTemplate (filePath, template, substitutions) {
   writeFile(filePath, source)
 }
 
-function writeTemplate (filePath, template, substitutions) {
-  const source = template(substitutions)
-  writeFile(filePath, source)
-}
-
-function writeTemplate (filePath, template, substitutions) {
-  const source = template(substitutions)
-  writeFile(filePath, source)
-}
-
-function writeTemplate (filePath, template, substitutions) {
-  const source = template(substitutions)
-  writeFile(filePath, source)
-}

lib/common/user-utils.js

@@ -1,25 +1,22 @@
 const $rdf = require('rdflib')
 
-const LDP = require('../ldp')
-
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 const VCARD = $rdf.Namespace('http://www.w3.org/2006/vcard/ns#')
 
 module.exports.getName = getName
 module.exports.getWebId = getWebId
 module.exports.isValidUsername = isValidUsername
 
-async function getName (webId, options = {}) {
-  const ldp = setupLDP(options)
-  const graph = await ldp.fetchGraph(webId)
+async function getName (webId, fetchGraph) {
+  const graph = await fetchGraph(webId)
   const nameNode = graph.any($rdf.sym(webId), VCARD('fn'))
   return nameNode.value
 }
 
-async function getWebId (accountDirectory, accountUrl, options = {}) {
-  const ldp = setupLDP(options)
-  const metaFileUri = `${accountUrl}/${ldp.suffixMeta}`
-  const metaData = await ldp.readContainerMeta(accountDirectory)
+async function getWebId (accountDirectory, accountUrl, suffixMeta, fetchData) {
+  const metaFilePath = `${accountDirectory}/${suffixMeta}`
+  const metaFileUri = `${accountUrl}${suffixMeta}`
+  const metaData = await fetchData(metaFilePath)
   const metaGraph = $rdf.graph()
   $rdf.parse(metaData, metaGraph, metaFileUri, 'text/turtle')
   const webIdNode = metaGraph.any(undefined, SOLID('account'), $rdf.sym(accountUrl))
@@ -29,10 +26,3 @@ async function getWebId (accountDirectory, accountUrl, options = {}) {
 function isValidUsername (username) {
   return /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(username)
 }
-
-function setupLDP (options) {
-  if (!options.ldp && !options.config) {
-    throw new Error('Require ldp or config set in options for getWebId')
-  }
-  return options.ldp || new LDP(options.config)
-}

lib/handlers/index.js

@@ -20,7 +20,7 @@ async function handler (req, res, next) {
     }
     // redirect to the right container if missing trailing /
     if (req.path.lastIndexOf('/') !== req.path.length - 1) {
-      return res.redirect(301, path.join(req.path, '/'))
+      return res.redirect(301, req.path + '/')
     }
 
     if (requestedType && requestedType.indexOf('text/html') !== 0) {
@@ -30,7 +30,7 @@ async function handler (req, res, next) {
 
     // Check if file exists in first place
     await ldp.exists(req.hostname, path.join(req.path, indexFile))
-    res.locals.path = path.join(req.path, indexFile)
+    res.locals.path = url.resolve(req.path, indexFile)
     debug('Found an index for current path')
   } catch (e) {
     // Ignore errors

lib/ldp.js

@@ -102,7 +102,7 @@ class LDP {
       const { path } = await this.resourceMapper.mapUrlToFile({ url })
       return await promisify(fs.readFile)(path, {'encoding': 'utf8'})
     } catch (err) {
-      throw error(404, "Can't read file")
+      throw error(err.status, err.message)
     }
   }
 
@@ -284,7 +284,7 @@ class LDP {
     }
     const body = await response.text()
 
-    return promisify(parse)(body, uri, getContentType(response.headers))
+    return parse(body, uri, getContentType(response.headers))
   }
 
   /**

lib/resource-mapper.js

@@ -3,6 +3,7 @@ const URL = require('url')
 const { promisify } = require('util')
 const { types, extensions } = require('mime-types')
 const readdir = promisify(fs.readdir)
+const HTTPError = require('./http-error')
 
 // A ResourceMapper maintains the mapping between HTTP URLs and server filenames,
 // following the principles of the “sweet spot” discussed in
@@ -79,7 +80,7 @@ class ResourceMapper {
         if (isIndex) {
           match = ''
         } else {
-          throw new Error(`File not found: ${fullPath}`)
+          throw new HTTPError(404, `File not found: ${fullPath}`)
         }
       }
       path = `${folder}${match}`

lib/utils.js

@@ -10,6 +10,7 @@ module.exports.routeResolvedFile = routeResolvedFile
 module.exports.getQuota = getQuota
 module.exports.overQuota = overQuota
 module.exports.getContentType = getContentType
+module.exports.parse = parse
 
 const fs = require('fs')
 const path = require('path')
@@ -69,6 +70,22 @@ function debrack (s) {
   return s.substring(1, s.length - 1)
 }
 
+async function parse (data, baseUri, contentType) {
+  const graph = $rdf.graph()
+  return new Promise((resolve, reject) => {
+    try {
+      return $rdf.parse(data, graph, baseUri, contentType, (err, str) => {
+        if (err) {
+          return reject(err)
+        }
+        resolve(str)
+      })
+    } catch (err) {
+      return reject(err)
+    }
+  })
+}
+
 function pathBasename (fullpath) {
   let bname = ''
   if (fullpath) {

test/resources/accounts-acl/tim.localhost/write-acl/test-file$.txt

@@ -0,0 +1 @@
+<a> <b> <c> .

test/resources/acl-tls/write-acl/test-file$.ttl

@@ -0,0 +1 @@
+<a> <b> <c> .