add verification on key to fix error on reimport (#21669)

Author: f2cmb

phpunit/functional/Glpi/Inventory/Assets/ComputerTest.php

@@ -1762,4 +1762,92 @@ public function testOsCommentRuleLocation()
         $this->assertTrue($computer->getFromDB($computers_id));
         $this->assertSame($locations_id, $computer->fields['locations_id']);
     }
+
+    /**
+     * Test reimport with locked states_id field.
+     * This test ensures that reimporting an inventory with a locked states_id field
+     * does not trigger an error when accessing raw_links.
+     *
+     * Scenario:
+     * 1. Configure a default states_id for inventory imports
+     * 2. Import a computer (which receives the state from inventory configuration)
+     * 3. Manually change the states_id (this creates a lock on the field)
+     * 4. Reimport the same computer (before the fix, this caused an "Undefined array key" error)
+     */
+    public function testReimportWithLockedStatesId()
+    {
+        // Load the test fixture
+        $json_str = file_get_contents(GLPI_ROOT . '/tests/fixtures/inventories/computer_locked_states_id.json');
+        $json = json_decode($json_str);
+
+        // Create states
+        $state = new \State();
+        $states_id_inventory = $state->add([
+            'name' => 'State from inventory',
+            'entities_id' => 0,
+            'is_visible_computer' => 1,
+        ]);
+        $this->assertGreaterThan(0, $states_id_inventory);
+
+        $states_id_manual = $state->add([
+            'name' => 'State manually set',
+            'entities_id' => 0,
+            'is_visible_computer' => 1,
+        ]);
+        $this->assertGreaterThan(0, $states_id_manual);
+
+        // Configure inventory to set states_id from inventory
+        $this->login();
+        $conf = new \Glpi\Inventory\Conf();
+        $this->assertTrue(
+            $conf->saveConf([
+                'states_id_default' => $states_id_inventory,
+            ])
+        );
+        $this->logout();
+
+        // First import - create the computer with state from inventory
+        $inventory = $this->doInventory($json);
+        $computers_id = $inventory->getItem()->fields['id'];
+        $this->assertGreaterThan(0, $computers_id);
+
+        $computer = new \Computer();
+        $this->assertTrue($computer->getFromDB($computers_id));
+        // Verify the computer received the state from inventory configuration
+        $this->assertEquals($states_id_inventory, $computer->fields['states_id']);
+
+        // Manually update states_id to create a lock
+        $this->assertTrue($computer->update([
+            'id' => $computers_id,
+            'states_id' => $states_id_manual,
+        ]));
+
+        // Verify the lock was created
+        $lockedfield = new \Lockedfield();
+        $locks = $lockedfield->find([
+            'itemtype' => 'Computer',
+            'items_id' => $computers_id,
+            'field' => 'states_id',
+        ]);
+        $this->assertCount(1, $locks);
+
+        // Reload and verify the manual state is set
+        $this->assertTrue($computer->getFromDB($computers_id));
+        $this->assertEquals($states_id_manual, $computer->fields['states_id']);
+
+        // Reimport the same inventory - this should NOT trigger an error
+        $inventory = $this->doInventory($json);
+
+        // Verify the computer still exists and states_id is still the manual one (locked)
+        $this->assertTrue($computer->getFromDB($computers_id));
+        $this->assertEquals($states_id_manual, $computer->fields['states_id']);
+
+        // Verify the lock is still present
+        $locks = $lockedfield->find([
+            'itemtype' => 'Computer',
+            'items_id' => $computers_id,
+            'field' => 'states_id',
+        ]);
+        $this->assertCount(1, $locks);
+    }
 }

src/Inventory/Asset/InventoryAsset.php

@@ -470,14 +470,14 @@ protected function handleInput(\stdClass $value, ?CommonDBTM $item = null): arra
             }
             $known_key = md5($key . $val);
             if (in_array($key, $locks)) {
-                if (isset($this->known_links[$known_key])) {
-                    $input[$key] = $this->known_links[$known_key];
-                    $input['_raw' . $key] = $this->raw_links[$known_key];
-                } else {
-                    // If $item is new and the input key is locked, we do not want to set it using the raw value.
-                    // This is because locked fields are no longer processed or sanitized during the addition process.
-                    // For more details, see: https://github.com/glpi-project/glpi/pull/19426
-                    if (!$item->isNewItem()) {
+                if (isset($this->raw_links[$known_key])) {
+                    if (isset($this->known_links[$known_key])) {
+                        $input[$key] = $this->known_links[$known_key];
+                        $input['_raw' . $key] = $this->raw_links[$known_key];
+                    } elseif (!$item->isNewItem()) {
+                        // If $item is new and the input key is locked, we do not want to set it using the raw value.
+                        // This is because locked fields are no longer processed or sanitized during the addition process.
+                        // For more details, see: https://github.com/glpi-project/glpi/pull/19426
                         $input[$key] = $this->raw_links[$known_key];
                     }
                 }

tests/fixtures/inventories/computer_locked_states_id.json

@@ -0,0 +1,18 @@
+{
+    "action": "inventory",
+    "content": {
+        "bios": {
+            "ssn": "LOCKED-STATES-TEST-001"
+        },
+        "hardware": {
+            "chassis_type": "Desktop",
+            "name": "test-locked-states",
+            "uuid": "test-uuid-locked-states-001",
+            "vmsystem": "Physical"
+        },
+        "versionclient": "GLPI-Agent_v1.9"
+    },
+    "deviceid": "test-locked-states-2025-10-28",
+    "itemtype": "Computer",
+    "partial": false
+}