summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21030 from owncloud/querybuilder-new-featuresThomas Müller2015-12-081-5/+78
|\ | | | | Querybuilder new features
| * Add a method to the get "to use" table and column nameJoas Schilling2015-12-081-1/+21
| |
| * Add select distinct to the query builderJoas Schilling2015-12-081-4/+32
| |
| * Allow getting the last insert id without much hassleJoas Schilling2015-12-081-0/+25
| |
* | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-082-4/+4
|\ \ | | | | | | DAV endpoint for system tags
| * | Fixed system tags DAV and API and docsVincent Petry2015-12-042-4/+4
| | |
* | | Merge pull request #21022 from owncloud/get-rid-of-by-referenceThomas Müller2015-12-081-6/+12
|\ \ \ | | | | | | | | Get rid of by reference
| * | | Add unit test for nested arraysLukas Reschke2015-12-081-6/+12
| | |/ | |/|
* / | Do not trust castingLukas Reschke2015-12-081-0/+2
|/ /
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-072-4/+0
| | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | Merge pull request #20981 from ↵Thomas Müller2015-12-071-3/+19
|\ \ | | | | | | | | | | | | owncloud/issue-19848-multiple-emails-for-sharelink Allow sending a share email to multiple users
| * | Add a unit test for single user case as wellJoas Schilling2015-12-071-7/+9
| | |
| * | Allow sending a share email to multiple usersJoas Schilling2015-12-071-3/+17
| | |
* | | Merge pull request #20569 from owncloud/issue_20427Thomas Müller2015-12-071-1/+2
|\ \ \ | | | | | | | | Show external storage status in file list + prompt credentials if different
| * \ \ Merge branch 'master' into issue_20427Jesus Macias Portela2015-12-03121-1359/+5042
| |\ \ \
| * | | | Added some unit tests for the status managerVincent Petry2015-11-201-1/+2
| | | | |
* | | | | Merge pull request #20904 from owncloud/view-mime-filterThomas Müller2015-12-071-0/+35
|\ \ \ \ \ | | | | | | | | | | | | Fix mimetype filter in getDirectoryContent
| * | | | | Fix mimetype filter in getDirectoryContentRobin Appelman2015-12-031-0/+35
| | | | | |
* | | | | | Only try to load avatars in the user list if there is anyRoeland Jago Douma2015-12-041-11/+49
| |_|_|/ / |/| | | |
* | | | | Merge pull request #20807 from ↵Thomas Müller2015-12-032-35/+105
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/dont-append-redirect-url-if-user-is-already-logged-in Don't append redirect URL if user is logged-in
| * | | | | Show error templateLukas Reschke2015-11-302-35/+105
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right.
* | | | | | Merge pull request #20921 from owncloud/last-OC_Config-removals-in-testsThomas Müller2015-12-031-8/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Reduce OC_Config usage in tests/
| * | | | | last change of OC_Config to the proper interface in tests/Morris Jobke2015-12-031-3/+4
| | | | | |
| * | | | | Reduce OC_Config usage in tests/Morris Jobke2015-12-031-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19461 from owncloud/reuse_codeThomas Müller2015-12-031-0/+91
|\ \ \ \ \ | |/ / / / |/| | | | reuse code
| * | | | add unit tests for OC_Util::add* methodsMorris Jobke2015-11-231-0/+91
| | | | |
* | | | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-032-6/+8
| | | | |
* | | | | Merge pull request #20902 from owncloud/drop-OC_Config-from-testsThomas Müller2015-12-035-35/+45
|\ \ \ \ \ | | | | | | | | | | | | Replace OC_Config in tests with IConfig calls
| * | | | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-025-35/+45
| | | | | |
* | | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-032-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Systemtags better not found exception
| * | | | | | Fix the unit test by running tearDown() and cleaning tags before the testJoas Schilling2015-12-012-1/+13
| | | | | | |
| * | | | | | Add a method to get the list of tags from the TagNotFound ExceptionJoas Schilling2015-12-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #20894 from owncloud/post-delete-meta-viewThomas Müller2015-12-031-1/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Also add metadata for postDelete hooks triggered from the view
| * | | | | | | Also add metadata for postDelete hooks triggered from the viewRobin Appelman2015-12-021-1/+21
| | | | | | | |
* | | | | | | | Adding unit test for MailNotifications::sendInternalShareMail()Thomas Müller2015-12-021-31/+70
| | | | | | | |
* | | | | | | | User IUser::getEMailAddress() all over the placeThomas Müller2015-12-023-134/+201
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-usersThomas Müller2015-12-022-1/+30
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Adding system addressbook for users of this instance - a occ command …
| * | | | | | Fix endless recursionThomas Müller2015-12-021-1/+1
| | | | | | |
| * | | | | | Fix getCloudIdThomas Müller2015-12-021-1/+7
| | | | | | |
| * | | | | | Adding unit test for User::getCloudId()Thomas Müller2015-12-021-0/+18
| | | | | | |
| * | | | | | Add the user's cloud id to the vCardThomas Müller2015-12-021-0/+3
| | | | | | |
| * | | | | | Add IUser::getAvatarImage() for easy accessThomas Müller2015-12-021-1/+3
| | | | | | |
* | | | | | | Remove OC_Config from app management templateMorris Jobke2015-12-021-4/+38
| |/ / / / / |/| | | | | | | | | | | | | | | | | * add unit test for this case
* | | | | | Merge pull request #20875 from owncloud/remove-changepropagatorThomas Müller2015-12-022-198/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove old propagation logic
| * | | | | | remove old propagation logicRobin Appelman2015-12-012-198/+0
| | | | | | |
* | | | | | | Merge pull request #20865 from owncloud/post-delete-metaThomas Müller2015-12-022-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add metadata to post delete hooks
| * | | | | | Add metadata to post delete hooksRobin Appelman2015-12-012-1/+4
| | |/ / / / | |/| | | |
* | | | | | DI in avatar codeRoeland Jago Douma2015-12-013-94/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DI in avatar code * Use the node API * More unit tests * Unit tests no longer require DB
* | | | | | Support pretty URLsLukas Reschke2015-12-011-0/+20
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore. Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons. Examples: http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/ Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)
* | | | | Add code integrity checkLukas Reschke2015-12-0118-2/+1936
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository. Furthermore, there is a basic implementation to display problems with the code integrity on the update screen. Code signing basically happens the following way: - There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates. - Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID. - The command generates a signature.json file of the following format: ```json { "hashes": { "/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d", "/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9" }, "certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----", "signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl" } ``` `hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`. Steps to do in other PRs, this is already a quite huge one: - Add nag screen in case the code check fails to ensure that administrators are aware of this. - Add code verification also to OCC upgrade and unify display code more. - Add enforced code verification to apps shipped from the appstore with a level of "official" - Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release - Add some developer documentation on how devs can request their own certificate - Check when installing ownCloud - Add support for CRLs to allow revoking certificates **Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature: ``` ➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt Successfully signed "core" ``` Then increase the version and you should see something like the following: ![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png) As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen. For packaging stable releases this requires the following additional steps as a last action before zipping: 1. Run `./occ integrity:sign-core` once 2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.