Skip to content

issues 1707-1708 #1710

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

Merged
bourgeoa merged 1 commit into from
Nov 12, 2022
Merged

issues 1707-1708 #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions lib/handlers/put.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ async function handler (req, res, next) {
res.header('MS-Author-Via', 'SPARQL')

const contentType = req.get('content-type')
if (isAuxiliary(req)) {
// check for valid rdf content for auxiliary resource and /profile/card
// in future we may check that /profile/card is a minimal valid WebID card
if (isAuxiliary(req) || req.originalUrl === '/profile/card') {
if (contentType === 'text/turtle') {
return bodyParser.text({ type: () => true })(req, res, () => putAuxiliary(req, res, next))
return bodyParser.text({ type: () => true })(req, res, () => putValidRdf(req, res, next))
} else return next(new HTTPError(415, 'RDF file contains invalid syntax'))
}
return putStream(req, res, next)
Expand All @@ -37,7 +39,7 @@ async function putStream (req, res, next, stream = req) {

// needed to avoid breaking access with bad acl
// or breaking containement triples for meta
function putAuxiliary (req, res, next) {
function putValidRdf (req, res, next) {
const ldp = req.app.locals.ldp
const contentType = req.get('content-type')
const requestUri = ldp.resourceMapper.getRequestUrl(req)
Expand Down
4 changes: 2 additions & 2 deletions lib/ldp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@ class LDP {
return this.deleteContainer(path)
} else {
// DELETE method not allowed on podRoot/.acl
if ((url.url || url) === '/' + this.suffixAcl) {
throw error(405, 'DELETE of PodRoot/.acl is not allowed')
if (['/' + this.suffixAcl, '/profile/card'].some(item => (url.url || url) === item)) {
throw error(405, `DELETE of ${url.url || url} is not allowed`)
}
return this.deleteDocument(path)
}
Expand Down
16 changes: 16 additions & 0 deletions test/integration/http-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ describe('HTTP APIs', function () {
return Promise.all([
rm('/false-file-48484848'),
createTestResource('/.acl'),
createTestResource('/profile/card$.ttl'),
createTestResource('/delete-test-empty-container/.meta.acl'),
createTestResource('/put-resource-1.ttl'),
createTestResource('/put-resource-with-acl.ttl'),
Expand Down Expand Up @@ -625,6 +626,20 @@ describe('HTTP APIs', function () {
})
})

it('should return 405 status when deleting /profile/card', function (done) {
server.delete('/profile/card')
.expect(405)
.end((err, res) => {
if (err) return done(err)
try {
assert.equal(res.get('allow').includes('DELETE'), false) // ,'res methods')
} catch (err) {
return done(err)
}
done()
})
})

it('should return 404 status when deleting a file that does not exists',
function (done) {
server.delete('/false-file-48484848')
Expand Down Expand Up @@ -672,6 +687,7 @@ describe('HTTP APIs', function () {

after(function () {
// Clean up after DELETE API tests
rm('/profile/')
rm('/put-resource-1.ttl')
rm('/delete-test-non-empty/')
rm('/delete-test-empty-container/test.txt.acl')
Expand Down