summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add some more sanity checks for maintenance modeLukas Reschke2015-01-091-1/+3
|
* Verify authentication before initializing apps and routingLukas Reschke2015-01-091-13/+13
| | | | | | | | | | | | | | | | | | | | | | The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work. Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in. This can be reproduced by installing apps such as the News app and issuing the following command: `curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds` The following parts needs to get throughly tested: - [ ] OCS - [ ] remote.php's DAV features - [ ] Regular login features This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice. Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare. Fixes itself.
* Merge pull request #13204 from owncloud/enc_fix_key_lostVincent Petry2015-01-092-630/+714
|\ | | | | Encryption fix key lost if group share gets renamed
| * unit testsBjoern Schiessle2015-01-091-4/+86
| |
| * don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
| |
* | Merge pull request #13195 from owncloud/resharepermfixMorris Jobke2015-01-092-0/+158
|\ \ | | | | | | Fix reshare permission issue
| * | Fix reshare permission issueVincent Petry2015-01-092-0/+158
| | | | | | | | | | | | | | | The actual share permissions sent to the server on reshare are now based on possiblePermissions + permissions inherited from parent share
* | | Merge pull request #13208 from owncloud/hhvm-streamwrapper-exceptionThomas Müller2015-01-091-12/+5
|\ \ \ | | | | | | | | HHVM Workaround: Do not use Exception from Stream.
| * | | HHVM Workaround: Do not use Exception from Stream.Andreas Fischer2015-01-091-12/+5
| | | | | | | | | | | | | | | | Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-69351373
* | | | Merge pull request #13192 from owncloud/cache_binary_pathThomas Müller2015-01-093-4/+45
|\ \ \ \ | | | | | | | | | | Use memcache for findBinaryPath
| * | | | Memcache binary executable searchingRobin McCorkell2015-01-091-2/+8
| | | | | | | | | | | | | | | | | | | | It's slow, this makes it fast!
| * | | | Add Null memcacherRobin McCorkell2015-01-092-2/+37
| | | | |
* | | | | Merge pull request #13188 from owncloud/add-check-if-user-is-logged-inThomas Müller2015-01-092-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add check if user is logged-in
| * | | | | Add check if user is logged-inLukas Reschke2015-01-092-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise a fatal PHP error is thrown since the filesystem is not setup: ``` ( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817 Call Stack 1 0.0004 247792 {main}( ) ../index.php:0 2 0.0946 5088776 OC::handleRequest( ) ../index.php:28 3 0.1423 7491280 OC\Route\Router->match( ) ../base.php:748 4 0.1664 8592152 call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( ) ../router.php:250 5 0.1664 8592216 __lambda_func( ) ../router.php:250 6 0.1665 8599064 require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' ) ../route.php(135) : runtime-created function:1 7 0.1801 9061096 OCA\Files_Versions\Storage::getUidAndFilename( ) ../getVersions.php:7 8 0.1801 9061144 OC\Files\Filesystem::getOwner( ) ../storage.php:45 ``` Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
* | | | | | Merge pull request #13196 from owncloud/js-personal-no-passwordRobin Appelman2015-01-091-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix js error in personal settings if there is no password field
| * | | | | | Fix js error in personal settings if there is no password fieldRobin Appelman2015-01-091-1/+3
| | | | | | |
* | | | | | | Merge pull request #13205 from owncloud/remove-shared-iconThomas Müller2015-01-092-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | replace outdated 'shared' people icon with regular share icon as fallback
| * | | | | | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #13181 from owncloud/filecache-preventleadingslashRobin McCorkell2015-01-093-2/+38
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Trim leading or trailing slashes in file cache paths
| * | | | | Fix cache jail to not duplicate slashesVincent Petry2015-01-091-1/+1
| | | | | |
| * | | | | Trim leading or trailing slashes in file cache pathsVincent Petry2015-01-082-1/+37
| | | | | |
* | | | | | Merge pull request #12011 from owncloud/reuse-etag-defaultMorris Jobke2015-01-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Default to reusing etags in the scanner
| * | | | | Default to reusing etags in the scannerRobin Appelman2014-11-061-2/+2
| | | | | |
* | | | | | Merge pull request #12995 from owncloud/tbelau666-masterThomas Müller2015-01-097-32/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use Doctrines filter by table name
| * | | | | | add default for dbtableprefixMorris Jobke2014-12-234-5/+5
| | | | | | |
| * | | | | | add proper prefix for migration testsMorris Jobke2014-12-231-1/+1
| | | | | | |
| * | | | | | use injected config object and fix typosMorris Jobke2014-12-224-11/+25
| | | | | | |
| * | | | | | inject \OCP\IConfig instance in migratorMorris Jobke2014-12-223-23/+13
| | | | | | |
| * | | | | | Use Doctrines filter by table nametbelau6662014-12-225-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doctrine's SchemaManager can filter table names by regular expression. On this way it picks up only ownClouds's tables in a database. by tbelau666
* | | | | | | Merge pull request #13191 from owncloud/fix-rename-fieldMorris Jobke2015-01-091-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | fix rename field position, fix #12927
| * | | | | | fix rename field position, fix #12927Jan-Christoph Borchardt2015-01-091-2/+6
|/ / / / / /
* | | | | | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-0939-191/+1474
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ldap user cleanup master
| * | | | | | fix order of initalizing instance properties, and paremeter order in a ↵Arthur Schiwon2015-01-081-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | method call
| * | | | | | fix table name for getListArthur Schiwon2015-01-081-2/+2
| | | | | | |
| * | | | | | doc fixes and removal of unnecessary use statementsArthur Schiwon2015-01-075-10/+6
| | | | | | |
| * | | | | | add test for mapping's getList methodArthur Schiwon2015-01-071-0/+24
| | | | | | |
| * | | | | | inject and use user manager to delete command instead of using old static ↵Arthur Schiwon2015-01-072-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | oc_user way
| * | | | | | inject DB Connection to user managerArthur Schiwon2015-01-0710-87/+94
| | | | | | |
| * | | | | | inject IDateTimeFormatter to show-remnants commandArthur Schiwon2015-01-062-4/+11
| | | | | | |
| * | | | | | inject oc config to User_LDAPArthur Schiwon2015-01-069-53/+89
| | | | | | |
| * | | | | | revert changes to deprecated preferences as it is a not needed leftoverArthur Schiwon2015-01-061-3/+1
| | | | | | |
| * | | | | | smaller fixes: coding style, PHPdoc, typos and few for DIArthur Schiwon2015-01-068-71/+51
| | | | | | |
| * | | | | | planned refactorings for OC 8Arthur Schiwon2014-12-206-55/+83
| | | | | | |
| * | | | | | move from \OC\Preferences to \OCP\IConfigArthur Schiwon2014-12-204-67/+38
| | | | | | |
| * | | | | | basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass.Arthur Schiwon2014-12-2010-41/+73
| | | | | | |
| * | | | | | LDAP User Cleanup: Port from stable7 without further adjustementsArthur Schiwon2014-12-1933-66/+1257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP User Cleanup background job for user clean up adjust user backend for clean up register background job remove dead code dependency injection make Helper non-static for proper testing check whether it is OK to run clean up job. Do not forget to pass arguments. use correct method to get the config from server methods can be private, proper indirect testing is given no automatic user deletion make limit readable for test purposes make method less complex add first tests let preferences accept limit and offset for getUsersForValue DI via constructor does not work for background jobs after detecting, now we have retrieving deleted users and their details we need this method to be public for now finalize export method, add missing getter clean up namespaces and get rid of unnecessary files helper is not static anymore cleanup according to scrutinizer add cli tool to show deleted users uses are necessary after recent namespace change also remove user from mappings table on deletion add occ command to delete users fix use statement improve output big fixes / improvements PHP doc return true in userExists early for cleaning up deleted users bump version control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default. improve doc rename cli method to be consistent with others introduce ldapUserCleanupInterval in sample config don't show last login as unix epoche start when no login happend less log output consistent namespace for OfflineUser rename GarbageCollector to DeletedUsersIndex and move it to user subdir fix unit tests add tests for deleteUser more test adjustements Conflicts: apps/user_ldap/ajax/clearMappings.php apps/user_ldap/appinfo/app.php apps/user_ldap/lib/access.php apps/user_ldap/lib/helper.php apps/user_ldap/tests/helper.php core/register_command.php lib/private/preferences.php lib/private/user.php add ldap:check-user to check user existance on the fly Conflicts: apps/user_ldap/lib/helper.php forgotten file PHPdoc fixes, no code change and don't forget to adjust tests
* | | | | | | Merge pull request #13184 from owncloud/fix-keyLukas Reschke2015-01-091-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Verify existence of $_GET key
| * | | | | | | Verify existence of $_GET keyLukas Reschke2015-01-091-1/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker. To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`. Fixes itself.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0988-150/+274
| | | | | | |
* | | | | | | Merge pull request #13179 from ↵Lukas Reschke2015-01-092-18/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/fix-fatal-php-error-for-not-existing-files Verify whether type is correct
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 05:47:45 +0000