aboutsummaryrefslogtreecommitdiffstats
path: root/lib/base.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-161-2/+8
|\ | | | | | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
| * Include exception message in log entry when session fails to startTom Needham2013-10-121-1/+1
| |
| * Handle ownCloud logging when data dir not createdTom Needham2013-10-111-6/+2
| |
| * Log the session exception when ownCloud is not installedTom Needham2013-10-111-3/+6
| |
| * Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+7
| |\ | | | | | | On an auth failure the uid and the IP address should be logged to the st...
| | * changed the argument to false for getValue , reformated else statementAxel Roenn2013-10-101-3/+2
| | |
| | * Changed default behaviour to not log IP address in case of an auth failure. ↵Axel Roenn2013-09-101-2/+8
| | | | | | | | | | | | | | | | | | Can be configured in OC conf now. Log level changed to warning .
| | * On an auth failure the uid and the IP address should be logged to the ↵Axel Roenn2013-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | standard log file. This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header instead of the remote address.
* | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-081-3/+28
|\| |
| * | fixing various PHPDoc commentsThomas Müller2013-10-021-2/+2
| | |
| * | remove obsolete function login()Thomas Müller2013-10-021-8/+0
| | |
| * | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-021-4/+17
| | |
| * | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-021-1/+1
| |\ \
| * | | Squashed commit of the following:Thomas Müller2013-10-011-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Thu Aug 22 11:45:27 2013 +0200 fixing undefined variable commit 982f327ca10eea0a2222eae3e74210648591fd8a Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Wed Aug 7 12:00:14 2013 +0200 adding login.php as alternative for index.php/login commit da0d7e1d096fb80789524b01f0f96fe08d147943 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Wed Aug 7 11:36:12 2013 +0200 adding a route for web login commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e Author: Karl Beecher <karl@endocode.com> Date: Tue Aug 6 17:00:28 2013 +0200 Login attempt returns true instead of exiting immediately commit fd89d55de9e71e986e03a0de9aad9407b632e22f Author: Karl Beecher <karl@endocode.com> Date: Mon Aug 5 15:31:30 2013 +0200 Further abstraction. This change introduces the ApacheBackend interface for backends that depend on Apache authentication and session management. There are no longer references to specific backends in OC_User. commit 469cfd98aea5a37985722cf5f9e00ece0ce38178 Author: Karl Beecher <karl@endocode.com> Date: Thu Aug 1 15:46:36 2013 +0200 Make login attempt function protected. commit d803515f19ff086e2028fcaa51afae579685e596 Author: Karl Beecher <karl@endocode.com> Date: Wed Jul 31 16:00:22 2013 +0200 Amends the login link When using a Shibboleth login, clicking logout displays a message to the user instead of ending the session. commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f Author: Karl Beecher <karl@endocode.com> Date: Tue Jul 30 13:15:59 2013 +0200 Abstract Shibboleth authentication into an Apache authentication method commit 69082f2ebcab267f6e8eceb1a252f84c52236546 Author: Karl Beecher <karl@endocode.com> Date: Tue Jul 30 11:22:26 2013 +0200 Convert spaces -> tabs commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 17:40:48 2013 +0200 Separate the authentication methods SABRE authentication and base authentication have slightly different workings right now. They should be refactored into a common method later, but time pressure requires us to reinvent the wheel slightly. commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 17:07:07 2013 +0200 Authenicate calls to WebDAV against Shibboleth. When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is normally called without trying the Shibboleth authentication... thus the session is not established. The method now tries Shib authentication, setting up a session if the user has already authenticated. commit 091e4861b2246c4084c9b30e232289fde4ba1abf Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 14:04:54 2013 +0200 Sets up the Shibboleth login attempt. commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 12:36:44 2013 +0200 Add a method for attempting shibboleth login. If the PHP_AUTH_USER and EPPN environment variables are set, attempt a Shibboleth (passwordless) login. commit 667d0710a7854e58fb109201d9cee6ec064e793a Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 11:38:04 2013 +0200 Revert "Adds the apps2 folder with user_shibboleth backend." This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef. commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 11:28:06 2013 +0200 Adds the apps2 folder with user_shibboleth backend. Conflicts: core/templates/layout.user.php lib/base.php
* | | | PHPDoc addedThomas Müller2013-10-071-2/+6
| |/ / |/| |
* | | Merge branch 'master' into lib-private-master-2Thomas Müller2013-09-301-0/+1
|\| |
| * | Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabledThomas Müller2013-09-301-0/+1
| |\ \ | | | | | | | | don't remember login if the encrypion app is enabled
| | * | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-241-1/+1
| | | |
| | * | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-0/+1
| | | | | | | | | | | | | | | | needs to log-in again in order to decrypt his private key with his password
* | | | move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-1/+1
|/ / / | | | | | | | | | | | | Conflicts: lib/private/vcategories.php
* | | Merge branch 'master' into appframework-masterThomas Müller2013-09-251-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php
| * | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-191-0/+1
| |\ \ | | | | | | | | Use more object oriented way for console commands
| | * | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+1
| | | |
* | | | Note to self 2: Do as you preach. Test!Thomas Tanghus2013-09-181-1/+1
| | | |
* | | | Note to self: Test before pushing!!!Thomas Tanghus2013-09-181-1/+1
| | | |
* | | | Use new emitter systemThomas Tanghus2013-09-181-1/+3
| | | |
* | | | OC_Cache namespace changes and add UserCache to server container.Thomas Tanghus2013-09-171-2/+2
| | | | | | | | | | | | | | | | Refs #4863
* | | | /OC/Server has created too early causing issues with config operations as ↵Thomas Müller2013-09-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | OC:$SERVERPATH was not yet initialized This fixes unit test execution
* | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-151-0/+8
|\| | |
| * | | Merge branch 'master' into oc_avatarskondou2013-09-121-10/+5
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into oc_avatarskondou2013-09-041-4/+4
| |\ \ \
| * | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-5/+7
| | | | |
| * | | | Merge branch 'master' into oc_avatarskondou2013-08-311-9/+26
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use defaultavatarskondou2013-08-291-0/+6
| | | | |
* | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-131-14/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Revert "fixes #4574"Thomas Müller2013-09-061-10/+5
| | |_|/ | |/| | | | | | | | | | This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.
| * | | Merge branch 'master' into clean_up_utilkondou2013-09-021-15/+51
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: lib/base.php
| | * | Merge master into oc_previewGeorg Ehrke2013-08-301-9/+17
| | |\ \
| | * \ \ Merge master into oc_previewGeorg Ehrke2013-08-291-6/+25
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-231-16/+19
| | |\ \ \
| | * \ \ \ Merge branch 'master' into oc_previewThomas Müller2013-07-301-31/+22
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: 3rdparty lib/template.php
| | * \ \ \ \ merge conflicts ...Georg Ehrke2013-07-101-10/+20
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-06-171-4/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-06-061-7/+16
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-05-291-17/+28
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | move to OC namespaceGeorg Ehrke2013-05-291-2/+2
| | | | | | | | | | |
| | * | | | | | | | | connect preview lib to filesystem hooksGeorg Ehrke2013-05-291-0/+9
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into clean_up_utilkondou2013-08-201-16/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | | | | | | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Clean up \OC\Utilkondou2013-08-151-4/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing