feat(http): centralize Content-Disposition header generation#59152
Draft
joshtrichards wants to merge 16 commits intomasterfrom
Draft
feat(http): centralize Content-Disposition header generation#59152joshtrichards wants to merge 16 commits intomasterfrom
joshtrichards wants to merge 16 commits intomasterfrom
Conversation
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Switch to more robust centralized ContentDisposition Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
…dling Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
…plementation Signed-off-by: Josh <josh.t.richards@gmail.com>
Format is now consistent No UA exceptions Signed-off-by: Josh <josh.t.richards@gmail.com>
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Consolidates all
Content-Dispositionheader generation into a single utility class (OC\Http\ContentDisposition). This class is a wrapper for Symfony'sHeaderUtils::makeDisposition()with Nextcloud specific multibyte-safe ASCII fallback generator (inspired by Symfony'sBinaryFileResponse).This brings consistency across the codebase for Content-Disposition handling and fixes some problems:
DownloadResponseused manualstrtr()quoting -- lackedfilename*for non-ASCII namesFileDisplayResponseusedrawurldecode()(which made no sense at all but happened to work for most filenames, but certainly not all)FilesPluginandfiles_versions/Pluginhad UserAgent sniffing and special handling for IE/Freebox -- unnecessary complexity, legacy, and not done anywhere elseTrashbinPluginlackedfilename*(non-ASCII) handlingImageExportPlugin,MultiGetExportPlugin,TaskProcessingApiController,LogSettingsControllerused unescaped filenames (not mattering in some cases, but less-than-robust in others)Changes:
lib/private/Http/ContentDisposition.php, a thin wrapper aroundSymfony\Component\HttpFoundation\HeaderUtils::makeDisposition()ContentDisposition::make()IRequestdependency fromfiles_versions/PluginIRequestUA-sniffing fromFilesPlugin::httpGet()ContentDispositionTestPublic API note:
DownloadResponse,FileDisplayResponse, andDataDownloadResponseretain their existing constructor signatures. Apps using these classes require no changes -- they simply get correct RFC 6266 headers automatically.TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)