aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13989 from owncloud/enhancment/security/11857Clark Tomlinson2015-02-182-1/+270
|\ | | | | Allow AppFramework applications to specify a custom CSP header
| * Rename to allowEvalLukas Reschke2015-02-161-1/+1
| |
| * Allow AppFramework applications to specify a custom CSP headerLukas Reschke2015-02-162-1/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components. Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers: ```php $response = new TemplateResponse('activity', 'list', []); $cspHelper = new ContentSecurityPolicyHelper(); $cspHelper->addAllowedScriptDomain('www.owncloud.org'); $response->addHeader('Content-Security-Policy', $cspHelper->getPolicy()); return $response; ``` Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925
* | Make scrutinizer happyLukas Reschke2015-02-161-1/+1
| |
* | Refactor OC_Request into TrustedDomainHelper and IRequestLukas Reschke2015-02-162-4/+73
| | | | | | | | | | | | | | | | | | | | This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
* | Add visibility to interface to make scrutinizer 1 step happierJoas Schilling2015-02-161-1/+1
| |
* | URLEncode logout attributeLukas Reschke2015-02-131-2/+3
|/ | | | Otherwise logout can fail if the requesttoken contains a +
* Deprecate `OC_JSON` and `OCP\JSON`Lukas Reschke2015-02-121-106/+109
| | | | | | This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code. With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
* Merge pull request #13425 from owncloud/phpdoc_cleanupMorris Jobke2015-02-104-20/+20
|\ | | | | Cleanup of PHPDoc return types
| * Cleanup of PHPDoc return typesRobin McCorkell2015-01-164-20/+20
| |
* | Merge pull request #13921 from owncloud/ocs-afVincent Petry2015-02-093-5/+207
|\ \ | | | | | | Add a controller and reponse for ocs
| * | fix license emailBernhard Posselt2015-02-052-6/+6
| | |
| * | add a controller and reponse for ocsBernhard Posselt2015-02-052-0/+202
| | |
* | | Merge pull request #13973 from owncloud/enhancement/security/13366Lukas Reschke2015-02-091-0/+7
|\ \ \ | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
| * | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`Lukas Reschke2015-02-091-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs. Testplan: - [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`. - [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string - [ ] The generated Id is stable over the lifespan of one request Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI. Fixes https://github.com/owncloud/core/issues/13366
* / / Add a better way to check if an avatar exists for the userRobin Appelman2015-02-031-0/+7
|/ /
* | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-271-0/+2
|\ \ | | | | | | Call final unlink in trash wrapper's storage
| * | Fix return type of addStorageWrapper in PHPDocVincent Petry2015-01-271-1/+1
| | |
| * | Do not call wrapStorage if storate with same name added twiceVincent Petry2015-01-221-0/+2
| |/
* | Merge pull request #13676 from owncloud/fix-node-ifaceThomas Müller2015-01-271-1/+1
|\ \ | | | | | | Fix node interface
| * | fix node interfaceBernhard Posselt2015-01-261-1/+1
| |/
* / Add a method to set/unset multiple config values in one callJoas Schilling2015-01-231-0/+8
|/ | | | | This reduces the number of file writes we do for config.php and therefor hopefully helps lowering the chances for empty config.php files
* Add PHPDoc for `urlParams`Lukas Reschke2015-01-151-1/+1
|
* Add PHPDoc for magic property 'server'Lukas Reschke2015-01-141-1/+3
|
* Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-091-0/+42
|\ | | | | Logfile download
| * add Download logfile button to admin settingsGeorg Ehrke2015-01-071-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add logSettingsController add download logfile button move getEntries to LogSettingsController move set log level to logsettingscontroller.php add warning if logfile is bigger than 100MB add unit test for set log level fix typecasting, add new line at EoF show log and logfile download only if log_type is set to owncloud add unit test for getFilenameForDownload
* | add SIZE_ALL constJörn Friedrich Dreyer2015-01-021-3/+8
| |
* | fix visibilityJörn Friedrich Dreyer2015-01-022-8/+2
| |
* | move search results below filelist, show hint when results are off screen, ↵Jörn Friedrich Dreyer2015-01-022-6/+8
| | | | | | | | use js plugin mechanism
* | add paged providerJörn Friedrich Dreyer2015-01-022-0/+68
| |
* | Adding basement for the direct download urlThomas Müller2014-12-281-0/+10
| |
* | Intelligent containerBernhard Posselt2014-12-232-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resolves dependencies by type hint or variable name * simpler route.php * implementation of https://github.com/owncloud/core/issues/12829 Generates and injects parameters automatically. You can now build full classes like $c->query('MyClassName') without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken. Therefore the following two implementations are identical: class Class1 { function __construct(MyClassName $class) class Class1 { function __construct($MyClassName) This makes it possible to also inject primitive values such as strings, arrays etc. In addition if the query could not be resolved, a `QueryException` is now thrown Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional Old commit messages: make it possible to return the routes instead of having to intialize the application try to get the controller by convention add first implementation of automatic resolve add another test just to be sure store the resolved object more tests add phpdoc to public app.php method use the same variable for the public app.php method deprecate old methods and add services for public interfaces deprecated getServer method disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D) register userid because its such an often used variable fix indention and leading slash use test namespace add deprecation reasons, remove private api usage checks and remove deprecation from getServer() add additional public interfaces add public interface for rootfolder fix syntax error remove deprecation from methods where no alternative is there yet remove deprecated from method which has no alternative add timezone public service for #12881 add another deprecation hint move deprecation into separate branch remove dead comment first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter also trim the namespace name add an interface for timefactory move timefactory to public and add icontrollermethodreflector keep core interface fix copyright date in headers
* | Merge pull request #12969 from owncloud/clarify-docsMorris Jobke2014-12-221-2/+2
|\ \ | | | | | | Clarify return values
| * | Fix typoLukas Reschke2014-12-191-1/+1
| | |
| * | Clarify return valuesLukas Reschke2014-12-191-1/+1
| | | | | | | | | | | | This function returns `null` when no user is logged-in.
* | | Merge pull request #12983 from owncloud/root-ifaceMorris Jobke2014-12-221-0/+32
|\ \ \ | | | | | | | | Add an interface for the root folder so apps have an interface to deal with storage
| * | | add an interface for the root folder so apps have an interface to deal with ↵Bernhard Posselt2014-12-211-0/+32
| | |/ | |/| | | | | | | | | | | | | | | | | | | storage fix comments and newline add newline
* | | Merge pull request #12982 from owncloud/timefac-ifaceThomas Müller2014-12-211-0/+38
|\ \ \ | |/ / |/| | Add an interface for the timefactory class
| * | add an interface for the timefactory classBernhard Posselt2014-12-201-0/+38
| | | | | | | | | | | | fix indention
* | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-191-0/+12
|\ \ \ | | | | | | | | server to server sharing next generation
| * | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-191-0/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
* | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-191-0/+1
|\ \ \ | |/ / |/| | Ldap split mapping from Access superclass
| * | Split mapping from Access and Helper classes into it's own. Fully test them, ↵Arthur Schiwon2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. remove unused methods split mapping methods off from Access class fix DB query handling move 'clear mapping' methods from static helper to new mapping class add tests test directly with DB finishing tests and fix return value from setDNbyUUID add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class. add missing info to PHPDoc add unmap method fix namespaces fix test inheritance PHPDoc and a small code restructure for scrutinizer, no effective changes PostgreSQL does not accept LIMIT in DELETE queries phpdoc fixes, no code changes
* | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-191-0/+27
|\ \ \ | |/ / |/| | [jenkins only] introduce names for user backends - IUserBackend
| * | introduce names for user backends - IUserBackendMorris Jobke2014-12-191-0/+27
| | | | | | | | | | | | * LDAP with multiple servers also proved backendName
* | | Merge pull request #12879 from owncloud/mountconfigMorris Jobke2014-12-182-0/+16
|\ \ \ | |/ / |/| | Add mount specific options
| * | Add getMountPoint to FileInfoRobin Appelman2014-12-171-0/+7
| | |
| * | Load mount specific options from the mount configRobin Appelman2014-12-171-0/+9
| |/
* | add isAdmin and isInGroup methods for the group managerBernhard Posselt2014-12-172-0/+16
| |
* | add a isLoggedIn method to the usersession and deprecate the isLoggedIn ↵Bernhard Posselt2014-12-172-1/+11
|/ | | | method on the api