From b533b414a075013307447a3fb895b1625504d477 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 21 Oct 2013 07:15:00 -0400
Subject: [PATCH] Merge remote-tracking branch 'florian030/master'
---
interface/lib/classes/validate_dkim.inc.php | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/interface/lib/classes/validate_dkim.inc.php b/interface/lib/classes/validate_dkim.inc.php
index 12c0945..e633430 100644
--- a/interface/lib/classes/validate_dkim.inc.php
+++ b/interface/lib/classes/validate_dkim.inc.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
Copyright (c) 2013, Florian Schaal, info@schaal-24.de
All rights reserved.
@@ -27,6 +27,9 @@
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+@author Florian Schaal, info@schaal-24.de
+@copyrighth Florian Schaal, info@schaal-24.de
*/
class validate_dkim {
@@ -39,41 +42,52 @@
return $errmsg."<br>\r\n";
}
}
-
- /* Validator function for private DKIM-Key */
- function check_private_key($field_name, $field_value, $validator) {
- $dkim_enabled=$_POST['dkim'];
- if ($dkim_enabled == 'y') {
- if (empty($field_value)) return $this->get_error($validator['errmsg']);
- exec('echo '.escapeshellarg($field_value).'|openssl rsa -check',$output,$result);
- if($result != 0) return $this->get_error($validator['errmsg']);
- }
- }
- /* Validator function for DKIM Path */
+ /**
+ * Validator function for private DKIM-Key
+ */
+ function check_private_key($field_name, $field_value, $validator) {
+ $dkim_enabled=$_POST['dkim'];
+ if ($dkim_enabled == 'y') {
+ if (empty($field_value)) return $this->get_error($validator['errmsg']);
+ exec('echo '.escapeshellarg($field_value).'|openssl rsa -check',$output,$result);
+ if($result != 0) return $this->get_error($validator['errmsg']);
+ }
+ }
+
+ /**
+ * Validator function for DKIM Path
+ * @return boolean - true when the dkim-path exists and is writeable
+ */
function check_dkim_path($field_name, $field_value, $validator) {
if(empty($field_value)) return $this->get_error($validator['errmsg']);
if (substr(sprintf('%o', fileperms($field_value)),-3) <= 600)
- return $this->get_error($validator['errmsg']);
- }
-
- /* Check function for DNS-Template */
- function check_template($field_name, $field_value, $validator) {
- $dkim=false;
- foreach($field_value as $field ) { if($field == 'DKIM') $dkim=true; }
- if ($dkim && $field_value[0]!='DOMAIN') return $this->get_error($validator['errmsg']);
- }
-
- /* Validator function for $_POST */
- function validate_post($key,$value) {
- switch ($key) {
- case 'public':
- if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; }
- break;
- case 'private':
- if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; }
- break;
- }
- }
-}
-
+ return $this->get_error($validator['errmsg']);
+ }
+
+ /**
+ * Check function for DNS-Template
+ */
+ function check_template($field_name, $field_value, $validator) {
+ $dkim=false;
+ foreach($field_value as $field ) { if($field == 'DKIM') $dkim=true; }
+ if ($dkim && $field_value[0]!='DOMAIN') return $this->get_error($validator['errmsg']);
+ }
+
+ /**
+ * Validator function for $_POST
+ *
+ * @return boolean - true if $POST contains a real key-file
+ */
+ function validate_post($key,$value) {
+ switch ($key) {
+ case 'public':
+ if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; }
+ break;
+ case 'private':
+ if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)$)/",$value) === 1) { return true; } else { return false; }
+ break;
+ }
+ }
+}
+
--
Gitblit v1.9.1