gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,520 Commits 12 Branches 481 Tags 2.4 GiB
97ff98bc62
Commit Graph

106520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
97ff98bc62 Fix tests for transformations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:12:10 +02:00
Michal Čihař
52978a57ad Merge branch 'QA_4_6-security' into master-security 2016-07-13 11:33:53 +02:00
Michal Čihař
42c868b691 HML encode embedded JSON data 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 11:33:35 +02:00
Michal Čihař
a7333d7cc7 Merge branch 'QA_4_6-security' into master-security 2016-07-13 11:12:48 +02:00
Michal Čihař
987cce0bcf Properly escape foreign key selection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 11:10:44 +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ř
9f11a0e811 Add missing escaping in user group queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:40:13 +02:00
Michal Čihař
f0ad030460 Merge branch 'QA_4_6-security' into master-security 2016-07-13 10:34:31 +02:00
Michal Čihař
c3a3531b61 Escape HTML markup in transformation wrapper 
...in case content type is html.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:32:55 +02:00
Michal Čihař
9e3492730e Do not use empty MIME type 
This will turn on content sniffing in browser leading to unwanted
results.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:28:38 +02:00
Michal Čihař
7e510e8e92 Properly escape partition removal query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 10:21:24 +02:00
Michal Čihař
dc52930bba Properly handle newlines in SQL comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:59:39 +02:00
Michal Čihař
6b9197d7df Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:49:06 +02:00
Michal Čihař
dd732134f2 Do not try to create non existing classes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:47:09 +02:00
Michal Čihař
ceeef53748 Add missing escaping to the export type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:43:07 +02:00
Michal Čihař
71ccd06aa9 Merge branch 'QA_4_6-security' into master-security 2016-07-13 09:38:56 +02:00
Michal Čihař
dee23704ee Merge branch 'master' into master-security 2016-07-13 09:38:52 +02:00
Michal Čihař
551031da09 Validate image scaling dimensions 
Ensure we pass only integers and they are not too big.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 09:38:33 +02:00
Michal Čihař
0966c7f105 Link to github issue tracker rather than old sf.net one 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 08:25:19 +02:00
Michal Čihař
e9d5efd69d Merge branch 'QA_4_6-security' into master-security 2016-07-12 22:24:19 +02:00
Michal Čihař
1290f9895b Fix merge error in po file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 20:33:54 +02:00
Michal Čihař
24246115f5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 17:43:52 +02:00
Michal Čihař
7ef96c5cdc Correctly escape MySQL username in queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 17:42:45 +02:00
Michal Čihař
c2ca1c8c22 Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:58:46 +02:00
Michal Čihař
80b03a4f16 Ensure page number is integer 
Even if somebody decides to change configuration storage structure.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:57:35 +02:00
Michal Čihař
bde4ef735b Escape suggested database name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:42:50 +02:00
Michal Čihař
dfa389aa5a Merge branch 'QA_4_6-security' into master-security 2016-07-12 16:29:26 +02:00
Michal Čihař
ba072e42dc Validate serialized data before unserializing 
We need only strings, integers or arrays, so there is no need to
unserialize strings containing any complex types.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 16:29:11 +02:00
Michal Čihař
5299b36983 Merge branch 'QA_4_6-security' into master-security 2016-07-12 15:15:15 +02:00
Michal Čihař
767195e197 Sanitize MySQL host name before connecting 
It can contain p: prefix which we don't want to honor.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 15:14:57 +02:00
Michal Čihař
3d628c7fa5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 14:41:02 +02:00
Michal Čihař
e749214b16 Prefer curl over file_get_contents 
Curl is better in SSL certificate verification.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 14:39:03 +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ř
2f79bacefa Use phpseclib's Crypt module to generate encryption keys 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 14:06:39 +02:00
Michal Čihař
c3401ec878 Merge branch 'QA_4_6-security' into master-security 2016-07-12 12:50:54 +02:00
Michal Čihař
0d57c09bd5 Do not allow symlinks in UploadDir 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:50:36 +02:00
Michal Čihař
8095b837fa Hide session error messages to avoid FPD 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:38:32 +02:00
Michal Čihař
78bed3c444 Ensure last version is numeric 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:34:18 +02:00
Michal Čihař
303ace23b5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 12:31:12 +02:00
Michal Čihař
6da13e2a1c Escape HTML in Mediawiki comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 12:30:58 +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ř
3b0115a321 Adjust tests to recent changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 11:17:47 +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ř
1412fc14d1 Merge branch 'master' into master-security 2016-07-12 10:47:15 +02:00