solid-server 5.8.7 → 5.8.8-5fdbfa12

package/test/surface/docker/server/data/settings/serverSide.ttl.acl

@@ -0,0 +1,13 @@
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#owner>
+    a acl:Authorization;
+
+    acl:agent
+        </profile/card#me>;
+
+    acl:accessTo <./serverSide.ttl>;
+
+    acl:mode acl:Read .
+    

package/test/surface/docker/server/data/settings/serverSide.ttl.inactive

@@ -0,0 +1,12 @@
+@prefix dct: <http://purl.org/dc/terms/>.
+@prefix pim: <http://www.w3.org/ns/pim/space#>.
+@prefix solid: <http://www.w3.org/ns/solid/terms#>.
+
+<>
+  a pim:ConfigurationFile;
+
+  dct:description "Administrative settings for the POD that the user can only read." .
+
+</>
+    solid:storageQuota "25000000" .
+    

package/test/surface/docker/server/env.list

@@ -0,0 +1,4 @@
+ALICE_WEBID=https://server/profile/card#me
+SERVER_ROOT=https://server
+USERNAME=alice
+PASSWORD=123

package/test/surface/docker/solid-crud/Dockerfile

@@ -0,0 +1,4 @@
+FROM solidtestsuite/solid-crud-tests
+RUN git fetch origin
+RUN git checkout nss-skips
+RUN git pull

package/test/surface/docker/web-access-control/Dockerfile

@@ -0,0 +1 @@
+FROM solidtestsuite/web-access-control-tests

package/test/surface/docker/webid-provider/Dockerfile

@@ -0,0 +1 @@
+FROM solidtestsuite/webid-provider-tests

package/test/surface/run-solid-test-suite.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+set -e
+
+function setup {
+  echo Branch name: $1
+  echo Repoitory: $2
+  docker network create testnet
+  docker build -t server --build-arg BRANCH=$1 --build-arg REPO=$2 test/surface/docker/server
+  docker build -t cookie test/surface/docker/cookie
+  docker run -d --env-file test/surface/server-env.list --name server --network=testnet -v `pwd`:/travis -w /node-solid-server server /travis/bin/solid-test start --config-file /node-solid-server/config.json
+  docker run -d --env-file test/surface/thirdparty-env.list --name thirdparty --network=testnet -v `pwd`/test/surface:/surface server /node-solid-server/bin/solid-test start --config-file /surface/thirdparty-config.json
+}
+function teardown {
+  docker stop `docker ps --filter network=testnet -q`
+  docker rm `docker ps --filter network=testnet -qa`
+  docker network remove testnet
+}
+
+function waitForNss {
+  docker pull solidtestsuite/webid-provider-tests
+  until docker run --rm --network=testnet solidtestsuite/webid-provider-tests curl -kI https://$1 2> /dev/null > /dev/null
+  do
+    echo Waiting for $1 to start, this can take up to a minute ...
+    docker ps -a
+    docker logs $1
+    sleep 1
+  done
+
+  docker logs $1
+  echo Getting cookie for $1...
+  export COOKIE_$1="`docker run --cap-add=SYS_ADMIN --network=testnet --env-file test/surface/$1-env.list cookie`"
+}
+
+function runTests {
+  docker pull solidtestsuite/$1:$2
+
+  echo "Running $1 against server with cookie $COOKIE_server"
+  docker run --rm --network=testnet \
+    --env COOKIE="$COOKIE_server" \
+    --env COOKIE_ALICE="$COOKIE_server" \
+    --env COOKIE_BOB="$COOKIE_thirdparty" \
+    --env-file test/surface/$1-env.list solidtestsuite/$1:$2
+}
+
+function runTestsFromGit {
+  docker build https://github.com/solid-contrib/$1.git#$2 -t $1
+
+  echo "Running web-access-control-tests against server with cookie $COOKIE_server"
+  docker run --rm --network=testnet \
+    --env COOKIE="$COOKIE_server" \
+    --env COOKIE_ALICE="$COOKIE_server" \
+    --env COOKIE_BOB="$COOKIE_thirdparty" \
+    --env-file test/surface/$1-env.list $1
+}
+
+# ...
+teardown || true
+setup $1 $2
+waitForNss server
+runTests webid-provider-tests v2.0.3
+runTestsFromGit solid-crud-tests v6.0.0-issue#1743
+waitForNss thirdparty
+# runTests web-access-control-tests v7.1.0
+runTestsFromGit web-access-control-tests patchAppendNewDocument
+teardown
+
+# To debug, e.g. running web-access-control-tests jest interactively,
+# comment out `teardown` and uncomment this instead:
+# env
+# docker run -it --network=testnet \
+#     --env COOKIE="$COOKIE_server" \
+#     --env COOKIE_ALICE="$COOKIE_server" \
+#     --env COOKIE_BOB="$COOKIE_thirdparty" \
+#     --env-file test/surface/web-access-control-tests-env.list \
+#   solidtestsuite/web-access-control-tests:latest /bin/bash

package/test/surface/server-env.list

@@ -0,0 +1,5 @@
+ALICE_WEBID=https://server/profile/card#me
+SERVER_ROOT=https://server
+USERNAME=alice
+PASSWORD=123
+ACL_CACHE_TIME=5

package/test/surface/solid-crud-tests-env.list

@@ -0,0 +1,5 @@
+ALICE_WEBID=https://server/profile/card#me
+SERVER_ROOT=https://server
+USERNAME=alice
+PASSWORD=123
+SKIP_CONC=1

package/test/surface/thirdparty-config.json

@@ -0,0 +1,23 @@
+{
+  "root": "./data",
+  "port": "443",
+  "serverUri": "https://thirdparty",
+  "webid": true,
+  "mount": "/",
+  "configPath": "./config",
+  "configFile": "./config.json",
+  "dbPath": "./.db",
+  "sslKey": "./server.key",
+  "sslCert": "./server.cert",
+  "multiuser": false,
+  "server": {
+    "name": "server",
+    "description": "",
+    "logo": ""
+  },
+  "enforceToc": true,
+  "disablePasswordChecks": false,
+  "tocUri": "https://your-toc",
+  "supportEmail": "Your support email address"
+}
+

package/test/surface/thirdparty-env.list

@@ -0,0 +1,6 @@
+ALICE_WEBID=https://thirdparty/profile/card#me
+SERVER_ROOT=https://thirdparty
+USERNAME=alice
+PASSWORD=123
+ACL_CACHE_TIME=5
+

package/test/surface/web-access-control-tests-env.list

@@ -0,0 +1,6 @@
+WEBID_ALICE=https://server/profile/card#me
+OIDC_ISSUER_ALICE=https://server
+STORAGE_ROOT_ALICE=https://server/
+WEBID_BOB=https://thirdparty/profile/card#me
+OIDC_ISSUER_BOB=https://thirdparty
+STORAGE_ROOT_BOB=https://thirdparty/

package/test/surface/webid-provider-tests-env.list

@@ -0,0 +1,4 @@
+ALICE_WEBID=https://server/profile/card#me
+SERVER_ROOT=https://server
+USERNAME=alice
+PASSWORD=123

package/test/test-helpers.mjs

@@ -0,0 +1,63 @@
+// ESM Test Configuration
+import { performance as perf } from 'perf_hooks'
+export const testConfig = {
+  timeout: 10000,
+  slow: 2000,
+  nodeOptions: '--experimental-loader=esmock'
+}
+
+// Utility to create test servers with ESM modules
+export async function createTestServer (options = {}) {
+  const { default: createApp } = await import('../index.mjs')
+
+  const defaultOptions = {
+    port: 0, // Random port
+    serverUri: 'https://localhost',
+    webid: true,
+    multiuser: false,
+    ...options
+  }
+
+  const app = createApp(defaultOptions)
+  return app
+}
+
+// Utility to test ESM import functionality
+export async function testESMImport (modulePath) {
+  try {
+    const module = await import(modulePath)
+    return {
+      success: true,
+      module,
+      hasDefault: 'default' in module,
+      namedExports: Object.keys(module).filter(key => key !== 'default')
+    }
+  } catch (error) {
+    return {
+      success: false,
+      error: error.message
+    }
+  }
+}
+
+// Performance measurement utilities
+export class PerformanceTimer {
+  constructor () {
+    this.startTime = null
+    this.endTime = null
+  }
+
+  start () {
+    this.startTime = perf.now()
+    return this
+  }
+
+  end () {
+    this.endTime = perf.now()
+    return this.duration
+  }
+
+  get duration () {
+    return this.endTime - this.startTime
+  }
+}