Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xsendfile
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
xsendfile
Merge requests
!5
[
#3499849
] Simplify class overrides
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
[
#3499849
] Simplify class overrides
issue/xsendfile-3499849:3499849-make-more-robust
into
8.x-1.x
Overview
0
Commits
1
Pipelines
0
Changes
2
Open
Istvan Reszler-Fekete
requested to merge
issue/xsendfile-3499849:3499849-make-more-robust
into
8.x-1.x
5 months ago
Overview
0
Commits
1
Pipelines
0
Changes
2
Expand
Closes
#3499849
0
0
Merge request reports
Compare
8.x-1.x
8.x-1.x (HEAD)
and
latest version
latest version
9a191468
1 commit,
5 months ago
2 files
+
34
−
209
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
src/Controller/XsendfileFileDownloadController.php
+
14
−
33
Options
@@ -76,42 +76,23 @@ class XsendfileFileDownloadController extends FileDownloadController {
@@ -76,42 +76,23 @@ class XsendfileFileDownloadController extends FileDownloadController {
* @see hook_file_download()
* @see hook_file_download()
*/
*/
public
function
download
(
Request
$request
,
$scheme
=
'private'
)
{
public
function
download
(
Request
$request
,
$scheme
=
'private'
)
{
$target
=
$request
->
query
->
get
(
'file'
);
$response
=
parent
::
download
(
$request
,
$scheme
);
// Merge remaining path arguments into relative file path.
if
(
!
$response
instanceof
BinaryFileResponse
)
{
$uri
=
$this
->
streamWrapperManager
->
normalizeUri
(
$scheme
.
'://'
.
$target
);
return
$response
;
}
if
(
$this
->
streamWrapperManager
->
isValidScheme
(
$scheme
)
&&
is_file
(
$uri
))
{
// Let other modules provide headers and controls access to the file.
$headers
=
$this
->
moduleHandler
()
->
invokeAll
(
'file_download'
,
[
$uri
]);
foreach
(
$headers
as
$result
)
{
if
(
$result
==
-
1
)
{
throw
new
AccessDeniedHttpException
();
}
}
if
(
count
(
$headers
))
{
$download_method
=
$this
->
config
(
'xsendfile.settings'
)
->
get
(
'xsendfile_transfer'
);
if
(
$download_method
==
$this
->
fileDownloadHeaders
::
XSENDFILE_PHP_TRANSFER
)
{
// \Drupal\Core\EventSubscriber\FinishResponseSubscriber::onRespond()
// sets response as not cacheable if the Cache-Control header is not
// already modified. We pass in FALSE for non-private schemes for the
// $public parameter to make sure we don't change the headers.
return
new
BinaryFileResponse
(
$uri
,
200
,
$headers
,
$scheme
!==
'private'
);
}
else
{
$file_path
=
base_path
()
.
Settings
::
get
(
'file_private_path'
)
.
'/'
.
$target
;
$xsendfile_headers
=
$this
->
fileDownloadHeaders
->
getHeaders
(
$file_path
);
$headers
+=
$xsendfile_headers
;
return
new
Response
(
''
,
200
,
$headers
);
}
}
throw
new
AccessDeniedHttpException
();
$download_method
=
$this
->
config
(
'xsendfile.settings'
)
->
get
(
'xsendfile_transfer'
);
if
(
$download_method
==
$this
->
fileDownloadHeaders
::
XSENDFILE_PHP_TRANSFER
)
{
return
$response
;
}
}
throw
new
NotFoundHttpException
();
$target
=
$request
->
query
->
get
(
'file'
);
$file_path
=
base_path
()
.
Settings
::
get
(
'file_private_path'
)
.
'/'
.
$target
;
$xsendfile_headers
=
$this
->
fileDownloadHeaders
->
getHeaders
(
$file_path
);
$headers
=
$response
->
headers
->
all
();
$headers
+=
$xsendfile_headers
;
return
new
Response
(
''
,
200
,
$headers
);
}
}
}
}
Loading