Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
b423406
Added files and instructions to build and run with docker (#607)
retog Nov 29, 2017
cc7865f
Fix origin tests in line with new solid-permissions
melvincarvalho Dec 4, 2017
bd8fa22
minor typo
melvincarvalho Dec 4, 2017
bca4f35
Update package.json and lock to solid-permissions 0.5.2
melvincarvalho Dec 5, 2017
d3c513d
Release version 4.0.2 of the npm package.
melvincarvalho Dec 13, 2017
349b339
Add mixed statement origin test fixes #620 (#622)
melvincarvalho Jan 12, 2018
253ff67
Release version 4.0.3 of the npm package.
melvincarvalho Jan 18, 2018
18b9fe9
Added HTTP proxy support for outbound requests from solid server (#627)
pmcb55 Jan 26, 2018
3e44601
4.0.4
dmitrizagidulin Jan 26, 2018
e87a8aa
+ redirectFrom config parm (#630)
Feb 9, 2018
c311a17
Update databrowser.html to latest mashlib (#640)
RubenVerborgh Mar 3, 2018
95d92e8
+ argv: config-file (./config.json) (#613)
Mar 3, 2018
68e2e55
Require at least Node 8. (#642)
RubenVerborgh Mar 6, 2018
68532bd
Add ResourceMapper class for URL/file mapping (#643)
RubenVerborgh Mar 13, 2018
1a04fae
Release version 4.0.5 of the npm package.
melvincarvalho Mar 20, 2018
c82d1a3
Add WebID+Delegate support for TLS and OIDC modes (#646)
smalinin Apr 7, 2018
b78aec3
Implement kludge to make external WebIDs work.
RubenVerborgh Apr 19, 2018
0e1759a
Prefer protocol configured in server URI.
RubenVerborgh Apr 21, 2018
61492e8
Align WebSocket URI with base URI.
RubenVerborgh Apr 21, 2018
03428a6
Merge pull request #651 from solid/fix/baseuri-behind-proxy
RubenVerborgh Apr 22, 2018
0d2661d
Merge pull request #652 from solid/fix/websockets-uri
RubenVerborgh Apr 22, 2018
456bdc9
Merge pull request #650 from solid/fix/tls-with-oidc
RubenVerborgh Apr 22, 2018
0957f9a
Release version 4.0.6 of the npm package.
RubenVerborgh Apr 22, 2018
b25f20e
~ make tests finish
Apr 26, 2018
451b09d
Remove dependency on request.
RubenVerborgh Apr 30, 2018
c6987fd
Skip x509 tests when modules is not installed.
RubenVerborgh Apr 30, 2018
da6b7d3
Test on Node 10.
RubenVerborgh Apr 30, 2018
ded2ffd
Correct file read error message
May 1, 2018
0c0b784
Update oidc-auth-manager to v0.15.0.
RubenVerborgh May 2, 2018
0b7a027
Test on more recent Node 8.
RubenVerborgh May 2, 2018
26dca60
Merge ninachaubal:error-msg into develop
RubenVerborgh May 2, 2018
321dc6d
Reduce regex usage.
RubenVerborgh Mar 13, 2018
eb29ddd
Handle percent encoding.
RubenVerborgh May 1, 2018
3a42fd4
Add LegacyResourceMapper.
RubenVerborgh May 2, 2018
a704e96
Use LegacyResourceMapper in allow handler.
RubenVerborgh May 3, 2018
c121cce
Include ports in URL generation.
RubenVerborgh May 3, 2018
1551b58
Merge pull request #660 from solid/fix/mapping-percent-encoded
RubenVerborgh May 3, 2018
1eea863
Fix OidcManager / delayBeforeRegisteringInitialClient param
dmitrizagidulin Feb 23, 2018
3bec51c
Update webid version to prevent crashes.
RubenVerborgh May 3, 2018
a3cc037
Use block level scope instead of function level scope
May 3, 2018
ee72c03
Merge pull request #655 from ninachaubal/block-level-scope
RubenVerborgh May 3, 2018
da666a7
Use block level scope instead of function level scope
May 4, 2018
299f5d6
Send full returnToUrl.
RubenVerborgh Mar 23, 2018
3da620e
Preserve return URL for WebID-TLS.
RubenVerborgh May 4, 2018
b0a4983
Merge pull request #664 from ninachaubal/block-level-scope
RubenVerborgh May 4, 2018
4cfd5a3
Merge pull request #648 from solid/fix/redirect-hash
RubenVerborgh May 4, 2018
43adabe
Release version 4.0.8 of the npm package.
RubenVerborgh May 4, 2018
815538c
Only use cookies in HTTPS mode.
RubenVerborgh May 9, 2018
23ff795
Prevent double slashes in the "service" link header
May 6, 2018
0379a45
Remove string dependency.
RubenVerborgh May 19, 2018
f88f39d
Remove unneeded hippie dependency.
RubenVerborgh May 19, 2018
5dc1991
Update dependencies with security vulnerabilities.
RubenVerborgh May 19, 2018
054a437
Remove unused dependencies.
RubenVerborgh May 19, 2018
d1b590d
Merge pull request #666 from ninachaubal/url-resolve
RubenVerborgh May 20, 2018
e19383d
Update oidc-auth-manager.
RubenVerborgh May 23, 2018
907d84a
Merge branch 'fix/secure-cookies' into develop
RubenVerborgh May 23, 2018
ff53c5c
Release version 4.0.9 of the npm package.
RubenVerborgh May 23, 2018
9bf30c5
Clean up .gitignore.
RubenVerborgh May 23, 2018
1f027f1
Don't include unnecessary files in npm package.
RubenVerborgh May 23, 2018
1297807
Don't generate HTML coverage report.
RubenVerborgh May 23, 2018
366d087
Install latest oidc-auth-manager.
RubenVerborgh May 27, 2018
9e9381f
Release version 4.0.10 of the npm package.
RubenVerborgh May 27, 2018
c867477
Remove bookmark app and profile editor app addreses #683
melvincarvalho May 28, 2018
c56da7d
Merge pull request #684 from melvincarvalho/master
melvincarvalho May 29, 2018
dd68e70
Add link to user guide closes #687
melvincarvalho May 30, 2018
de92519
Release version 4.0.11 of the npm package.
melvincarvalho May 30, 2018
d09476e
Release version 4.0.12 of the npm package.
melvincarvalho May 30, 2018
53f1c1e
Bump rdflib version to 0.17.0
melvincarvalho May 30, 2018
c91d651
Release version 4.0.13 of the npm package.
melvincarvalho May 30, 2018
27d110c
Don't publish tests on npm.
RubenVerborgh May 27, 2018
1b1420a
Update version of nodejs used in Dockerfile.
tmciver May 30, 2018
b9a9b99
Update package-lock.json.
RubenVerborgh Jun 2, 2018
0a58016
Release version 4.0.14 of the npm package.
RubenVerborgh Jun 2, 2018
d882422
Merge branch 'master' into v4.1.0
RubenVerborgh Jun 4, 2018
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
Prev Previous commit
Next Next commit
Remove dependency on request.
We didn't really need it,
and one of its dependencies had a security issue.
  • Loading branch information
RubenVerborgh committed Apr 30, 2018
commit 451b09d363da09cb58f8f58acf4f8dd4d480ba59
6 changes: 4 additions & 2 deletions lib/ldp-copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ const debug = require('./debug')
const fs = require('fs')
const mkdirp = require('fs-extra').mkdirp
const path = require('path')
const request = require('request')
const http = require('http')
const https = require('https')

/**
* Cleans up a file write stream (ends stream, deletes the file).
Expand Down Expand Up @@ -42,6 +43,7 @@ function copy (copyToPath, copyFromUri, callback) {
debug.handlers('COPY -- Wrote data to: ' + copyToPath)
callback()
})
const request = /^https:/.test(copyFromUri) ? https : http
request.get(copyFromUri)
.on('error', function (err) {
debug.handlers('COPY -- Error requesting source file: ' + err)
Expand All @@ -59,7 +61,7 @@ function copy (copyToPath, copyFromUri, callback) {
error.statusCode = response.statusCode
return callback(error)
}
response.pipe(destinationStream)
})
.pipe(destinationStream)
})
}
Loading