Commit Graph

91 Commits

Author SHA1 Message Date
Michal Čihař
2251ca21c0 Fix regexp for file path cleanup
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-02 14:25:04 +02:00
Michal Čihař
cb3f2632a9 Properly escape session startup errors
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-02 14:23:35 +02:00
Michal Čihař
01b9db6b1c Rename getCookiePath() to getRootPath()
It is not used only for cookies, so generic name makes more sense.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-17 15:35:15 +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ř
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ř
99492bf42a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-26 16:29:07 +02:00
Michal Čihař
64f033d3b9 Tighthen control on PHP sessions and session cookies
- use only cookies for session
- use http only cookies
- disable transparent session IDs

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 16:23:51 +02:00
Michal Čihař
d3a91549be Remove file path from the session error message
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-23 10:55:25 +02:00
Michal Čihař
66f774787f Do not fail on errors stored in session
If there is user error stored in session, it would be treated as session
startup error, what is wrong.

Fixes #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 17:15:23 +02:00
Michal Čihař
c7c9918886 This todo is already done with PMA_sessionFailed
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-09 19:31:10 +02:00
Michal Čihař
7e19be3a10 Check if sessions are working and report failures
- Always check for session_start erorrs and report them, this catches
  completely broken session storage or no free inodes for files
- Check whether session can be written, this catches the full disk case

Fixes #12204

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-21 12:09:50 +02:00
Michal Čihař
a6b3a9ce51 Fix error when we can not generate random string
Fixes #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-03-01 15:35:53 +01:00
Michal Čihař
ac9714cf6a Autoloading for phpseclib
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-01 21:53:53 +01:00
Michal Čihař
7b58acf62e Merge branch 'QA_4_5' 2016-02-01 21:46:33 +01:00
Madhura Jayaratne
0b3ac5b557 Fix #11896 Remove hard dependency on phpseclib
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-29 08:36:55 +11:00
Madhura Jayaratne
30ac5b6094 Fix #11892 Error with PMA 4.4.15.3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-29 08:33:42 +11:00
Michal Čihař
ed96969ff9 Merge branch 'QA_4_5' 2016-01-28 09:23:27 +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
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files.
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:39 +01:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Marc Delisle
a20dab9f0d Improve loose comparison
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-26 15:55:13 -04:00
Marc Delisle
146f790b47 Merge branch 'QA_4_4' 2015-04-16 09:01:20 -04:00
Marc Delisle
95868e896e Bug PHP 7 session_regenerate_id() warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-16 09:00:28 -04:00
Michal Čihař
1b1b3cdb67 Disable setting of session cookies for further session_start() calls.
See #1544 for discussion.

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-03-26 22:33:27 +01:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Marc Delisle
52d1485feb Merge branch 'QA_4_2' 2014-07-10 11:54:11 -04:00
Marc Delisle
decb08c4d8 Clarify message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-10 11:31:29 -04:00
Ann + J.M
6b778e09d9 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-22 16:34:34 +02:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 11:57:10 +02:00
Michal Čihař
6c23112446 Better variable name and unset it after use
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-19 11:51:24 +01:00
Marc Delisle
daedc76dc6 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-21 07:42:53 -05:00
Marc Delisle
e6b1391af9 Fix merge conflicts 2013-05-28 08:49:37 -04:00
Marc Delisle
ec6a47d8a0 bug #3957 Cookies must be enabled past this point 2013-05-28 08:46:04 -04:00
Michal Čihař
cf3b086e7e Various coding style improvements 2013-04-16 13:29:03 +02:00
Madhura Jayaratne
50b06fee56 Fix some style violations 2012-06-03 20:01:29 +05:30
Dieter Adriaenssens
543087f54c fix indentation 2012-04-29 00:40:12 +02:00
Madhura Jayaratne
ac83360796 Coding style improvements 2012-03-21 05:45:58 +05:30
Marc Delisle
63ffeebcf8 Merge branch 'QA_3_4' 2011-12-05 11:04:28 -05:00
Marc Delisle
d68c8bb8ed bug #3398788 [session] No feedback when result is empty (signon auth_type) 2011-12-05 11:04:16 -05:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
0f39dc040a Merge branch 'QA_3_3' 2010-08-17 15:31:06 +02:00
Michal Čihař
e8cf1ac677 Generate new token on forcible generating of session id. 2010-08-17 15:30:47 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Michal Čihař
f8f7b5661b This can not use translations as they are initialized after sessions. 2010-05-17 11:35:29 +02:00