Merge pull request #823 from tomyvi/patch-2

Disable SSL checks on API calls

app/Http/Controllers/ItemController.php

@@ -191,7 +191,13 @@ class ItemController extends Controller
                 'icon' => $path,
             ]);
         } elseif (strpos($request->input('icon'), 'http') === 0) {
-            $contents = file_get_contents($request->input('icon'));
+            $options=array(
+                "ssl"=>array(
+                    "verify_peer"=>false,
+                    "verify_peer_name"=>false,
+                ),
+            );  
+            $contents = file_get_contents($request->input('icon'), false, stream_context_create($options));
 
             if ($application) {
                 $icon = $application->icon;

app/Item.php

@@ -30,7 +30,7 @@ class Item extends Model
 
     //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'appdescription', 'description', 'pinned', 'order', 'type', 'class', 'user_id', 'appid',
+        'title', 'url', 'colour', 'icon', 'appdescription', 'description', 'pinned', 'order', 'type', 'class', 'user_id', 'tag_id', 'appid',
     ];
 
 
@@ -169,7 +169,7 @@ class Item extends Model
 
     public static function isEnhanced($class)
     {
-        if ($class === null || $class === 'null') {
+        if (!class_exists($class, false) || $class === null || $class === 'null') {
             return false;
         }
         $app = new $class;
@@ -179,6 +179,9 @@ class Item extends Model
 
     public static function isSearchProvider($class)
     {
+        if (!class_exists($class, false) || $class === null || $class === 'null') {
+            return false;
+        }
         $app = new $class;
 
         return ((bool) ($app instanceof \App\SearchInterface)) ? $app : false;

app/Jobs/ProcessApps.php

@@ -47,7 +47,9 @@ class ProcessApps implements ShouldQueue
         foreach ($items as $item) {
             if (! file_exists(app_path('SupportedApps/'.Item::nameFromClass($item->class)))) {
                 $app = Application::where('class', $item->class)->first();
-                Application::getApp($app->appid);
+                if ($app) {
+                    Application::getApp($app->appid);
+                }
             }
         }
     }

app/Providers/AppServiceProvider.php

@@ -39,6 +39,7 @@ class AppServiceProvider extends ServiceProvider
                 $app_version = config('app.version');
                 if (version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
                     Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
+                    ProcessApps::dispatch();                 
                 }
             } else {
                 Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);

app/SupportedApps.php

@@ -113,7 +113,7 @@ abstract class SupportedApps
     {
         // $list_url = 'https://apps.heimdall.site/list';
         $list_url = config('app.appsource').'list.json';
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $client = new Client(['http_errors' => false, 'verify' => false, 'timeout' => 15, 'connect_timeout' => 15]);
 
         return $client->request('GET', $list_url);
     }
@@ -131,7 +131,7 @@ abstract class SupportedApps
     {
         $zipurl = config('app.appsource').'files/'.$app->sha.'.zip';
 
-        $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15]);
+        $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15, 'verify' => false]);
         $res = $client->request('GET', $zipurl);
 
         if (! file_exists(app_path('SupportedApps'))) {

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),
-    'version' => '2.4.7',
+    'version' => '2.4.11',
 
     /*
     |--------------------------------------------------------------------------