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

1013 Commits

Author SHA1 Message Date
Michal Čihař
696eeb463d Merge branch 'QA_4_6' 2016-08-02 08:43:22 +02:00
Michal Čihař
38b73180fd Fix password change in cookie auth 
We can not set same cookie twice, so we have to avoid sending auth
cookie when we're about to change the password.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:42:44 +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ř
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +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ř
d15490088c Merge branch 'QA_4_6' 2016-07-27 16:30:47 +02:00
Michal Čihař
af337d2054 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:29:08 +02:00
Michal Čihař
870ca1cc7a Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:28:07 +02:00
Michal Čihař
e14c334d7a Merge branch 'QA_4_6' 2016-07-26 16:47:33 +02:00
Michal Čihař
16c4ca0daa Properly escape configuration parameters when rendering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:47:01 +02:00
Michal Čihař
7de035439d Merge branch 'QA_4_6' 2016-07-22 16:42:58 +02:00
Michal Čihař
61150656df Fixed invalid Content-Length in some HTTP responses 
Use strlen for calculating HTTP response size, we're interested in bytes
not utf-8 chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 16:41:51 +02:00
Michal Čihař
76e87c3e33 Do not use mb_strlen on data we know are bytes 
Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 16:39:12 +02:00
Michal Čihař
d35c3d9ed5 Update ReCaptcha library to 1.1.2 
There should be no functional changes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 15:51:44 +02:00
Michal Čihař
d85b701c9b Use ShapeFile library naming of shapes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:16:12 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 15:52:40 +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ř
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +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ř
dce94f229f More consistency for URL::getCommon 
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 12:44:29 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Michal Čihař
136b85fc97 Produce valid JSON on export 
The JSON export now generates valid JSON data, but this means that the
resulting JSON format has changed.

Fixes #12307

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 09:16:58 +02:00
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
e6ff157dda The session_destroy is already called on logout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 15:30:55 +02:00
Michal Čihař
0b2b23f2ce Merge branch 'QA_4_6' 2016-06-08 14:00:26 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 14:00:04 +02:00
Michal Čihař
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine 
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:41:55 +02:00
Michal Čihař
9d5c5f0c86 Adjust tests to new error messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 21:27:41 +02:00
Michal Čihař
8ba932da58 Merge branch 'QA_4_6' 2016-05-23 17:38:00 +02:00
Michal Čihař
e1f8c36c79 Fix class namespace 
Fixes loading of APC based upload progress bar

Fixes #12248

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:37:38 +02:00
Michal Čihař
4cd8ab8a95 Better report errors while generating SQL exports 
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:21:58 +02:00
Michal Čihař
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +02:00
Michal Čihař
3b374237d6 Fixed export of ARCHIVE tables with keys 
We can not rewrite the ARCHIVE table as it can not be altered.

Fixes #12082

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:54:26 +02:00
Michal Čihař
efc89f9fbc Merge branch 'QA_4_6' 2016-05-23 14:28:33 +02:00
Michal Čihař
f978e347fb Add missing requie once for testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 14:28:28 +02:00
Michal Čihař
b52bd77987 Merge branch 'QA_4_6' 2016-05-23 13:49:00 +02:00
Michal Čihař
f9d6c40939 Safer handling of sessions during authentication 
- always generate new session for login form
- always generate new session when authenticated using cookie auth

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 13:48:25 +02:00
Michal Čihař
792f5dc794 Merge branch 'QA_4_6' 2016-05-23 13:23:43 +02:00
Michal Čihař
adfd5a22b9 Avoid double redirects in signon auth on logout 
Also adjusts tests to no longer rely on runkit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 13:23:16 +02:00
Michal Čihař
e3d650a2bb Merge branch 'QA_4_6' 2016-05-23 13:05:01 +02:00
Michal Čihař
11eb574242 Improve handling of logout 
- add separate script for handling logout
- no longer require old_usr for all authentication methods
  (this avoids potential information leak)
- require valid token for logout

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 13:02:21 +02:00
Michal Čihař
21db724c85 Remove need for having define for test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 12:09:36 +02:00
Michal Čihař
a2b8bfc308 Merge branch 'QA_4_6' 2016-05-17 10:50:16 +02:00
Michal Čihař
b0f8511e60 Use https for links to www.phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:49:21 +02:00