gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-02-28 12:55:44 -03:00
commit 2a4eb5ae62
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
8 changed files with 128 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- issue #18120 Fix bug with numerical tables during renaming database
- issue #16851 Fix ($cfg['Order']) default column order doesn't have have any effect since phpMyAdmin 4.2.0
- issue #18112 Fix open base dir warning on git version class
- issue Do not show "Original length undefined" on binary hex columns
5.2.1 (2023-02-07)
- issue #17522 Fix case where the routes cache file is invalid

2
doc/conf.py
View File

@ -315,6 +315,4 @@ linkcheck_ignore = [
r'https://authy.com/.*',
# Site often changes links and reverts changes (9362bde02d0535a2f8cb74a18797249cb734c4b0)
r'https://www.yubico.com/.*',
# Some timeouts and SSL issues: https://github.com/sektioneins/suhosin/issues/119
r'https://suhosin.org/.*',
]

102
doc/config.rst
View File

@ -1806,6 +1806,8 @@ Generic settings
:type: boolean
:default: true
.. versionadded:: 4.5.0
Defines whether to use the parser to find any errors in the query before executing.
.. config:option:: $cfg['DefaultForeignKeyChecks']
@ -1894,6 +1896,13 @@ Generic settings
.. seealso:: :ref:`faq2_10`
.. config:option:: $cfg['maxRowPlotLimit']
:type: integer
:default: 500
Maximum number of rows retrieved for zoom search.
Cookie authentication options
-----------------------------
@ -1965,7 +1974,7 @@ Cookie authentication options
* ``Strict``
* ``None``
.. seealso:: `rfc6265 bis <https://tools.ietf.org/id/draft-ietf-httpbis-rfc6265bis-03.html#rfc.section.5.3.7>`_
.. seealso:: `rfc6265 bis <https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-03#section-5.3.7>`_
.. config:option:: $cfg['LoginCookieRecall']
@ -2389,6 +2398,13 @@ Navigation panel setup
Whether to show events under database in the navigation panel.
.. config:option:: $cfg['NavigationTreeAutoexpandSingleDb']
:type: boolean
:default: true
Whether to expand single database in the navigation tree automatically.
.. config:option:: $cfg['NavigationWidth']
:type: integer
@ -2484,6 +2500,20 @@ Main panel
Database structure
------------------
.. config:option:: $cfg['ShowDbStructureCharset']
:type: boolean
:default: false
Defines whether to show a column displaying the charset for all tables in the database structure page.
.. config:option:: $cfg['ShowDbStructureComment']
:type: boolean
:default: false
Defines whether to show a column displaying the comments for all tables in the database structure page.
.. config:option:: $cfg['ShowDbStructureCreation']
:type: boolean
@ -2583,6 +2613,19 @@ Browse mode
.. versionchanged:: 3.4.0
Since phpMyAdmin 3.4.0 the default value is ``'SMART'``.
.. config:option:: $cfg['DisplayBinaryAsHex']
:type: boolean
:default: true
Defines whether the ":guilabel:`Show binary contents as HEX`" browse option is
ticked by default.
.. versionadded:: 3.3.0
.. deprecated:: 4.3.0
This setting was removed.
.. config:option:: $cfg['GridEditing']
:type: string
@ -2730,6 +2773,13 @@ Export and import settings
* ``custom-no-form`` same as ``custom`` but does not display the option
of using quick export
.. config:option:: $cfg['Export']['compression']
:type: string
:default: ``'none'``
Default export compression method. Possible values are ``'none'``, ``'zip'`` or ``'gzip'``.
.. config:option:: $cfg['Export']['charset']
:type: string
@ -2791,6 +2841,18 @@ Export and import settings
Defines charset for import. By default no charset conversion is done
assuming UTF-8.
.. config:option:: $cfg['Schema']
:type: array
:default: array(...)
.. config:option:: $cfg['Schema']['format']
:type: string
:default: ``'pdf'``
Defines the default format for schema export. Possible values are ``'pdf'``, ``'eps'``, ``'dia'`` or ``'svg'``.
Tabs display settings
---------------------
@ -3395,11 +3457,49 @@ Various display setting
Repeat the headers every X cells, or 0 to deactivate.
.. config:option:: $cfg['EditInWindow']
:type: boolean
:default: true
.. seealso:: `Feature request to add a pop-up window back <https://github.com/phpmyadmin/phpmyadmin/issues/11983>`_
.. deprecated:: 4.3.0
This setting was removed.
.. config:option:: $cfg['QueryWindowWidth']
:type: integer
:default: 550
.. deprecated:: 4.3.0
This setting was removed.
.. config:option:: $cfg['QueryWindowHeight']
:type: integer
:default: 310
.. deprecated:: 4.3.0
This setting was removed.
.. config:option:: $cfg['QueryHistoryDB']
:type: boolean
:default: false
.. config:option:: $cfg['QueryWindowDefTab']
:type: string
:default: ``'sql'``
.. deprecated:: 4.3.0
This setting was removed.
.. config:option:: $cfg['QueryHistoryMax']
:type: integer

34
doc/faq.rst
View File

@ -553,41 +553,41 @@ The default values for most Suhosin configuration options will work in
most scenarios, however you might want to adjust at least following
parameters:
* `suhosin.request.max\_vars <https://suhosin.org/stories/configuration.html#suhosin-request-max-vars>`_ should
* `suhosin.request.max\_vars <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-vars>`_ should
be increased (eg. 2048)
* `suhosin.post.max\_vars <https://suhosin.org/stories/configuration.html#suhosin-post-max-vars>`_ should be
* `suhosin.post.max\_vars <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-vars>`_ should be
increased (eg. 2048)
* `suhosin.request.max\_array\_index\_length <https://suhosin.org/stories/configuration.html#suhosin-request-max-array-index-length>`_
* `suhosin.request.max\_array\_index\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-array-index-length>`_
should be increased (eg. 256)
* `suhosin.post.max\_array\_index\_length <https://suhosin.org/stories/configuration.html#suhosin-post-max-array-index-length>`_
* `suhosin.post.max\_array\_index\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-array-index-length>`_
should be increased (eg. 256)
* `suhosin.request.max\_totalname\_length <https://suhosin.org/stories/configuration.html#suhosin-request-max-totalname-length>`_
* `suhosin.request.max\_totalname\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-totalname-length>`_
should be increased (eg. 8192)
* `suhosin.post.max\_totalname\_length <https://suhosin.org/stories/configuration.html#suhosin-post-max-totalname-length>`_ should be
* `suhosin.post.max\_totalname\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-totalname-length>`_ should be
increased (eg. 8192)
* `suhosin.get.max\_value\_length <https://suhosin.org/stories/configuration.html#suhosin-get-max-value-length>`_
* `suhosin.get.max\_value\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-get-max-value-length>`_
should be increased (eg. 1024)
* `suhosin.sql.bailout\_on\_error <https://suhosin.org/stories/configuration.html#suhosin-sql-bailout-on-error>`_
* `suhosin.sql.bailout\_on\_error <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-sql-bailout-on-error>`_
needs to be disabled (the default)
* `suhosin.log.\* <https://suhosin.org/stories/configuration.html#logging-configuration>`_ should not
* `suhosin.log.\* <https://suhosin5.suhosin.org/stories/configuration.html#logging-configuration>`_ should not
include :term:`SQL`, otherwise you get big
slowdown
* `suhosin.sql.union <https://suhosin.org/stories/configuration.html#suhosin-
* `suhosin.sql.union <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-
sql-union>`_ must be disabled (which is the default).
* `suhosin.sql.multiselect <https://suhosin.org/stories/configuration.html#
* `suhosin.sql.multiselect <https://suhosin5.suhosin.org/stories/configuration.html#
suhosin-sql-multiselect>`_ must be disabled (which is the default).
* `suhosin.sql.comment <https://suhosin.org/stories/configuration.html#suhosin-
* `suhosin.sql.comment <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-
sql-comment>`_ must be disabled (which is the default).
To further improve security, we also recommend these modifications:
* `suhosin.executor.include.max\_traversal <https://suhosin.org/stories/
* `suhosin.executor.include.max\_traversal <https://suhosin5.suhosin.org/stories/
configuration.html#suhosin-executor-include-max-traversal>`_ should be
enabled as a mitigation against local file inclusion attacks. We suggest
setting this to 2 as ``../`` is used with the ReCaptcha library.
* `suhosin.cookie.encrypt <https://suhosin.org/stories/configuration.html#
* `suhosin.cookie.encrypt <https://suhosin5.suhosin.org/stories/configuration.html#
suhosin-cookie-encrypt>`_ should be enabled.
* `suhosin.executor.disable_emodifier <https://suhosin.org/stories/config
* `suhosin.executor.disable_emodifier <https://suhosin5.suhosin.org/stories/config
uration.html#suhosin-executor-disable-emodifier>`_ should be enabled.
You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`.
@ -851,8 +851,8 @@ Here are a few points to check:
Dorninger for the hint).
* In the :file:`php.ini` directive ``arg_separator.input``, a value of ";"
will cause this error. Replace it with "&;".
* If you are using `Suhosin <https://suhosin.org/stories/index.html>`_, you
might want to increase `request limits <https://suhosin.org/stories/faq.html>`_.
* If you are using `Suhosin <https://suhosin5.suhosin.org/stories/index.html>`_, you
might want to increase `request limits <https://suhosin5.suhosin.org/stories/faq.html>`_.
* The directory specified in the :file:`php.ini` directive
``session.save_path`` does not exist or is read-only (this can be caused
by `bug in the PHP installer <https://bugs.php.net/bug.php?id=39842>`_).

2
doc/setup.rst
View File

@ -67,7 +67,7 @@ Red Hat Enterprise Linux
Red Hat Enterprise Linux itself and thus derivatives like CentOS don't
ship phpMyAdmin, but the Fedora-driven repository
`Extra Packages for Enterprise Linux (EPEL) <https://fedoraproject.org/wiki/EPEL>`_
`Extra Packages for Enterprise Linux (EPEL) <https://docs.fedoraproject.org/en-US/epel/>`_
is doing so, if it's
`enabled <https://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_.
But be aware that the configuration file is maintained in

4
doc/two_factor.rst
View File

@ -53,8 +53,8 @@ There are several manufacturers of these tokens, for example:
* `youbico FIDO U2F Security Key <https://www.yubico.com/fido-u2f/>`_
* `HyperFIDO <https://www.hypersecu.com/hyperfido>`_
* `Trezor Hardware Wallet <https://trezor.io/?offer_id=12&aff_id=1592&source=phpmyadmin>`_ can act as an `U2F token <https://wiki.trezor.io/User_manual:Two-factor_Authentication_with_U2F>`_
* `List of Two Factor Auth (2FA) Dongles <https://www.dongleauth.info/dongles/>`_
* `Trezor Hardware Wallet <https://trezor.io/?offer_id=12&aff_id=1592&source=phpmyadmin>`_ can act as an `U2F token <https://trezor.io/learn/a/what-is-u2f>`_
* `List of Two Factor Auth (2FA) Dongles <https://www.dongleauth.com/dongles/>`_
.. _simple2fa:

6
doc/vendors.rst
View File

@ -36,8 +36,8 @@ Specific files LICENSES
phpMyAdmin distributed themes contain some content that is under licenses.
- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons <http://www.famfamfam.com/lab/icons/silk/>`_.
- Some icons of the `Metro` theme are from the `Silk Icons <http://www.famfamfam.com/lab/icons/silk/>`_.
- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_.
- Some icons of the `Metro` theme are from the `Silk Icons <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_.
- `themes/*/img/b_rename.svg` Is a `Icons8 <https://thenounproject.com/Icons8/>`_, icon from the `Android L Icon Pack Collection <https://thenounproject.com/Icons8/collection/android-l-icon-pack/>`_. The icon `rename <https://thenounproject.com/term/rename/61456/>`_.
- `themes/metro/img/user.svg` Is a IcoMoon the `user <https://github.com/Keyamoon/IcoMoon-Free/blob/master/SVG/114-user.svg>`_
@ -46,6 +46,6 @@ CC BY 4.0 or GPL
Licenses for vendors
--------------------
- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 <http://www.famfamfam.com/lab/icons/silk/>`_ licenses.
- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_ licenses.
- `rename` from `Icons8` is under the `"public domain" <https://creativecommons.org/publicdomain/zero/1.0/>`_ (CC0 1.0) license.
- IcoMoon Free is under `"CC BY 4.0 or GPL" <https://github.com/Keyamoon/IcoMoon-Free/blob/master/License.txt>`_.

3
js/src/makegrid.js
View File

@ -2184,6 +2184,9 @@ window.makeGrid = function (t, enableResize, enableReorder, enableVisib, enableG
// wrap all truncated data cells with span indicating the original length
// todo update the original length after a grid edit
$(t).find('td.data.truncated:not(:has(span))')
.filter(function () {
return $(this).data('originallength') !== undefined;
})
.wrapInner(function () {
return '<span title="' + window.Messages.strOriginalLength + ' ' +
$(this).data('originallength') + '"></span>';