From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
server/lib/classes/system.inc.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index f6b52cf..57b1e1f 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -780,7 +780,8 @@
if(substr($path,0,1) != '/') return false;
//* We allow only some characters in the path
- if(!preg_match('/^\/[a-zA-Z0-9_\/\.\-]{1,}$/',$path)) return false;
+ // * is allowed, for example it is part of wildcard certificates/keys: *.example.com.crt
+ if(!preg_match('@^/[-a-zA-Z0-9_/.*~]{1,}$@',$path)) return false;
//* Check path for symlinks
$path_parts = explode('/',$path);
--
Gitblit v1.9.1