From fe9a23f542bc56c1c0b6dc30257418e38ff7bd3a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Sat, 08 Jun 2013 18:57:40 -0400
Subject: [PATCH] - Fixed FS#2936 - Please check and limit username input length.
---
server/plugins-available/getmail_plugin.inc.php | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index b7645bb..eb2da0e 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -91,7 +91,7 @@
$this->delete($event_name,$data);
// Get the new config file path
- $config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$data["new"]["source_server"].'_'.$data["new"]["source_username"].'.conf');
+ $config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$this->_clean_path($data["new"]["source_server"]).'_'.$this->_clean_path($data["new"]["source_username"]).'.conf');
if(stristr($config_file_path, "..") or stristr($config_file_path, "|") or stristr($config_file_path,";") or stristr($config_file_path,'$')) {
$app->log("Possibly faked path for getmail config file: '$config_file_path'. File is not written.",LOGLEVEL_ERROR);
return false;
@@ -104,16 +104,26 @@
// Shall emails be deleted after retrieval
if($data["new"]["source_delete"] == 'y') {
- $tpl = str_replace('{DELETE}','1',$tpl);
+ $tpl = str_replace('{DELETE}','true',$tpl);
} else {
- $tpl = str_replace('{DELETE}','0',$tpl);
+ $tpl = str_replace('{DELETE}','false',$tpl);
}
-
+
+ if($data["new"]["read_all"] == 'y') {
+ $tpl = str_replace('{READ_ALL}', 'true', $tpl);
+ } else {
+ $tpl = str_replace('{READ_ALL}', 'false', $tpl);
+ }
+
// Set the data retriever
if($data["new"]["type"] == 'pop3') {
$tpl = str_replace('{TYPE}','SimplePOP3Retriever',$tpl);
} elseif ($data["new"]["type"] == 'imap') {
$tpl = str_replace('{TYPE}','SimpleIMAPRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'pop3ssl') {
+ $tpl = str_replace('{TYPE}','SimplePOP3SSLRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'imapssl') {
+ $tpl = str_replace('{TYPE}','SimpleIMAPSSLRetriever',$tpl);
}
// Set server, username, password and destination.
@@ -125,8 +135,8 @@
// Write the config file.
file_put_contents($config_file_path,$tpl);
$app->log("Writing Getmail config file: $config_file_path",LOGLEVEL_DEBUG);
- exec("chmod 400 $config_file_path");
- exec("chown getmail $config_file_path");
+ chmod($config_file_path, 0400);
+ chown($config_file_path, 'getmail');
unset($tpl);
unset($config_file_path);
@@ -145,20 +155,19 @@
$getmail_config = $app->getconf->get_server_config($conf["server_id"], 'getmail');
$this->getmail_config_dir = $getmail_config["getmail_config_dir"];
- $config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$data["old"]["source_server"].'_'.$data["old"]["source_username"].'.conf');
+ $config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$this->_clean_path($data["old"]["source_server"]).'_'.$this->_clean_path($data["old"]["source_username"]).'.conf');
if(stristr($config_file_path,"..") || stristr($config_file_path,"|") || stristr($config_file_path,";") || stristr($config_file_path,'$')) {
$app->log("Possibly faked path for getmail config file: '$config_file_path'. File is not written.",LOGLEVEL_ERROR);
return false;
}
- if(is_file($config_file_path)) {
- unlink($config_file_path);
- $app->log("Deleting file: '$config_file_path'.",LOGLEVEL_DEBUG);
- } else {
- $app->log("Nothing to delete: '$config_file_path'.",LOGLEVEL_DEBUG);
- }
+ if(is_file($config_file_path)) unlink($config_file_path);
+ }
+
+ function _clean_path($input) {
+ return preg_replace('/[^A-Za-z0-9\-_]/', '_', $input);
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1