summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2011-07-16 14:54:36 +0000
committerctrlaltca@gmail.com <>2011-07-16 14:54:36 +0000
commitd556b084312bf3fe1e50145b002bf33b1cf850f3 (patch)
tree6c1564e152c90b686a1946028b81791d54d49310 /framework/Web
parent5cb73482195692d9a231873543571f959fce17f8 (diff)
backported patch for #349 to branch/3.1
Diffstat (limited to 'framework/Web')
-rwxr-xr-xframework/Web/UI/ActiveControls/TActiveFileUpload.php98
1 files changed, 85 insertions, 13 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 8237df67..f20983b5 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -4,6 +4,7 @@
*
* @author Bradley Booms <Bradley.Booms@nsighttel.com>
* @author Christophe Boulain <Christophe.Boulain@gmail.com>
+ * @author Gabor Berczi <gabor.berczi@devworx.hu> (issue 349 remote vulnerability fix)
* @version $Id$
* @package System.Web.UI.ActiveControls
*/
@@ -103,17 +104,25 @@ class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallback
parent::saveAs($localName);
$filename=addslashes($this->getFileName());
+
+ $params = new TActiveFileUploadCallbackParams;
+ $params->localName = $localName;
+ $params->fileName = $filename;
+ $params->fileSize = $this->getFileSize();
+ $params->fileType = $this->getFileType();
+ $params->errorCode = $this->getErrorCode();
+
// return some javascript to display a completion status.
echo <<<EOS
<script language="Javascript">
Options = new Object();
Options.clientID = '{$this->getClientID()}';
Options.targetID = '{$this->_target->getUniqueID()}';
- Options.localName = '$localName';
- Options.fileName = '{$filename}';
- Options.fileSize = '{$this->getFileSize()}';
- Options.fileType = '{$this->getFileType()}';
- Options.errorCode = '{$this->getErrorCode()}';
+ Options.fileName = '{$params->fileName}';
+ Options.fileSize = '{$params->fileSize}';
+ Options.fileType = '{$params->fileType}';
+ Options.errorCode = '{$params->errorCode}';
+ Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
parent.Prado.WebUI.TActiveFileUpload.onFileUpload(Options);
</script>
EOS;
@@ -163,8 +172,14 @@ EOS;
/**
* @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
*/
- public function onInit($sender){
+ public function onInit($sender)
+ {
parent::onInit($sender);
+
+ if (!Prado::getApplication()->getCache())
+ if (!Prado::getApplication()->getSecurityManager())
+ throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+
if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
}
@@ -177,20 +192,68 @@ EOS;
* This method is mainly used by framework and control developers.
* @param TCallbackEventParameter the event parameter
*/
- public function raiseCallbackEvent($param){
+ public function raiseCallbackEvent($param)
+ {
$cp = $param->getCallbackParameter();
- if ($key = $cp->targetID == $this->_target->getUniqueID()){
- $_FILES[$key]['name'] = $cp->fileName;
- $_FILES[$key]['size'] = intval($cp->fileSize);
- $_FILES[$key]['type'] = $cp->fileType;
- $_FILES[$key]['error'] = intval($cp->errorCode);
- $_FILES[$key]['tmp_name'] = $cp->localName;
+ if ($key = $cp->targetID == $this->_target->getUniqueID())
+ {
+ $params = $this->popParamsByToken($cp->callbackToken);
+
+ $_FILES[$key]['name'] = $params->fileName;
+ $_FILES[$key]['size'] = intval($params->fileSize);
+ $_FILES[$key]['type'] = $params->fileType;
+ $_FILES[$key]['error'] = intval($params->errorCode);
+ $_FILES[$key]['tmp_name'] = $params->localName;
+
$this->loadPostData($key, null);
$this->raiseEvent('OnFileUpload', $this, $param);
}
}
+ protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
+ {
+ if ($cache = Prado::getApplication()->getCache())
+ {
+ // this is the most secure method, file info can't be forged from client side, no matter what
+ $token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
+ $cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
+ }
+ else
+ if ($mgr = Prado::getApplication()->getSecurityManager())
+ {
+ // this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
+ $token = base64_encode($mgr->encrypt(serialize($params)));
+ }
+ else
+ throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+
+ return $token;
+ }
+
+ protected function popParamsByToken($token)
+ {
+ if ($cache = Prado::getApplication()->getCache())
+ {
+ $v = $cache->get($token);
+ assert($v!='');
+ $cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
+ $params = unserialize($v);
+ }
+ else
+ if ($mgr = Prado::getApplication()->getSecurityManager())
+ {
+ $v = $mgr->decrypt(base64_decode($token));
+ $params = unserialize($v);
+ }
+ else
+ throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
+
+ assert($params instanceof TActiveFileUploadCallbackParams);
+
+ return $params;
+ }
+
/**
* Publish the javascript
*/
@@ -339,3 +402,12 @@ EOS;
return $this->_busy;
}
}
+
+class TActiveFileUploadCallbackParams
+{
+ public $localName;
+ public $fileName;
+ public $fileSize;
+ public $fileType;
+ public $errorCode;
+} \ No newline at end of file