From e725cc6737d85ce3730e97f67487a0d17a3e0da8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 8 Oct 2020 09:52:49 +0200
Subject: [PATCH] Git backup: fix minor regressions for
 https://github.com/opnsense/plugins/issues/2049

---
 .../src/opnsense/mvc/app/library/OPNsense/Backup/Git.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php b/sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php
index f093a3b82..6a2fdc0ec 100644
--- a/sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php
+++ b/sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php
@@ -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";