summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Use OCP\Util::getVersion instead of the internal private implementationMorris Jobke2015-12-181-3/+5
|
* properly use OCP\Util instead of OC_HelperMorris Jobke2015-12-181-2/+2
|
* Merge pull request #21264 from owncloud/deprecated_oc_user_methodsThomas Müller2015-12-182-2/+2
|\ | | | | Cleanup OC_User deprecated methods
| * Remove deprecated function OC_User::getManagerRoeland Jago Douma2015-12-172-2/+2
| | | | | | | | | | Private deprecated function => removed Replaced all instances with suggested replacement
* | Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRouteThomas Müller2015-12-182-3/+3
|\ \ | | | | | | Replace deprecated OC_Helper::linkToRoute calls
| * | OC_Helper::linkToRoute is deprecatedRoeland Jago Douma2015-12-172-3/+3
| | | | | | | | | | | | | | | Replaced all calls to OC_Helper::linkToRoute with OC::$server->getURLGenerator()->linkToRoute
* | | Add a default size to the avatar placeholdersRoeland Jago Douma2015-12-171-1/+1
|/ / | | | | | | | | This removed the need to do an avatar request on the "empty" row in the user settings.
* | Merge pull request #21255 from ↵Thomas Müller2015-12-171-1/+1
|\ \ | |/ |/| | | | | owncloud/usermanagement-show-password-error-temporary user management: show password error temporary
| * Update users.jsmichag862015-12-171-1/+1
| |
* | Merge pull request #21260 from owncloud/fix-undefined-l10n-varThomas Müller2015-12-171-3/+1
|\ \ | | | | | | initialize l10n instance earlier, fixes an undefined var warning foll…
| * | initialize l10n instance earlier, fixes an undefined var warning followed by ↵Arthur Schiwon2015-12-171-3/+1
| |/ | | | | | | a php error
* / Only load the big (128x128) avatar on the perosnal pageRoeland Jago Douma2015-12-171-0/+5
|/ | | | | Before the code was executed on every page if a user was logged in. Now only on the personal page. Thus saving a request on all other pages.
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-174-10/+14
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-132-0/+2
|
* Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmtThomas Müller2015-12-111-3/+5
|\ | | | | reset mailadress/displayname on blur
| * reset mailadress/displayname on blurmichag862015-12-071-3/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-11122-316/+280
| |
* | Merge pull request #21123 from ↵Thomas Müller2015-12-101-7/+1
|\ \ | | | | | | | | | | | | owncloud/remove-db-locking-performance-warning-master Remove info about database locking performance
| * | Remove info about database locking performanceThomas Müller2015-12-101-7/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-102-2/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-092-6/+58
| |
* | Merge pull request #21022 from owncloud/get-rid-of-by-referenceThomas Müller2015-12-082-2/+2
|\ \ | | | | | | Get rid of by reference
| * | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTMLLukas Reschke2015-12-082-2/+2
| | |
* | | Merge pull request #20979 from owncloud/settings-groups-entryThomas Müller2015-12-081-0/+1
|\ \ \ | |/ / |/| | Add 'my groups' anchor to the personal page sidebar
| * | Add 'my groups' anchor to the personal page sidebarPatrick Robertson2015-12-071-0/+1
| |/
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-071-1/+0
| | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | Merge pull request #20954 from ↵Thomas Müller2015-12-073-4/+21
|\ \ | | | | | | | | | | | | owncloud/settings_user_only_load_avatar_if_available Settings user only load avatar if available
| * | Do not request an avatar if there is noneRoeland Jago Douma2015-12-041-2/+6
| | |
| * | Only try to load avatars in the user list if there is anyRoeland Jago Douma2015-12-042-2/+15
| | |
* | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntryThomas Müller2015-12-073-3/+3
|\ \ \ | |_|/ |/| | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
| * | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\AppMorris Jobke2015-12-043-3/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-12-052-0/+2
|/
* [Avatars] JS should not load same avatar twiceRoeland Jago Douma2015-12-041-2/+1
| | | | | | | | | Old code first dit an ajax request to the avatar. Then a new image object with the same src was created and since we do not cache avatars yet :( this resulted in 2 sequential requests to the exact same URL Now if you set the displayname it will first set the placeholder and then load the avatar in the background. Only once this time!
* Merge pull request #20860 from ↵Thomas Müller2015-12-032-10/+15
|\ | | | | | | | | owncloud/use-user-getEMailAddress-all-over-the-place User IUser::getEMailAddress() all over the place
| * User IUser::getEMailAddress() all over the placeThomas Müller2015-12-022-10/+15
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-034-8/+10
|/
* Remove OC_Config from app management templateMorris Jobke2015-12-022-1/+2
| | | | * add unit test for this case
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-022-6/+6
|
* Add code integrity checkLukas Reschke2015-12-013-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #20850 from owncloud/use-text-instead-of-htmlThomas Müller2015-12-011-3/+3
|\ | | | | Use .text instead of .html
| * Use .text instead of .htmlLukas Reschke2015-11-301-3/+3
| | | | | | Makes some static source code analyzers happier.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-012-6/+20
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-302-6/+8
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-282-6/+16
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-272-10/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-262-6/+14
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-252-6/+8
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-244-12/+18
|
* Merge pull request #20222 from owncloud/federated_sharing_auto_completeThomas Müller2015-11-232-5/+5
|\ | | | | federated sharing auto-complete, first step
| * change 'cronstatus' to 'status' so that it can be used in other apps tooBjörn Schießle2015-11-192-5/+5
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-04 04:13:42 +0000