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

106500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
dee23704ee Merge branch 'master' into master-security 2016-07-13 09:38:52 +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
Michal Čihař
a6eaffe11c Use https URL for tcpdf 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:46:55 +02:00
Michal Čihař
bd472d5144 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:43:29 +02:00
Michal Čihař
36ba6d9aba Merge branch 'master' into master-security 2016-07-12 10:43:10 +02:00
Michal Čihař
e3cf00b122 Merge branch 'QA_4_6' 2016-07-12 10:43:04 +02:00
Michal Čihař
2090eb57aa Merge branch 'QA_4_6' into QA_4_6-security 2016-07-12 10:42:47 +02:00
Michal Čihař
c0450b2915 Remove allowed failures test from maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:42:41 +02:00
Michal Čihař
27b8005fa0 Merge branch 'QA_4_6-security' into master-security 2016-07-12 10:38:34 +02:00
Michal Čihař
8b5cafc9f3 Fix wrong merge resolution 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:38:25 +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ř
a499487974 Merge branch 'master' into master-security 2016-07-12 10:33:42 +02:00
Michal Čihař
5873af7d75 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-12 10:32:52 +02:00
Michal Čihař
0ce8cd7919 Merge branch 'QA_4_6' 2016-07-12 10:28:28 +02:00
Michal Čihař
11e772c46d Merge remote-tracking branch 'origin/QA_4_6' 2016-07-12 10:28:25 +02:00
Michal Čihař
b8b1bdd77e Include X-Robots-Tag header in responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:28:03 +02:00
José Camilo Fernandes Coelho
19dee09c3f Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1722 of 3208 strings)

[CI skip]
 2016-07-12 10:26:16 +02:00
José Camilo Fernandes Coelho
f28925adb0 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1731 of 3209 strings)

[CI skip]
 2016-07-12 10:25:53 +02:00
Madhura Jayaratne
cbba4f4fdb Fix XSS in server_replication.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-07-12 11:49:53 +10:00
Madhura Jayaratne
cc7d01daa7 Fix XSS in tbl_gis_visualization.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-07-12 11:27:36 +10:00
Saulo Castro
64b1f13200 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2997 of 3209 strings)

[CI skip]
 2016-07-11 18:45:29 +02:00