enhancement: new gpliinventory under 10.0.8 not supportet yet if enforce plugin is active

[walkerprog]

First of all: very great plugin, thank you very much for this.

additional to existing code

		if (class_exists('PluginFusioninventoryCommunication') && strpos($_SERVER['HTTP_USER_AGENT'], 'FusionInventory-Agent_') !== false){ 
			if(strpos($_SERVER['REQUEST_URI'], '/plugins/fusioninventory/') !== false || strpos($_SERVER['REQUEST_URI'], '\plugins\fusioninventory/') !== false){
				return;
			}
		}

I added

		if (class_exists('PluginGlpiinventoryCommunication') && strpos($_SERVER['HTTP_USER_AGENT'], 'GLPI-Agent_') !== false){ 
			if(strpos($_SERVER['REQUEST_URI'], '/plugins/glpiinventory/') !== false || strpos($_SERVER['REQUEST_URI'], '\plugins\glpiinventory/') !== false){
				return;
			}
		}

After that the enforcement of the plugin can be used again and the agents are able to connect again.
Maybe this can be integrated into the next version?

[DonutsNL]

Added exclusion in latest version https://github.com/DonutsNL/phpsaml

[racingfoss]

Hi @DonutsNL,
Whit the latest version, in my environment the problem persisted. I fixed it by adding the following line of code in phpsaml/inc/phpsaml.class.php:
private const EXCLUDED_USERAGENTS = ['FusionInventory-Agent' => '/plugins/fusioninventory/',
'FusionInventory-Agent' => '/marketplace/fusioninventory/',
'FusionInventory-Agent' => '/plugins/glpiinventory/',
'FusionInventory-Agent_v2.6' => '/plugins/glpiinventory/',
'FusionInventory-Agent' => '/marketplace/glpiinventory/',
'GLPI-Agent' => '/',
'GLPI-Injector' => '/'];

I have agents "fusioninventory" still running, pointing to the url glpi.domain/plugins/glpiinventory/.
Glpi 10.0.10 and plugin glpiinventory latest release

This line of logs/access-glpi.log help me to fix it:
"POST /plugins/glpiinventory/ HTTP/1.1" 302 1065 "-" "FusionInventory-Agent_v2.6"

[DonutsNL]

Hi @loyolajavi, @walkerprog

I can realy use your help with testing.

I added dropdowns in which you can now manually configure the excluded paths. You are able to configure a path, optionally check the useragent, and configure what saml should do, either enforce auth or bypass it.

Its available in my repo at: https://github.com/DonutsNL/phpsaml

Additional stuff implemented

• Add menu button in config menu making it more accessible
  
• Disable login button if no valid config is found
  
• Disable enforce/login if no valid configuration is found
• Simplify installation logic hopefully reducing issues with the saml database
• implement the GLPI migration logic for future installation and update action moving from 1.3.0 forward.
• Addressed all linting issues in the sourcecode

[walkerprog]

Hi @DonutsNL
I am on vacation right now and will not change anything during my absence for plain reason and really bad internet connection.
Will be back next week and do the update and testing. You should have my feedback by the end of next week.

Sorry for the inconvinience.

[DonutsNL]

Im not in a hurry, happy hollidays 😉😎

[racingfoss]

Hi @DonutsNL, of course, i will test this tomorrow for a feedback.
Thanks!

[DonutsNL]

That would be great thx 👍🏻💪🏻

[racingfoss]

Hi @DonutsNL, how are you?
I tried to install the v1.3.0, and it threw an error:

Duplicate entry '1' for key 'PRIMARY'

In the files/_log/sql-errors.log this is the error message:

glpisqllog.ERROR: DBmysql::query() in /var/www/html/glpi/src/DBmysql.php line 379
*** MySQL query error:
SQL: INSERT INTO glpi_plugin_phpsaml_configs
(id,
version,
enforced,
proxied,
strict,
debug,
jit,
saml_sp_certificate,
saml_sp_certificate_key,
saml_sp_nameid_format,
saml_idp_entity_id,
saml_idp_single_sign_on_service,
saml_idp_single_logout_service,
saml_idp_certificate,
requested_authn_context,
requested_authn_context_comparison,
saml_security_nameidencrypted,
saml_security_authnrequestssigned,
saml_security_logoutrequestsigned,
saml_security_logoutresponsesigned,
saml_configuration_name)
VALUES('1',
'1.3.0',
'0',
'0',
'1',
'0',
'0',
'',
'',
'',
'',
'',
'',
'',
'',
'',
'0',
'0',
'0',
'0',
'default');
Error: Duplicate entry '1' for key 'PRIMARY'
Backtrace :
plugins/phpsaml/inc/config.class.php:1279
plugins/phpsaml/hook.php:59 PluginPhpsamlConfig::install()
src/Plugin.php:915 plugin_phpsaml_install()
front/plugin.form.php:51 Plugin->install()
public/index.php:82 require()

id 1 already exists in the table "glpi_plugin_phpsaml_configs" it contains the data of v1.2.2.
Or it was not deleted, or the instruction should be an update instead of an insert.

[DonutsNL]

Thanks for the feedback.

I know what the problem is and didnt get to fix it yet. Im implementing the GLPI migration object to manage this for us. I think ill address this issue this evening.

[DonutsNL]

hi @loyolajavi

I updated the migration logic. It will now also create simple backups of the configuration by copying the config table prior to updating and deleting the plugin. Could you retry your test?

[racingfoss]

I tested with the new code.
After the update, the table glpi_plugin_phpsaml_configs was not recreated
So, there is no config now:

glpisqllog.ERROR: DBmysql::query() in /var/www/html/glpi/src/DBmysql.php line 379
*** MySQL query error:
SQL: SHOW COLUMNS FROM glpi_plugin_phpsaml_configs
Error: Table 'glpi.glpi_plugin_phpsaml_configs' doesn't exist
Backtrace :
plugins/phpsaml/inc/config.class.php:259
plugins/phpsaml/inc/phpsaml.class.php:473 PluginPhpsamlConfig->getConfig()
plugins/phpsaml/inc/phpsaml.class.php:143 PluginPhpsamlPhpsaml::getSettings()
plugins/phpsaml/inc/phpsaml.class.php:132 PluginPhpsamlPhpsaml::init()
plugins/phpsaml/setup.php:174 PluginPhpsamlPhpsaml->__construct()
src/Plugin.php:1681 pluginPhpsamlPostInit()
src/Plugin.php:275 Plugin::doHook()
inc/includes.php:95 Plugin->init()
ajax/notifications_ajax.php:36 include()
public/index.php:82

[DonutsNL]

Please use a plugin reinstall to recover from any inconsistant state.

[racingfoss]

Oh ok, with the reinstall the table was created Ok, I will test and tell you how works

[DonutsNL]

Thx 💪🏻😎