Add configuration for proxy exclusions

Author: trasher

install/empty_data.php

@@ -198,6 +198,7 @@ public function getEmptyData(): array
             'proxy_name' => '',
             'proxy_port' => '8080',
             'proxy_user' => '',
+            'proxy_exclusions' => '',
             'add_followup_on_update_ticket' => '1',
             'keep_tickets_on_delete' => '0',
             'time_step' => '5',

install/migrations/update_11.0.2_to_11.0.3/config.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * ---------------------------------------------------------------------
+ *
+ * GLPI - Gestionnaire Libre de Parc Informatique
+ *
+ * http://glpi-project.org
+ *
+ * @copyright 2015-2025 Teclib' and contributors.
+ * @licence   https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * ---------------------------------------------------------------------
+ */
+/**
+ * @var Migration $migration
+ */
+$migration->addConfig(['proxy_exclusions' => exportArrayToDB([])]);

src/Agent.php

@@ -690,6 +690,8 @@ public function getAgentURLs(): array
      */
     public function requestAgent($endpoint): Response
     {
+        global $CFG_GLPI;
+
         if (self::$found_address !== false) {
             $addresses = [self::$found_address];
         } else {
@@ -703,6 +705,10 @@ public function requestAgent($endpoint): Response
                 'base_uri'        => $address,
             ];
 
+            if (in_array(self::class, $CFG_GLPI['proxy_exclusions'])) {
+                $options['proxy_excluded'] = true;
+            }
+
             // init guzzle client with base options
             $httpClient = Toolbox::getGuzzleClient($options);
             try {

src/Config.php

@@ -274,6 +274,12 @@ public function prepareInputForUpdate($input)
             );
         }
 
+        if (isset($input['proxy_exclusions'])) {
+            $input['proxy_exclusions'] = exportArrayToDB(
+                ArrayNormalizer::normalizeValues($input['proxy_exclusions'] ?: [], 'strval')
+            );
+        }
+
         // lock mechanism update
         if (isset($input['lock_use_lock_item']) && isset($input['lock_item_list'])) {
             $input['lock_item_list'] = exportArrayToDB(
@@ -860,6 +866,12 @@ public function showSystemInformations()
         TemplateRenderer::getInstance()->display('pages/setup/general/systeminfo_form.html.twig', [
             'config' => $CFG_GLPI,
             'canedit' => static::canUpdate(),
+            'possible_proxy_exclusions' => array_merge(
+                [
+                    Agent::class => Agent::getTypeName(),
+                ],
+                $CFG_GLPI['possible_proxy_exclusions']
+            ),
         ]);
         self::showSystemInfoTable();
     }
@@ -1368,6 +1380,10 @@ public static function loadLegacyConfiguration()
             $CFG_GLPI['lock_item_list'] = importArrayFromDB($CFG_GLPI['lock_item_list']);
         }
 
+        if (isset($CFG_GLPI['proxy_exclusions'])) {
+            $CFG_GLPI['proxy_exclusions'] = importArrayFromDB($CFG_GLPI['proxy_exclusions']);
+        }
+
         if (
             isset($CFG_GLPI['lock_lockprofile_id'])
             && $CFG_GLPI['lock_use_lock_item']
@@ -1728,6 +1744,7 @@ public function post_updateItem($history = true)
                 'lock_item_list',
                 'planning_work_days',
                 Impact::CONF_ENABLED,
+                'proxy_exclusions',
             ];
             if (in_array($this->fields['name'], $array_fields, true)) {
                 $CFG_GLPI[$this->fields['name']] = importArrayFromDB($newvalue);

src/Toolbox.php

@@ -1338,8 +1338,8 @@ public static function getGuzzleClient(array $extra_options = []): Client
         global $CFG_GLPI;
 
         $options = $extra_options + ['connect_timeout' => 5];
-        // add proxy string if configured in glpi
-        if (!empty($CFG_GLPI["proxy_name"])) {
+        // add proxy string if configured in glpi - and not excluded
+        if (!empty($CFG_GLPI["proxy_name"]) && ($extra_options['proxy_excluded'] ?? false) === false) {
             $proxy_creds = "";
             if (!empty($CFG_GLPI["proxy_user"])) {
                 $proxy_user = rawurlencode($CFG_GLPI["proxy_user"]);
@@ -1379,7 +1379,7 @@ public static function callCurl(
             $PHPLOGGER->error($e->getMessage(), ['exception' => $e]);
 
             $curl_error = $e->getMessage();
-            if (empty($CFG_GLPI["proxy_name"])) {
+            if (empty($CFG_GLPI["proxy_name"]) || ($eopts['proxy_excluded'] ?? false)) {
                 $msgerr = sprintf(
                     __('Connection failed. If you use a proxy, please configure it. (%s)'),
                     $curl_error
@@ -1446,6 +1446,11 @@ private static function doCallCurl(
         }
 
         $ch = curl_init($url);
+        $proxy_excluded = false;
+        if (isset($eopts['proxy_excluded'])) {
+            $proxy_excluded = (bool) $eopts['proxy_excluded'];
+            unset($eopts['proxy_excluded']);
+        }
         $opts = [
             CURLOPT_URL             => $url,
             CURLOPT_USERAGENT       => "GLPI/" . trim($CFG_GLPI["version"]),
@@ -1457,7 +1462,7 @@ private static function doCallCurl(
             $opts[CURLOPT_FOLLOWLOCATION] = false;
         }
 
-        if (!empty($CFG_GLPI["proxy_name"])) {
+        if (!empty($CFG_GLPI["proxy_name"]) && !$proxy_excluded) {
             // Connection using proxy
             $opts += [
                 CURLOPT_PROXY           => $CFG_GLPI['proxy_name'],

src/autoload/CFG_GLPI.php

@@ -645,3 +645,5 @@
 
 $CFG_GLPI['process_types'] = [Computer::class];
 $CFG_GLPI['environment_types'] = [Computer::class];
+
+$CFG_GLPI['possible_proxy_exclusions'] = [];

templates/pages/setup/general/systeminfo_form.html.twig

@@ -65,6 +65,18 @@
       }
    }) }}
 
+    {{ fields.dropdownArrayField(
+        'proxy_exclusions',
+        null,
+        possible_proxy_exclusions,
+        __('Proxy exclusions'),
+        {
+            multiple: true,
+            size: 3,
+            values: config['proxy_exclusions']
+        }
+    ) }}
+
    {{ fields.smallTitle(__('Telemetry data')) }}
    {% set telemetry_enabled = call('Telemetry::isEnabled') %}
    {{ fields.htmlField('', telemetry_enabled ? __('Yes') : __('No'), __('Telemetry enabled'), {