gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,947 Commits 12 Branches 481 Tags 2.4 GiB
60530a1df9
Commit Graph

102947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
60530a1df9 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-26 18:27:05 +01:00
Michal Čihař
6e6b922ee8 Do not run tests with allowed failures on maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:23:34 +01:00
Michal Čihař
0cade5712a Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:19:07 +01:00
Michal Čihař
c57d3cc7b9 Avoid invalid invocation of SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:10:18 +01:00
Michal Čihař
76b10187c3 Fallback to default collation connection 
If user supplied wrong string we should gracefully fallback.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:00:19 +01:00
Michal Čihař
f83b52737e Do not process subforms with PMA_MINIMUM_COMMON 
In such case needed infrastructure is not loaded, so related code won't
work anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:35:08 +01:00
Michal Čihař
447c88f488 Can not use PMA_fatalError when including fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:30:57 +01:00
Michal Čihař
85ccdbb5b9 Include common libraries in setup 
We use PMA_fatalError which in turn needs Response and related objects.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 14:27:38 +01:00
Michal Čihař
7ffd8d69a1 Merge pull request #5 from phpmyadmin/hash_equals 
Use hash_equals for comparing token
 2016-01-26 09:55:05 +01:00
Madhura Jayaratne
1d885f90bc Merge pull request #8 from phpmyadmin/js-password 
Improve JS password generating
 2016-01-26 12:05:25 +11:00
Madhura Jayaratne
c8615de52a Merge pull request #7 from phpmyadmin/iis-escape 
Escape javascript variable content
 2016-01-26 11:53:51 +11:00
Madhura Jayaratne
8aa28962f1 Merge pull request #6 from phpmyadmin/json-header 
Set correct content type for JSON responses
 2016-01-26 10:57:12 +11:00
Madhura Jayaratne
3bb784045b Merge pull request #4 from phpmyadmin/random 
Improve token generation
 2016-01-26 10:32:51 +11:00
Michal Čihař
912856b432 Use full alphabet to generate random passwords 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:44:16 +01:00
Michal Čihař
8dedcc1a17 Use secure RNG if available 
Recent browsers come with better RNG, so let's use it for generating
password instead of Math.random if available.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:43:03 +01:00
Michal Čihař
671d618304 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-25 12:23:23 +01:00
Michal Čihař
aca42efa01 Escape javascript variable content 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:21:48 +01:00
Michal Čihař
316792bf4a Move databse check to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:18:37 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:27:15 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed 
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:45:52 +01:00
Michal Čihař
a5affed07a Validate database before starting designer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:38:50 +01:00
Michal Čihař
5359d9a968 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:26:59 +01:00
Michal Čihař
a6ae24741e Validate parameters before use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
897a844581 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
0490d20408 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:48:32 +01:00
Michal Čihař
dcdeee28eb Gracefully handle errors in regex based javascript search 
User can write any invalid regex and we should handle this gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:44:03 +01:00
Michal Čihař
11496890d7 Tell jQuery we're expecting JSON here 
It's better to be explicit rather than relying on autodetection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:17:20 +01:00
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp 
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:59:14 +01:00
Michal Čihař
cb7748ac9c Update phpseclib to 2.0.1 
New version uses PHP 7.0 random_bytes to generate cryptographically secure
pseudo-random bytes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:47:51 +01:00
Michal Čihař
f20970d32c Use phpseclib's Crypt::Random to generate CSRF token 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:47:51 +01:00
Michal Čihař
0a24f92d08 Set correct content type for JSON responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:32:34 +01:00
Michal Čihař
ec0e88e37e Use hash_equals for comparing token 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:32:07 +01:00
Madhura Jayaratne
edffb52884 Fix XSS in zoom search 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:38 +11:00
Madhura Jayaratne
019c4f25d5 Fix XSS in normalization.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:34 +11:00
Madhura Jayaratne
5aee503564 Fix path disclosure, items 1.4.x, 1.5 and 1.6 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:30 +11:00
Madhura Jayaratne
75a5582401 Fix XSS in DB_search.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:26 +11:00
Erwin Bronkhorst
dbb267308d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 18:35:14 +01:00
Atul Pratap Singh
61e5d5f47b Fix #11860 : TypeError: e.handler.apply is not a function 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-15 10:04:23 +05:30
Weblate
609be25b5e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 04:30:19 +01:00
Deven Bansod
d98f57bc5b Fix a typo in condition check 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 14:29:46 +05:30
kenan akgün
93e1461e33 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 04:30:18 +01:00
Madhura Jayaratne
516082c3c2 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-15 12:40:44 +11:00
Madhura Jayaratne
ff967d99b8 Fix #11814 SQL comment and variable stripped from bookmark on save 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 12:40:30 +11:00
Weblate
61c7c3018a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 00:45:54 +01:00
Stefano Martinelli
4d955255da Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 00:45:52 +01:00
Madhura Jayaratne
4e05d3981a Fix #11854 Undefined property: stdClass::$releases at version check when disabled in config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 10:45:31 +11:00
Παναγιώτης Παπάζογλου
23d4eb9078 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 16:02:19 +01:00
Marc Delisle
0ea7d4a0be Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 13:00:01 +01:00
Kristjan Räts
f49536b798 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 12:53:27 +01:00