netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Git backup: fix minor regressions for https://github.com/opnsense/plugins/issues/2049

Browse Source
This commit is contained in:
Ad Schellevis
2020-10-08 09:52:49 +02:00
parent d12b1fc72a
commit e725cc6737
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php
+2 -2
View File
@@ -155,7 +155,7 @@ class Git extends Base implements IBackupProvider
$url = (string)$mdl->url;
$pos = strpos($url, '//');
// inject credentials in url (either username or username:password, depending on transport)
if (stripos(trim((string)$mdl->$url),'http')) {
if (stripos(trim((string)$mdl->url),'http') === 0) {
$cred = urlencode((string)$mdl->user) . ":" . urlencode((string)$mdl->password);
$url = substr($url,0, $pos+2) . "{$cred}@" . substr($url, $pos+2);
} else {
@@ -169,7 +169,7 @@ class Git extends Base implements IBackupProvider
);
if (strpos($pushtxt, '__exit_ok__')) {
$error_type = null;
} elseif (strpos($pushtxt, 'Permission denied')) {
} elseif (strpos($pushtxt, 'Permission denied') || strpos($pushtxt, 'Authentication failed ')) {
$error_type = "authentication failure";
} elseif (strpos($pushtxt, 'WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED')) {
$error_type = "ssh hostkey changed";