From cca075cea2e43986c88a7b54f3e7d89cbbe4c5f2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 4 Sep 2023 21:08:00 +0200 Subject: [PATCH] VPN: OpenVPN: Instances - use new File::file_put_contents() wrapper --- src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php index cff2ceeec..b7d049aed 100644 --- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php +++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php @@ -32,6 +32,7 @@ use Phalcon\Messages\Message; use OPNsense\Base\BaseModel; use OPNsense\Trust\Store; use OPNsense\Core\Config; +use OPNsense\Core\File; use OPNsense\Firewall\Util; /** @@ -359,9 +360,7 @@ class OpenVPN extends BaseModel if ($key == 'auth-user-pass') { // user/passwords need to be feed using a file $output .= $key . " " . $value['filename'] . "\n"; - @touch($value['filename']); - @chmod($value['filename'], 0600); - file_put_contents($value['filename'], $value['content']); + File::file_put_contents($value['filename'], $value['content'], 0600); } else { foreach ($value as $item) { $output .= $key . " " . $item . "\n"; @@ -371,9 +370,7 @@ class OpenVPN extends BaseModel $output .= $key . " " . $value . "\n"; } } - @touch($filename); - @chmod($filename, 0600); - file_put_contents($filename, $output); + File::file_put_contents($filename, $output, 0600); } /**