Skip to content

No slashes in sosa & ssn term names and updates to the tests #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bert-github wants to merge 4 commits into
base: main
Choose a base branch
from
Open

No slashes in sosa & ssn term names and updates to the tests #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eda0ad2
Do not silently accept requests for subdirectories
bert-github Apr 22, 2026
01d2a88
Do not silently accept requests for subdirectories
bert-github Apr 22, 2026
4b645c0
A request for x/y should now return 404
bert-github Apr 22, 2026
89a0f2c
A request for x/y should now return 404
bert-github Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sosa/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RewriteRule ^$ sosa?term= [N]
######################################################################
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{QUERY_STRING} =""
RewriteRule ^(.*)$ sosa?term=$1 [N]
RewriteRule ^([^/]*)$ sosa?term=$1 [N]

######################################################################
# Request for /ns/sosa/sosa.html?term=foo where foo is not empty.
Expand Down
80 changes: 40 additions & 40 deletions sosa/regression-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,48 @@ base="https://www.w3.org/ns/sosa"
# 5. expected final URL (only used if response = 200)
#
tests=(
0 'text/html,*/*;q=0.8' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
1 'text/html,*/*;q=0.8' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
2 'text/html,*/*;q=0.8' '/sosa' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
3 'text/html,*/*;q=0.8' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
4 'text/html,*/*;q=0.8' '/sosa.ttl' 200 'text/turtle' "$base/sosa.ttl"
5 'text/html,*/*;q=0.8' '/om' 200 'text/turtle' "$base/om"
6 'text/html,*/*;q=0.8' '/Actuation' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAActuation'
0 'text/html,*/*;q=0.8' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
1 'text/html,*/*;q=0.8' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
2 'text/html,*/*;q=0.8' '/sosa' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
3 'text/html,*/*;q=0.8' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
4 'text/html,*/*;q=0.8' '/sosa.ttl' 200 'text/turtle; charset=utf-8' "$base/sosa.ttl"
5 'text/html,*/*;q=0.8' '/om' 200 'text/turtle; charset=utf-8' "$base/om"
6 'text/html,*/*;q=0.8' '/Actuation' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAActuation'

8 'text/html,*/*;q=0.8' '/sosa?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
9 'text/html,*/*;q=0.8' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx'
10 'text/html,*/*;q=0.8' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx/y'
11 'text/html,*/*;q=0.8' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
12 'text/html' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
13 'text/html' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
14 'text/html' '/sosa' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
15 'text/html' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
16 'text/html' '/sosa.ttl' 200 'text/turtle' "$base/sosa.ttl"
17 'text/html' '/om' 406 '-' '-'
18 'text/html' '/Actuation' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAActuation'
8 'text/html,*/*;q=0.8' '/sosa?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
9 'text/html,*/*;q=0.8' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx'
10 'text/html,*/*;q=0.8' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx/y'
11 'text/html,*/*;q=0.8' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
12 'text/html' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
13 'text/html' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
14 'text/html' '/sosa' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
15 'text/html' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
16 'text/html' '/sosa.ttl' 200 'text/turtle; charset=utf-8' "$base/sosa.ttl"
17 'text/html' '/om' 406 '-' '-'
18 'text/html' '/Actuation' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAActuation'

20 'text/html' '/sosa?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
21 'text/html' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx'
22 'text/html' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx/y'
23 'text/html' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
24 '' '' 200 'text/turtle' "$base/"
25 '' '/' 200 'text/turtle' "$base/"
26 '' '/sosa' 200 'text/turtle' "$base/sosa"
27 '' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
28 '' '/sosa.ttl' 200 'text/turtle' "$base/sosa.ttl"
29 '' '/om' 200 'text/turtle' "$base/om"
30 '' '/Actuation' 200 'text/turtle' "$base/Actuation"
31 '' '/prov' 200 'text/turtle' "$base/prov/"
32 '' '/sosa?query' 200 'text/turtle' "$base/sosa?query"
33 '' '/x?y' 200 'text/turtle' "$base/x?y"
34 '' '/x/y' 200 'text/turtle' "$base/x/y"
35 '' '/?foo' 200 'text/turtle' "$base/?foo"
36 'text/html,text/turtle' '/' 200 'text/turtle' "$base/"
37 'application/rdf+xml' '/' 200 'application/rdf+xml' "$base/"
38 'text/turtle' '/hosts' 200 'text/turtle' "$base/hosts"
39 '*/*' '/' 200 'text/turtle' "$base/"
40 'text/html,*/*;qs=0.8' '/x?term=y' 404 '-' '-'
41 'text/turtle,text/html;qs=0.1' '/' 200 'text/turtle' "$base/"
20 'text/html' '/sosa?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
21 'text/html' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx'
22 'text/html' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SOSAx/y'
23 'text/html' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
24 '' '' 200 'text/turtle; charset=utf-8' "$base/"
25 '' '/' 200 'text/turtle; charset=utf-8' "$base/"
26 '' '/sosa' 200 'text/turtle; charset=utf-8' "$base/sosa"
27 '' '/sosa.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
28 '' '/sosa.ttl' 200 'text/turtle; charset=utf-8' "$base/sosa.ttl"
29 '' '/om' 200 'text/turtle; charset=utf-8' "$base/om"
30 '' '/Actuation' 200 'text/turtle; charset=utf-8' "$base/Actuation"
31 '' '/prov' 200 'text/turtle; charset=utf-8' "$base/prov/"
32 '' '/sosa?query' 200 'text/turtle; charset=utf-8' "$base/sosa?query"
33 '' '/x?y' 200 'text/turtle; charset=utf-8' "$base/x?y"
34 '' '/x/y' 404 '-' '-'
35 '' '/?foo' 200 'text/turtle; charset=utf-8' "$base/?foo"
36 'text/html,text/turtle' '/' 200 'text/turtle; charset=utf-8' "$base/"
37 'application/rdf+xml' '/' 200 'application/rdf+xml; qs=0.9' "$base/"
38 'text/turtle' '/hosts' 200 'text/turtle; charset=utf-8' "$base/hosts"
39 '*/*' '/' 200 'text/turtle; charset=utf-8' "$base/"
40 'text/html,*/*;qs=0.8' '/x?term=y' 404 '-' '-'
41 'text/turtle,text/html;qs=0.1' '/' 200 'text/turtle; charset=utf-8' "$base/"
)

for ((i = 0; 6 * i < ${#tests[@]}; i++)); do
Expand Down
2 changes: 1 addition & 1 deletion ssn/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ RewriteRule ^$ ssn?term= [N]
######################################################################
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{QUERY_STRING} =""
RewriteRule ^(.*)$ ssn?term=$1 [N]
RewriteRule ^([^/]*)$ ssn?term=$1 [N]

######################################################################
# Request for ssn.html?term=foo where foo is not empty. Return
Expand Down
78 changes: 39 additions & 39 deletions ssn/regression-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,48 @@ base="https://www.w3.org/ns/ssn"
# 5. expected final URL (only used if response = 200)
#
tests=(
0 'text/html,*/*;q=0.8' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
1 'text/html,*/*;q=0.8' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
2 'text/html,*/*;q=0.8' '/ssn' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
3 'text/html,*/*;q=0.8' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
4 'text/html,*/*;q=0.8' '/ssn.ttl' 200 'text/turtle' "$base/ssn.ttl"
5 'text/html,*/*;q=0.8' '/dul' 200 'text/turtle' "$base/dul"
6 'text/html,*/*;q=0.8' '/System' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNSystem'
0 'text/html,*/*;q=0.8' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
1 'text/html,*/*;q=0.8' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
2 'text/html,*/*;q=0.8' '/ssn' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
3 'text/html,*/*;q=0.8' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
4 'text/html,*/*;q=0.8' '/ssn.ttl' 200 'text/turtle; charset=utf-8' "$base/ssn.ttl"
5 'text/html,*/*;q=0.8' '/dul' 200 'text/turtle; charset=utf-8' "$base/dul"
6 'text/html,*/*;q=0.8' '/System' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNSystem'

8 'text/html,*/*;q=0.8' '/ssn?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
9 'text/html,*/*;q=0.8' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx'
10 'text/html,*/*;q=0.8' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx/y'
11 'text/html,*/*;q=0.8' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
12 'text/html' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
13 'text/html' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
14 'text/html' '/ssn' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
15 'text/html' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
16 'text/html' '/ssn.ttl' 200 'text/turtle' "$base/ssn.ttl"
17 'text/html' '/dul' 406 '-' '-'
18 'text/html' '/System' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNSystem'
8 'text/html,*/*;q=0.8' '/ssn?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
9 'text/html,*/*;q=0.8' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx'
10 'text/html,*/*;q=0.8' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx/y'
11 'text/html,*/*;q=0.8' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
12 'text/html' '' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
13 'text/html' '/' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
14 'text/html' '/ssn' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
15 'text/html' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
16 'text/html' '/ssn.ttl' 200 'text/turtle; charset=utf-8' "$base/ssn.ttl"
17 'text/html' '/dul' 406 '-' '-'
18 'text/html' '/System' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNSystem'

20 'text/html' '/ssn?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
21 'text/html' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx'
22 'text/html' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx/y'
23 'text/html' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
24 '' '' 200 'text/turtle' "$base/"
25 '' '/' 200 'text/turtle' "$base/"
26 '' '/ssn' 200 'text/turtle' "$base/ssn"
27 '' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
28 '' '/ssn.ttl' 200 'text/turtle' "$base/ssn.ttl"
29 '' '/dul' 200 'text/turtle' "$base/dul"
30 '' '/System' 200 'text/turtle' "$base/System"
20 'text/html' '/ssn?query' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
21 'text/html' '/x?y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx'
22 'text/html' '/x/y' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/#SSNx/y'
23 'text/html' '/?foo' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
24 '' '' 200 'text/turtle; charset=utf-8' "$base/"
25 '' '/' 200 'text/turtle; charset=utf-8' "$base/"
26 '' '/ssn' 200 'text/turtle; charset=utf-8' "$base/ssn"
27 '' '/ssn.html' 200 'text/html; charset=utf-8' 'https://www.w3.org/TR/vocab-ssn/'
28 '' '/ssn.ttl' 200 'text/turtle; charset=utf-8' "$base/ssn.ttl"
29 '' '/dul' 200 'text/turtle; charset=utf-8' "$base/dul"
30 '' '/System' 200 'text/turtle; charset=utf-8' "$base/System"

32 '' '/ssn?query' 200 'text/turtle' "$base/ssn?query"
33 '' '/x?y' 200 'text/turtle' "$base/x?y"
34 '' '/x/y' 200 'text/turtle' "$base/x/y"
35 '' '/?foo' 200 'text/turtle' "$base/?foo"
36 'text/html,text/turtle' '/' 200 'text/turtle' "$base/"
37 'application/rdf+xml' '/' 200 'application/rdf+xml' "$base/"
38 'text/turtle' '/hosts' 200 'text/turtle' "$base/hosts"
39 '*/*' '/' 200 'text/turtle' "$base/"
40 'text/html,*/*;qs=0.8' '/x?term=y' 404 '-' '-'
41 'text/turtle,text/html;qs=0.1' '/' 200 'text/turtle' "$base/"
32 '' '/ssn?query' 200 'text/turtle; charset=utf-8' "$base/ssn?query"
33 '' '/x?y' 200 'text/turtle; charset=utf-8' "$base/x?y"
34 '' '/x/y' 200 '-' '-'
35 '' '/?foo' 200 'text/turtle; charset=utf-8' "$base/?foo"
36 'text/html,text/turtle' '/' 200 'text/turtle; charset=utf-8' "$base/"
37 'application/rdf+xml' '/' 200 'application/rdf+xml; qs=0.9' "$base/"
38 'text/turtle' '/hosts' 200 'text/turtle; charset=utf-8' "$base/hosts"
39 '*/*' '/' 200 'text/turtle; charset=utf-8' "$base/"
40 'text/html,*/*;qs=0.8' '/x?term=y' 404 '-' '-'
41 'text/turtle,text/html;qs=0.1' '/' 200 'text/turtle; charset=utf-8' "$base/"
)

for ((i = 0; 6 * i < ${#tests[@]}; i++)); do
Expand Down