jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334384 )
Change subject: ApiUpload: Raise an error on attempts to async-upload a POSTed
file
......................................................................
ApiUpload: Raise an error on attempts to async-upload a POSTed file
"Upload from stash" and "Upload from POST" use the same code path via
ApiUpload::performUpload(). It looks like when a31d0f8edd implemented
"async upload from stash", it was overlooked that someone might attempt
to do an unsupported "async upload from POST".
Bug: T156365
Change-Id: I6d207270af490cfc59d994a22a6406df45a9f6a2
---
M includes/api/ApiUpload.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
3 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 6b38302..af3fff6 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -494,6 +494,13 @@
$this->mParams['filekey'],
$this->mParams['filename'], !$this->mParams['async']
);
} elseif ( isset( $this->mParams['file'] ) ) {
+ // Can't async upload directly from a POSTed file, we'd
have to
+ // stash the file and then queue the publish job. The
user should
+ // just submit the two API queries to perform those two
steps.
+ if ( $this->mParams['async'] ) {
+ $this->dieWithError(
'apierror-cannot-async-upload-file' );
+ }
+
$this->mUpload = new UploadFromFile();
$this->mUpload->initialize(
$this->mParams['filename'],
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index c1fefd6..c7fea8b 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -1594,6 +1594,7 @@
"apierror-blockedfrommail": "You have been blocked from sending email.",
"apierror-blocked": "You have been blocked from editing.",
"apierror-botsnotsupported": "This interface is not supported for
bots.",
+ "apierror-cannot-async-upload-file": "The parameters <var>async</var>
and <var>file</var> cannot be combined. If you want asynchronous processing of
your uploaded file, first upload it to stash (using the <var>stash</var>
parameter) and then publish the stashed file asynchronously (using
<var>filekey</var> and <var>async</var>).",
"apierror-cannotreauthenticate": "This action is not available as your
identity cannot be verified.",
"apierror-cannotviewtitle": "You are not allowed to view $1.",
"apierror-cantblock-email": "You don't have permission to block users
from sending email through the wiki.",
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index ef2ba8f..e6ee8d4 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -1486,6 +1486,7 @@
"apierror-blockedfrommail": "{{doc-apierror}}",
"apierror-blocked": "{{doc-apierror}}",
"apierror-botsnotsupported": "{{doc-apierror}}",
+ "apierror-cannot-async-upload-file": "{{doc-apierror}}",
"apierror-cannotreauthenticate": "{{doc-apierror}}",
"apierror-cannotviewtitle": "{{doc-apierror}}\n\nParameters:\n* $1 -
Title.",
"apierror-cantblock-email": "{{doc-apierror}}",
--
To view, visit https://gerrit.wikimedia.org/r/334384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d207270af490cfc59d994a22a6406df45a9f6a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
