nodeSolidServer · anupamme · Mar 18, 2024 · Mar 21, 2024 · Mar 21, 2024 · Mar 21, 2024
diff --git a/.acl b/.acl
@@ -0,0 +1,10 @@
+# Root ACL resource for the root
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+    acl:agentClass foaf:Agent;  # everyone
+    acl:accessTo </>;
+    acl:default </common/>;
+    acl:mode acl:Read.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,19 @@
+# Force bash scripts to have unix line endings
+*.sh text eol=lf
+
+# Force bin files (executable scripts) to have unix line endings  
+bin/* text eol=lf
+
+# Ensure batch files on Windows keep CRLF line endings
+*.bat text eol=crlf
+
+# Binary files should not be modified
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.pdf binary
+*.zip binary
+*.tar.gz binary
+*.tgz binary
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,163 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+    tags: ['*']
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        node-version: [ '^22.14.0' ]
+        os: [ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    # extract repository name
+    - if: github.event_name == 'pull_request'
+      run: echo "REPO_NAME=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV
+
+    - if: github.event_name != 'pull_request'
+      run: echo "REPO_NAME=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
+
+    # extract branch name
+    - if: github.event_name == 'pull_request'
+      run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
+
+    - if: github.event_name != 'pull_request'
+      run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+
+    # print repository name
+    - name: Get repository name
+      run: echo 'The repository name is' $REPO_NAME
+
+    # print branch name
+    - name: Get branch name
+      run: echo 'The branch name is' $BRANCH_NAME
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    # test code
+    - run: npm run lint
+    - run: npm run validate
+    - run: npm run c8
+    # Test global install of the package
+    - run: npm pack .
+    - run: npm install -g solid-server-*.tgz
+    # Run the Solid test-suite
+    - run: bash test/surface/run-solid-test-suite.sh $BRANCH_NAME $REPO_NAME
+    - name: Save build
+      # if: matrix.node-version == '20.x'
+      uses: actions/upload-artifact@v5
+      with:
+        name: build
+        path: |
+          .
+          !node_modules
+        retention-days: 1
+
+  # The pipeline automate publication to npm, so that the docker build gets the correct version
+  npm-publish-build:
+    needs: [build]
+    name: Publish to npm  
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v6
+        with:
+          name: build
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 22.x
+      - uses: rlespinasse/github-slug-action@v3.x
+      - name: Append commit hash to package version
+        run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
+      - name: Disable pre- and post-publish actions
+        run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
+      - uses: JS-DevTools/npm-publish@v4.1.0
+        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          tag: ${{ env.GITHUB_REF_SLUG }}
+
+  npm-publish-latest:
+    needs: [build, npm-publish-build]
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: actions/download-artifact@v6
+        with:
+          name: build
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 20.x
+      - name: Disable pre- and post-publish actions
+        run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
+      - uses: JS-DevTools/npm-publish@v4.1.0
+        if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          tag: latest  
+
+  # This job will only dockerize solid-server@latest / solid-server@<tag-name> from npmjs.com!
+  docker-hub:
+    needs: build
+    name: Publish to docker hub
+    if: github.event_name != 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - uses: olegtarasov/get-tag@v2.1
+        id: tagName
+        with:
+          tagRegex: "v?(?<version>.*)"
+
+      - name: Lint dockerfile
+        working-directory: docker-image
+        run: pwd && ls -lah && make lint
+
+      - name: Run tests
+        working-directory: docker-image
+        run: SOLID_SERVER_VERSION=${{ steps.tagName.outputs.version }} make test
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: nodesolidserver/node-solid-server
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker-image/src
+          build-args: SOLID_SERVER_VERSION=${{ steps.tagName.outputs.version }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@
 /data
 /coverage
 /node_modules
-/npm-debug.log
+/npm-debug.log
+.history/
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v13.2.0
+v18.19.0
diff --git a/.travis.yml b/.travis.yml
diff --git a/.well-known/.acl b/.well-known/.acl
@@ -0,0 +1,15 @@
+# ACL for the default .well-known/ resource
+# Server operators will be able to override it as they wish
+# Public-readable
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo </.well-known/>;
+
+    acl:mode acl:Read.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,29 @@
 # History
+## 6.0.0
+- CommonJs to ESM (.mjs)
+- support for mashlib >= 2.0.0
+- support solid-OIDC with WebID scope, es256, and rfc9702
+
+## 6.0.0 Upgrade Notes
+
+1.0 Automatically recreated
+- delete `.db/oidc/op/provider.json`
+- delete `config/templates/emails`
+  If not recreated then copy from `default-emails`
+  If there was some personalisation these need to be redone
+
+2.0 Manuel update the `index.html` in server root `data/<serverOrigin>/index.html`
+  edit `common/js/index-buttons.js` to `index-buttons.mjs`
+
+## 5.3.0
+- Support for webid-oidc with DPop tokens
+
+## 5.3.0 Upgrade Notes
+You may have a `.db/oidc/op/provider.json` file that was generated by an older version
+of node-solid-server, which may still specify `"response_types_supported"` without listing
+`"id_token code"`. You can move this file out of the way and restart node-solid-server,
+it will be created again. See https://github.com/solid/node-solid-server/issues/1433 for
+more info.
 
 ## 5.0.0
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,14 @@
-FROM node:8.11.2-onbuild
+FROM node:lts
+
+# build
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+COPY package.json /usr/src/app/
+COPY package-lock.json /usr/src/app/
+RUN npm install
+COPY . /usr/src/app
+
+# start
 EXPOSE 8443
 COPY config.json-default config.json
 RUN openssl req \