1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Commit Graph

31 Commits

Author SHA1 Message Date
Michal Čihař
31f6d76405 Merge branch 'QA_4_6' 2016-08-24 11:55:10 +02:00
Michal Čihař
48b6dd58d8 Use one code to check external links
There is no good reason to duplicate the check in several places.

Fixes #12479

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-24 11:38:03 +02:00
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
d31ff5a1e7 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-28 09:43:26 +02:00
Michal Čihař
a2e6c78fb7 Use https for outbound links where applicable
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-28 09:41:52 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
4072c1d29a Use example.com for sample test urls
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-28 09:12:01 +02:00
Michal Čihař
a7333d7cc7 Merge branch 'QA_4_6-security' into master-security 2016-07-13 11:12:48 +02:00
Michal Čihař
e4be768781 Ensure widht and height are integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:55:07 +02:00
Michal Čihař
dc899d8e75 Ensure widht and height are integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:52:28 +02:00
Michal Čihař
c3310536b2 Ensure widht and height are integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:49:47 +02:00
Michal Čihař
cc6853538c Properly escape error input in the message
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-13 10:46:14 +02:00
Michal Čihař
f00b258749 Merge branch 'QA_4_6-security' into master-security 2016-07-12 14:16:11 +02:00
Michal Čihař
2ef4fe3d84 Use iframe sandbox for rendering HTML in transformation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 14:15:30 +02:00
Michal Čihař
065b876c1a Merge branch 'QA_4_6-security' into master-security 2016-07-12 11:22:37 +02:00
Michal Čihař
2ea0b722d7 Use _blank target instead of invalid _new
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 11:22:23 +02:00
Michal Čihař
fb1884295f Merge branch 'QA_4_6-security' into master-security 2016-07-12 11:19:09 +02:00
Michal Čihař
3c06eede3f Add rel="noopener noreferrer" to all target="_blank" links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 11:02:53 +02:00
Michal Čihař
3434c70a51 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:38:08 +02:00
Michal Čihař
0bf21ebf72 Use whitelist rather than blacklist for URL filtering
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 10:37:25 +02:00
Michal Čihař
c3f7aa8190 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:29:13 +02:00
Michal Čihař
615212a14d Do not allow javascript: links in transformation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-22 13:28:07 +02:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
be3ecbb4cc Simplify and cleanup transformation plugins
Remove PMA_transformation_global_html_replace which makes the code only
more confusing.

Also add escaping to browse transformations.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 16:18:13 +02:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-04 16:35:28 +01:00
Hugues Peccatte
154a942145 Remove side effects in declaration files.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:40 +01:00
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-18 22:51:01 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-07 22:09:55 +02:00
Hugues Peccatte
e81234d142 Fix typo in class name.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-30 21:54:17 +02:00
Hugues Peccatte
8c289e523b Revert transformation classes rename.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 21:48:43 +02:00
Hugues Peccatte
857c8a92cf Move abstract transformation plugins to abs folder.
Update templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 14:13:31 +02:00