[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0bee94: Merge branch 'QA_5_1-security' into master-security

Maurício Meneghini Fauth mauricio at fauth.dev
Sat Jan 22 01:55:29 CET 2022


Branch: refs/heads/QA_5_2
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0bee94b27ee7681bb464efd81f4517150a99b330
https://github.com/phpmyadmin/phpmyadmin/commit/0bee94b27ee7681bb464efd81f4517150a99b330
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2022-01-11 (Tue, 01 January 2022) -03:00

Changed paths: 
A libraries/classes/Crypto/Crypto.php
A test/classes/Crypto/CryptoTest.php
M composer.json
M config.sample.inc.php
M doc/config.rst
M js/src/navigation.js
M libraries/classes/Common.php
M libraries/classes/Config/Settings.php
M libraries/classes/Config/Settings/Server.php
M libraries/classes/ConfigStorage/UserGroups.php
M libraries/classes/Core.php
M libraries/classes/Dbal/DbiMysqli.php
M libraries/classes/Display/Results.php
M libraries/classes/ErrorReport.php
M libraries/classes/Export.php
M libraries/classes/Html/Generator.php
M libraries/classes/InsertEdit.php
M libraries/classes/Navigation/NavigationTree.php
M libraries/classes/Navigation/Nodes/NodeDatabase.php
M libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
M libraries/classes/ReplicationGui.php
M libraries/classes/Url.php
M libraries/classes/Util.php
M libraries/config.default.php
M phpstan-baseline.neon
M psalm-baseline.xml
M templates/database/events/index.twig
M templates/database/events/row.twig
M templates/database/operations/index.twig
M templates/database/routines/row.twig
M templates/database/tracking/tables.twig
M templates/database/triggers/row.twig
M templates/display/results/checkbox_and_links.twig
M templates/display/results/table.twig
M templates/indexes.twig
M templates/navigation/item_unhide_dialog.twig
M templates/server/binlog/index.twig
M templates/server/databases/index.twig
M templates/server/replication/index.twig
M templates/server/status/processes/list.twig
M templates/setup/home/index.twig
M templates/sql/no_results_returned.twig
M templates/sql/relational_column_dropdown.twig
M templates/table/insert/column_row.twig
M templates/table/operations/index.twig
M templates/table/operations/view.twig
M templates/table/relation/foreign_key_row.twig
M templates/table/search/input_box.twig
M templates/table/structure/display_partitions.twig
M templates/table/structure/display_structure.twig
M templates/table/tracking/main.twig
M test/classes/Config/Settings/ServerTest.php
M test/classes/Config/SettingsTest.php
M test/classes/CoreTest.php
M test/classes/Display/ResultsTest.php
M test/classes/Html/GeneratorTest.php
M test/classes/UrlTest.php

Log Message:
-----------
Merge branch 'QA_5_1-security' into master-security

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: 9b3a1f7734c6f4a9787329db23beee23636f213c
https://github.com/phpmyadmin/phpmyadmin/commit/9b3a1f7734c6f4a9787329db23beee23636f213c
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2022-01-13 (Thu, 01 January 2022) -03:00

Changed paths: 
M libraries/classes/ConfigStorage/Relation.php
M libraries/classes/Controllers/Setup/ConfigController.php
M libraries/classes/Controllers/Setup/FormController.php
M libraries/classes/Controllers/Setup/HomeController.php
M libraries/classes/Controllers/Setup/ServersController.php
M libraries/classes/Setup/FormProcessing.php
M phpstan-baseline.neon
M psalm-baseline.xml
M setup/index.php
M templates/config/form_display/display.twig
M templates/setup/servers/index.twig
M test/classes/Config/PageSettingsTest.php

Log Message:
-----------
Merge branch 'QA_5_1-security' into master-security

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: 7aaab244631cf196d2583ea0e5b371abbe369d8a
https://github.com/phpmyadmin/phpmyadmin/commit/7aaab244631cf196d2583ea0e5b371abbe369d8a
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2022-01-13 (Thu, 01 January 2022) -03:00

Changed paths: 
M ChangeLog
M composer.json
M libraries/classes/Plugins/Auth/AuthenticationCookie.php
M libraries/classes/Util.php
M test/classes/Plugins/Auth/AuthenticationCookieTest.php

Log Message:
-----------
Remove the phpseclib dependency

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: 411bacf61358a08d31e5fcf02d3d59cbfeffa5f2
https://github.com/phpmyadmin/phpmyadmin/commit/411bacf61358a08d31e5fcf02d3d59cbfeffa5f2
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2022-01-13 (Thu, 01 January 2022) -03:00

Changed paths: 
M libraries/classes/Controllers/HomeController.php
M libraries/classes/Plugins/Auth/AuthenticationCookie.php
M phpstan-baseline.neon
M psalm-baseline.xml
M test/classes/CoreTest.php
M test/classes/Plugins/Auth/AuthenticationCookieTest.php

Log Message:
-----------
Use Sodium for auth cookies encryption

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: 794ee7914be5b7a8fe1bbe419c5c8f04946dd66e
https://github.com/phpmyadmin/phpmyadmin/commit/794ee7914be5b7a8fe1bbe419c5c8f04946dd66e
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2022-01-15 (Sat, 01 January 2022) -03:00

Changed paths: 
M ChangeLog
M composer.json
M libraries/classes/Controllers/HomeController.php
M libraries/classes/Plugins/Auth/AuthenticationCookie.php
M libraries/classes/Util.php
M phpstan-baseline.neon
M psalm-baseline.xml
M test/classes/CoreTest.php
M test/classes/Plugins/Auth/AuthenticationCookieTest.php

Log Message:
-----------
Merge pull request #339 from phpmyadmin/phpseclib-removal

Remove phpseclib dependency

Commit: 32e76f7bc97465a4ebb63da383c03296a547d341
https://github.com/phpmyadmin/phpmyadmin/commit/32e76f7bc97465a4ebb63da383c03296a547d341
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Fix typo in ChangeLog

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 985912f58f4d6229219e250195ba254a1a1b55c7
https://github.com/phpmyadmin/phpmyadmin/commit/985912f58f4d6229219e250195ba254a1a1b55c7
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
A libraries/classes/Crypto/Crypto.php
A test/classes/Crypto/CryptoTest.php
M ChangeLog
M composer.json
M config.sample.inc.php
M doc/config.rst
M js/src/navigation.js
M libraries/classes/Common.php
M libraries/classes/Config/Settings.php
M libraries/classes/Config/Settings/Server.php
M libraries/classes/ConfigStorage/Relation.php
M libraries/classes/ConfigStorage/UserGroups.php
M libraries/classes/Controllers/HomeController.php
M libraries/classes/Controllers/Setup/ConfigController.php
M libraries/classes/Controllers/Setup/FormController.php
M libraries/classes/Controllers/Setup/HomeController.php
M libraries/classes/Controllers/Setup/ServersController.php
M libraries/classes/Core.php
M libraries/classes/Dbal/DbiMysqli.php
M libraries/classes/Display/Results.php
M libraries/classes/ErrorReport.php
M libraries/classes/Export.php
M libraries/classes/Html/Generator.php
M libraries/classes/InsertEdit.php
M libraries/classes/Navigation/NavigationTree.php
M libraries/classes/Navigation/Nodes/NodeDatabase.php
M libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
M libraries/classes/Plugins/Auth/AuthenticationCookie.php
M libraries/classes/ReplicationGui.php
M libraries/classes/Setup/FormProcessing.php
M libraries/classes/Url.php
M libraries/classes/Util.php
M libraries/config.default.php
M phpstan-baseline.neon
M psalm-baseline.xml
M setup/index.php
M templates/config/form_display/display.twig
M templates/database/events/index.twig
M templates/database/events/row.twig
M templates/database/operations/index.twig
M templates/database/routines/row.twig
M templates/database/tracking/tables.twig
M templates/database/triggers/row.twig
M templates/display/results/checkbox_and_links.twig
M templates/display/results/table.twig
M templates/indexes.twig
M templates/navigation/item_unhide_dialog.twig
M templates/server/binlog/index.twig
M templates/server/databases/index.twig
M templates/server/replication/index.twig
M templates/server/status/processes/list.twig
M templates/setup/home/index.twig
M templates/setup/servers/index.twig
M templates/sql/no_results_returned.twig
M templates/sql/relational_column_dropdown.twig
M templates/table/insert/column_row.twig
M templates/table/operations/index.twig
M templates/table/operations/view.twig
M templates/table/relation/foreign_key_row.twig
M templates/table/search/input_box.twig
M templates/table/structure/display_partitions.twig
M templates/table/structure/display_structure.twig
M templates/table/tracking/main.twig
M test/classes/Config/PageSettingsTest.php
M test/classes/Config/Settings/ServerTest.php
M test/classes/Config/SettingsTest.php
M test/classes/CoreTest.php
M test/classes/Display/ResultsTest.php
M test/classes/Html/GeneratorTest.php
M test/classes/Plugins/Auth/AuthenticationCookieTest.php
M test/classes/UrlTest.php

Log Message:
-----------
Fix merge conflicts from security branch

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: ef32bc5077615e4151da8451e550556fc090a7e7
https://github.com/phpmyadmin/phpmyadmin/commit/ef32bc5077615e4151da8451e550556fc090a7e7
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 

Log Message:
-----------
Merge remote-tracking branch 'origin/QA_5_1'

Commit: ede9244669d1e657ad539d6976e991b4602472a3
https://github.com/phpmyadmin/phpmyadmin/commit/ede9244669d1e657ad539d6976e991b4602472a3
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 

Log Message:
-----------
Merge commit 'c92658f96f'

Commit: b553913248584c9e7c03128e1233d791004efb6a
https://github.com/phpmyadmin/phpmyadmin/commit/b553913248584c9e7c03128e1233d791004efb6a
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 

Log Message:
-----------
Merge commit '3c917074b1'

Commit: 42fdd04e213eba87fed3a9464f4546de47d3832b
https://github.com/phpmyadmin/phpmyadmin/commit/42fdd04e213eba87fed3a9464f4546de47d3832b
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Fix merge conflicts from QA_5_1

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 9a9ef9e9b007ea6948210c198ba3f958eac8ba1e
https://github.com/phpmyadmin/phpmyadmin/commit/9a9ef9e9b007ea6948210c198ba3f958eac8ba1e
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 

Log Message:
-----------
Merge commit 'd1ee5245c8'

Commit: 60cfc78e1c428dc2f8d0788abb5e89faee43416b
https://github.com/phpmyadmin/phpmyadmin/commit/60cfc78e1c428dc2f8d0788abb5e89faee43416b
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Finish fixing merge conflicts from QA_5_1

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: d4f1f6d552cae4f3dbff586ad189891234ff1c46
https://github.com/phpmyadmin/phpmyadmin/commit/d4f1f6d552cae4f3dbff586ad189891234ff1c46
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
-----------
Prepare for version 5.2.0-rc1

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 8a4a8a3612ec5466dfe6512143e01788b74220e9
https://github.com/phpmyadmin/phpmyadmin/commit/8a4a8a3612ec5466dfe6512143e01788b74220e9
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
M scripts/create-release.sh

Log Message:
-----------
Don't remove phpseclib files when creating release, they don't exist. Related to 7aaab244631cf196d2583ea0e5b371abbe369d8a

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: de9c1788ce238da7af5b8ae053bdc1c691fe7796
https://github.com/phpmyadmin/phpmyadmin/commit/de9c1788ce238da7af5b8ae053bdc1c691fe7796
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
A composer.lock

Log Message:
-----------
Adding composer lock for 5.2.0-rc1

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Commit: 04fbaceffaab70aed033a240c236235a166ef838
https://github.com/phpmyadmin/phpmyadmin/commit/04fbaceffaab70aed033a240c236235a166ef838
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2022-01-20 (Thu, 01 January 2022) -05:00

Changed paths: 
D composer.lock

Log Message:
-----------
Removing composer.lock

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>



More information about the Git mailing list