Branch: refs/heads/QA_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: faea1b46c8147f602a6218631746af89c27155fc https://github.com/phpmyadmin/phpmyadmin/commit/faea1b46c8147f602a6218631746... Author: Kamil Tekiela <tekiela246@gmail.com> Date: 2026-10-26 (Mon, 10 October 2026) -03:00 Changed paths: M libraries/classes/IpAllowDeny.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/IpAllowDenyTest.php Log Message: ----------- Fix IPv4 CIDR matching in AllowDeny rules The mask was built from bits 30 to 0 only, so the most significant bit was never compared. A rule like "allow % from 10.0.0.0/8" also matched 138.0.0.0/8, and the localhost shortcut matched 255.0.0.0/8. Compare the inet_pton() bytes of the subnet and the address instead. Invalid addresses never match. A prefix longer than 32 is treated as /32, as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> (cherry picked from commit d27d4c465e2060cd435e4b7c96ee62e8f38c7bff) Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br> Commit: 8bea9d92b46a6f6129a3519d54f46ca54eb6fbc8 https://github.com/phpmyadmin/phpmyadmin/commit/8bea9d92b46a6f6129a3519d54f4... Author: Maurício Meneghini Fauth <mauricio@mfauth.com.br> Date: 2026-10-27 (Tue, 10 October 2026) -03:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #20576 [ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br> Commit: 6fc4d9ecfd4556248f72ce08a8fc788578f8138b https://github.com/phpmyadmin/phpmyadmin/commit/6fc4d9ecfd4556248f72ce08a8fc... Author: Maurício Meneghini Fauth <mauricio@mfauth.com.br> Date: 2026-10-27 (Tue, 10 October 2026) -03:00 Changed paths: M ChangeLog M libraries/classes/IpAllowDeny.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/IpAllowDenyTest.php Log Message: ----------- Merge #20576 Fix IPv4 CIDR matching in AllowDeny rules Closes #20576 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>