Skip to content

Commit 410fd55

Browse files
fix: re-enable WebID-TLS tests that were incorrectly disabled
The WebID-TLS tests were skipped in October 2019 (commit 778095a) when the tests were updated to properly test multiuser mode. The claim was that "TLS is broken", but the code was never actually broken - only the test infrastructure was incomplete. This commit: - Removes describe.skip/it.skip from acl-tls-test.mjs (5 instances) - Adds hosts setup to GitHub Actions CI for multiuser DNS resolution The hosts configuration (tim.localhost, nicola.localhost, nic.localhost) was present in the original Travis CI config but was lost during the migration to GitHub Actions in December 2020. The WebID-TLS authentication code itself has been intact and functional throughout - only the tests were disabled. Fixes #1841
1 parent 03b5ff4 commit 410fd55

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26+
# Setup hosts for WebID-TLS tests (multiuser mode requires *.localhost DNS)
27+
- name: Setup hosts for TLS tests
28+
run: |
29+
sudo echo "127.0.0.1 nic.localhost" | sudo tee -a /etc/hosts
30+
sudo echo "127.0.0.1 tim.localhost" | sudo tee -a /etc/hosts
31+
sudo echo "127.0.0.1 nicola.localhost" | sudo tee -a /etc/hosts
32+
2633
# extract repository name
2734
- if: github.event_name == 'pull_request'
2835
run: echo "REPO_NAME=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV

test/integration/acl-tls-test.mjs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,7 @@ const userCredentials = {
5757
}
5858
}
5959

60-
// TODO Remove skip. TLS is currently broken, but is not a priority to fix since
61-
// the current Solid spec does not require supporting webid-tls on the resource
62-
// server. The current spec only requires the resource server to support webid-oidc,
63-
// and it requires the IDP to support webid-tls as a log in method, so that users of
64-
// a webid-tls client certificate can still use their certificate (and not a
65-
// username/password pair or other login method) to "bridge" from webid-tls to
66-
// webid-oidc.
67-
describe.skip('ACL with WebID+TLS', function () {
60+
describe('ACL with WebID+TLS', function () {
6861
let ldpHttpsServer
6962
const serverConfig = {
7063
root: rootPath,
@@ -131,7 +124,7 @@ describe.skip('ACL with WebID+TLS', function () {
131124
})
132125
})
133126

134-
it.skip('should return a 401 and WWW-Authenticate header without credentials', (done) => {
127+
it('should return a 401 and WWW-Authenticate header without credentials', (done) => {
135128
rm('.acl')
136129
const options = {
137130
url: address + '/acl-tls/no-acl/',
@@ -568,7 +561,7 @@ describe.skip('ACL with WebID+TLS', function () {
568561
})
569562
})
570563

571-
describe.skip('Glob', function () {
564+
describe('Glob', function () {
572565
it('user2 should be able to send glob request', function (done) {
573566
const options = createOptions(globFile, 'user2')
574567
request.get(options, function (error, response, body) {
@@ -613,7 +606,7 @@ describe.skip('ACL with WebID+TLS', function () {
613606
done()
614607
})
615608
})
616-
it.skip('user1 should be able to PATCH a resource', function (done) {
609+
it('user1 should be able to PATCH a resource', function (done) {
617610
const options = createOptions('/acl-tls/append-inherited/test.ttl', 'user1')
618611
options.headers = {
619612
'content-type': 'application/sparql-update'
@@ -943,7 +936,7 @@ describe.skip('ACL with WebID+TLS', function () {
943936
// })
944937
})
945938

946-
describe.skip('Cleanup', function () {
939+
describe('Cleanup', function () {
947940
it('should remove all files and dirs created', function (done) {
948941
try {
949942
// must remove the ACLs in sync

0 commit comments

Comments
 (0)