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

345 Commits

Author SHA1 Message Date
Michal Čihař
1d09172f14 Turn OpenDocument wrapper to a class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:49:53 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
83476322ba Use PmaAbsolueUri for cookie path 
Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:35:15 +02:00
Michal Čihař
7ef6fecb87 Merge branch 'master' into master-security 2016-08-01 11:07:33 +02:00
Michal Čihař
ea73fded71 Adjust tests to token removal from GET 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:22:45 +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ř
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ř
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ř
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Michal Čihař
99492bf42a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-26 16:29:07 +02:00
Michal Čihař
22c4ede46d Merge branch 'QA_4_6' 2016-07-26 16:26:57 +02:00
Michal Čihař
6c95b73f90 Do not append session IDs to all URLs in redirect 
There is no need to do that as we rely on session cookies anyway. Also
appending sesson ID to external URLs is not a good idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 16:20:04 +02:00
Michal Čihař
45aedabbe6 Fix test errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 14:47:28 +02:00
Michal Čihař
f72572708f Merge branch 'QA_4_6-security' into master-security 2016-07-22 14:42:09 +02:00
Michal Čihař
9106b33933 Improve secrets splitting 
- ensure it has 16 bytes
- extends it by copying content if original is too short
- correctly handle corner cases (eg. 1 byte secret)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 14:10:28 +02:00
Michal Čihař
643681ee68 Use consistent iv and encrypted text concatenation as other libs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 13:46:51 +02:00
Michal Čihař
2adf1ca83e Merge branch 'QA_4_6-security' into master-security 2016-07-22 11:35:14 +02:00
Michal Čihař
3ee65fc8bf Use MAC to verify IV as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 10:29:46 +02:00
Michal Čihař
ef03daf658 Remove hashing of blowfish secret 
New code doesn't have problems with longer secrets.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 09:59:02 +02:00
Michal Čihař
d29df46b3a Do not generate too long session secret 
We need 16+16 bytes, generating 256 is not really needed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 09:58:39 +02:00
Michal Čihař
e2a25d773d Merge pmaServer and pmaPass cookies 
This addresses several issues:

- makes server name encrypted and authenticated, so that it can not be
  tampered
- reduces cookie usage
- reduces overhead of encryption/authentication

The pmaUser cookie is still separate to avoid different lifetime
(pmaUser has month lifetime, while pmaAuth is session only by default).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 09:47:32 +02:00
Michal Čihař
2a2d865d50 Validate input data from cookies 
We expect strings only, so not accept anything else.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 09:47:32 +02:00
Michal Čihař
3ba8a026fc Use hash_hmac for MAC rather than plain SHA1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 16:56:52 +02:00
Michal Čihař
3f98ad5414 Merge branch 'QA_4_6-security' into master-security 2016-07-18 16:24:12 +02:00
Michal Čihař
1543be7138 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-18 16:22:33 +02:00
Michal Čihař
af8385dc87 Fix tests for transformations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-13 12:16:45 +02:00
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ř
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ř
3b0115a321 Adjust tests to recent changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 11:17:47 +02:00
Michal Čihař
fc6ef261eb Remove Swekey support 
It is buggy and their servers are no longer working.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 09:02:58 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
a97be3a604 Improve cookie encryption 
- use MAC to validate content before decryption
- create unique IV for every cookie

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-08 17:40:05 +02:00
Michal Čihař
7de139b90c Properly escape generated XML export 
Many fields could contain XML markup, so we need to ensure the generated
XML is valid.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:54:05 +02:00
Michal Čihař
bd2080c40a Adjust test to not use HTML escaping layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:52:49 +02:00
Michal Čihař
99d7407aa2 Fix PHP export tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:30:35 +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ř
45ef3aed75 Remove needless inclusion of export.php from tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:38:58 +02:00
Michal Čihař
9b7a6967a8 Merge branch 'QA_4_6' 2016-06-15 11:46:29 +02:00
Michal Čihař
8a142aba73 Adjust tests to new behavior 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:45:16 +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ř
c70aed7a1d Merge branch 'QA_4_6' 2016-06-09 09:40:21 +02:00
Michal Čihař
763683b4fe Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:40:16 +02:00