wait #6477 @0:20 ajout du fingerprint

diff --git a/app/Http/Controllers/Admin/Operations/ServerOperation.php b/app/Http/Controllers/Admin/Operations/ServerOperation.php
index 34bc6ece665d3cce333b4690f40394e1a9262490..ac764bf68dc2ab23248ee28e6f3f268a68a2320e 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/ServerOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ServerOperation.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Operations;
 
 use App\Models\FluidbookExternalInstallServer;
+use App\Models\FluidbookPublication;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Validator;

diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php
index f395fc606da237c43a77281b5a2cb7e22ae762ce..3427de5c01175cb0c458a389b8642eb3837f241c 100644 (file)
--- a/app/Models/FluidbookExternalInstallServer.php
+++ b/app/Models/FluidbookExternalInstallServer.php
@@ -10,6 +10,7 @@ use Cubist\Backpack\Magic\Models\ExternalServer;
 use Cubist\Net\Transfer\Local;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Json;
+use Illuminate\Support\Facades\DB;
 
 // __('!! Serveurs externes')
 class FluidbookExternalInstallServer extends ExternalServer
@@ -35,6 +36,7 @@ class FluidbookExternalInstallServer extends ExternalServer
         parent::setFields();
         $this->addField('redirections', Table::class, __('Redirections'), ['entity_singular' => __('redirection'), 'columns' => ['from' => __('De'), 'to' => __('Vers')], 'when' => ['protocol' => 'hosting']]);
         $this->addField('allows_root', Checkbox::class, __('Autoriser le chargement à la racine (sur le chemin de base)'), ['default' => false]);
+
     }
 
     public function onSaved(): bool
@@ -106,6 +108,17 @@ class FluidbookExternalInstallServer extends ExternalServer
                 } catch (\Exception $e) {
 
                 }
+                try {
+                    $fingerprint = ssh2_fingerprint($connection,
+                        SSH2_FINGERPRINT_MD5 | SSH2_FINGERPRINT_HEX);
+                } catch (\Exception $e) {
+
+                }
+
+                if(!$fingerprint) {
+                    throw new \Exception('Fingerprint missing');
+                }
+
                 try {
                     self::$isValidConnexion = ssh2_auth_password($connection, $usr, $pwd);
                 } catch (\Exception $e) {
@@ -120,4 +133,16 @@ class FluidbookExternalInstallServer extends ExternalServer
         return self::$isValidConnexion;
     }
 
+
+    public static function listFluidbook()
+    {
+        /*return DB::table('fluidbook_external_install_server')
+            ->join('fluidbook_publication', 'fluidbook_external_install_server.name', '=', 'fluidbook_publication.c_title')
+            ->where('fluidbook_external_install_server.created_ok','1')
+            ->where('fluidbook_external_install_server.host','!=','')
+            ->select()
+            ->get()
+            ->groupBy('fluidbook_external_install_server.host')
+            ->toArray();*/
+    }
 }

diff --git a/resources/views/vendor/backpack/crud/edit-external-server.blade.php b/resources/views/vendor/backpack/crud/edit-external-server.blade.php
index b62239e7a18fb07476ffdeb38784bef8a569dcc1..cd8afa1d8196c7c7e2f7995d51ce4e2538c1be0b 100644 (file)
--- a/resources/views/vendor/backpack/crud/edit-external-server.blade.php
+++ b/resources/views/vendor/backpack/crud/edit-external-server.blade.php
@@ -10,8 +10,6 @@
                 window.location.href = $(this).attr('href') + document.location.hash;
             });
 
-            console.log('{{$entry->id}}')
-
             //$("#saveActions").prepend("<button id='verifyconnection' class='btn btn-primary mr-3'>Tester la connexion</button>")
             $("#saveActions").prepend("<a id='verifyconnection' class='btn btn-primary mr-3' href='verifyconnection'>Tester la connexion</a>")
 
@@ -59,3 +57,4 @@
 
 @include('cubist_back::when')
 @include('crud::edit')
+