aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-09-07 13:32:44 -0400
committerjim-p <jimp@pfsense.org>2012-09-07 13:34:50 -0400
commit502bb0945280d409e33b3a3eaaa3ff1596705828 (patch)
tree020edb60465064f91032735bffdf73a162126d73
parent4c831fa13616e99b6356db302e0088b95d4cb341 (diff)
downloadpfsense-packages-502bb0945280d409e33b3a3eaaa3ff1596705828.tar.gz
pfsense-packages-502bb0945280d409e33b3a3eaaa3ff1596705828.tar.bz2
pfsense-packages-502bb0945280d409e33b3a3eaaa3ff1596705828.zip
Set the user credentials in curl rather than forming a URI with the user:pass, as the latter has issues if the password contains certain symbols such as @.
-rw-r--r--config/autoconfigbackup/autoconfigbackup.inc3
-rw-r--r--config/autoconfigbackup/autoconfigbackup.xml2
-rwxr-xr-xpkg_config.7.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 6 insertions, 5 deletions
diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index fc9fb98d..0286ffec 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -82,10 +82,11 @@ function test_connection($post) {
$hostname = $config['system']['hostname'] . "." . $config['system']['domain'];
// URL to restore.php
- $get_url = "https://{$username}:{$password}@portal.pfsense.org/pfSconfigbackups/restore.php";
+ $get_url = "https://portal.pfsense.org/pfSconfigbackups/restore.php";
// Populate available backups
$curl_session = curl_init();
+ curl_setopt($curl_session, CURLOPT_USERPWD, "{$username}:{$password}");
curl_setopt($curl_session, CURLOPT_URL, $get_url);
curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0);
curl_setopt($curl_session, CURLOPT_POST, 1);
diff --git a/config/autoconfigbackup/autoconfigbackup.xml b/config/autoconfigbackup/autoconfigbackup.xml
index 406221bf..a7640f7e 100644
--- a/config/autoconfigbackup/autoconfigbackup.xml
+++ b/config/autoconfigbackup/autoconfigbackup.xml
@@ -37,7 +37,7 @@
<description>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</description>
<requirements>pfSense Premium Support Portal</requirements>
<name>AutoConfigBackup</name>
- <version>1.0</version>
+ <version>1.20</version>
<title>Diagnostics: Auto Configuration Backup</title>
<savetext>Change</savetext>
<include_file>/usr/local/pkg/autoconfigbackup.inc</include_file>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 519eb499..59bb8374 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -532,7 +532,7 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.19</version>
+ <version>1.20</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>http://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 06104252..5c796620 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -860,7 +860,7 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.19</version>
+ <version>1.20</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>http://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index dc37d529..57ee2ca6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -847,7 +847,7 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted on the server. Requires pfSense Premium Support Portal Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.19</version>
+ <version>1.20</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>http://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>