wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43490 commits 157 branches 562 tags 714 MiB
Commit graph

212 commits

Author SHA1 Message Date
Morris Jobke
1a4a68dbc6 Fix error message on untrusted domain error page 
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-21 11:46:37 +02:00
Roeland Jago Douma
6a1f2ac076
Add bruteforce capabilities 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-13 11:23:08 +02:00
Roeland Jago Douma
04f2090698
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 19:24:20 +02:00
Arthur Schiwon
d7a2290ce1
take over changes from #5084 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:37:42 +02:00
Arthur Schiwon
045f652ef2
completing PersonalInfo 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:36:37 +02:00
Julius Härtl
f039ba7480
Add tests and inject IRequest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-16 10:51:31 +02:00
Julius Härtl
0999ed1778
Do not open version file again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:51 +02:00
Julius Härtl
0789adaf95
Make cache and scss caching depend on the baseUrl 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-06-15 12:46:24 +02:00
Lukas Reschke
fb45767524 Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook 
Fix encryption + remembered login due to missing login hook
 2017-05-17 22:21:09 +02:00
Julius Härtl
d3865b6096
Use appdata logo when generating icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:14:37 +02:00
Christoph Wurst
0a43c259c4
Fix encryption + remembered login due to missing login hook 
The encryption app relies on the post_login hook to initialize its keys.
Since we do not emit it on a remembered login, the keys were always un-
initialized and the user was asked to log out and in again.
This patch *translates* the postRememberedLogin hook to a post_login
hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-16 08:41:11 +02:00
Morris Jobke
167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes 
Use automatic injection for appdata folders
 2017-05-10 17:31:05 -05:00
Morris Jobke
d73c8d0981 Use distributed cache for SCSS dependencies as well 
* followup to #3978 because with the proper setup of
  appdata we now are using the same data on all nodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-10 13:31:45 -05:00
Joas Schilling
538d32fe87
Automatic injection into the Fetchers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:56:38 +02:00
Roeland Jago Douma
e79424932a
Make sure the AppFetcher fetches the new applist from the appstore 
When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 10:24:10 +02:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Morris Jobke
01705b1b6a Merge pull request #4515 from nextcloud/downstream-27643 
Adjust query/event logging code in favour of more complex owncloud/di…
 2017-04-26 22:58:01 -03:00
Lukas Reschke
47cd976035
Add app bundles 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:49 +02:00
Piotr Mrówczyński
9fec4031b3
Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643) 
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
 2017-04-26 13:19:43 +02:00
Christoph Wurst
d091793ceb Contacts menu 
* load list of contacts from the server
* show last message of each contact

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Morris Jobke
10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager 
Access list to share manager
 2017-04-15 13:06:24 -05:00
Roeland Jago Douma
f40b9fa9bd Merge pull request #4330 from nextcloud/activities-for-password-mail-change 
Add activities when email or password is changed
 2017-04-14 08:16:43 +02:00
Roeland Jago Douma
0f5682321e
Fix server container registration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 14:52:09 +02:00
Roeland Jago Douma
0c2dc3bc8c
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:50 +02:00
Roeland Jago Douma
a1edcc8ecf
Port Encryption/file to new getAccessList 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-13 12:58:49 +02:00
Joas Schilling
1110b51aa3
Allow to read the old email on the hook as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:34:02 +02:00
Lukas Reschke
d729bde98c
Register in ServerContainer 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Björn Schießle
b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints 
Discover federatedsharing endpoints
 2017-04-12 16:01:07 +02:00
Lukas Reschke
3600dd4f52
Add IEMailTemplate to public OCP API 
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 16:35:46 +02:00
Roeland Jago Douma
53bca14a27
Do proper DI 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle
45aee2e479
provide public discovery service to discover OCS end-points on another server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:03:59 +02:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Lukas Reschke
281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Robin Appelman
baec42e80a
Save the scope of an auth token in the session 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-05 17:58:33 +02:00
Joas Schilling
054e161eb5
Manage the right side menu via the navigation manager as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 19:40:41 +02:00
Roeland Jago Douma
48c34522ed
Move a lot of stuff over to the ServerContainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 10:29:59 +01:00
Roeland Jago Douma
c92b9ce2c4
Fix settings tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
21641302a9
Add DI intergration tests 
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
df14684817
PoC of moving the interface classes to the servercontainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00
Joas Schilling
75b81c3e01
Always suggest the overwrite.cli.url 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:40:58 +01:00
Joas Schilling
bd97b7d130
Use DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:23:04 +01:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Morris Jobke
5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store 
Login credential store
 2017-01-30 19:30:04 -06:00
Morris Jobke
8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml 
Add navigation via info.xml (#26785)
 2017-01-27 11:25:26 -06:00
Lukas Reschke
b5990b740d Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive 
Make sure different webroots use different cached paths
 2017-01-27 10:14:22 +01:00
Joas Schilling
c3985aba70
Add the icon for the default sections 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-19 10:42:21 +01:00
Joas Schilling
77577b952b
Make sure different webroots use different cached paths 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 15:58:18 +01:00
Christoph Wurst
21d3fe5883
do not hard-require the token provider 
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
46adb3eced
replace session implementation if it changes at runtime 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:09 +01:00
Roeland Jago Douma
a90cbb0f09 Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully 
Handle log_type "nextcloud" more gracefully
 2017-01-11 08:14:24 +01:00
Morris Jobke
4dd2a1e679 Merge pull request #2943 from nextcloud/kill_old_preview_code 
Cleanup old preview code
 2017-01-10 13:50:14 +01:00
Robin Appelman
817e974c5f
dont write a certificate bundle if the shipped ca bundle is empty 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-09 16:51:27 +01:00
Roeland Jago Douma
95d85ba8eb
Do not add ICssManager to OCP 
We can add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
Roeland Jago Douma
2816177ecb
Code cleanup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
1f769e6e76
Fix php docs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
6380d503af
Css cache folder name fix, route fix and various fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv)
1caaa7f4cd
Appdata integration 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
Joas Schilling
7573fa3148
Handle log_type "nextcloud" more gracefully 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 12:47:27 +01:00
Roeland Jago Douma
9bbfb5ffeb
Rewrite old preview endpoint for PreviewManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-04 16:51:44 +01:00
Robin Appelman
c4358ff9fd
split db logic from settings manager 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-28 18:59:24 +01:00
Thomas Müller
aa8755bd4b
Add navigation via info.xml (#26785) 
* Read navigation information from info.xml

* Load files navigation elements from info.xml

* Add comment about ignoring the exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 12:34:41 +01:00
Christoph Wurst
ed4017dfb4
fix minor issues 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-19 11:59:48 +01:00
Christoph Wurst
7ae9442f3d
Publish, parse and filter 2FA activities 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-19 11:59:47 +01:00
Roeland Jago Douma
245501fb0c
Clear appstore cache on version upgrade 
* Add version to cached json
* Compare version
* Updated calls
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-15 22:04:03 +01:00
Joas Schilling
bc3da3a8f5
Remove IDb interface which was deprecated for 3 years already 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-14 11:42:16 +01:00
Morris Jobke
62ec31eb7b Merge pull request #2152 from nextcloud/preview_cleanupjob 
Adds background job to cleanup all previews.
 2016-11-30 10:39:21 +01:00
Joas Schilling
da9468522b
Add an event merger and use it for the files activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 15:36:11 +01:00
Roeland Jago Douma
ccb05dbb17
Adds background job to cleanup all previews. 
* A repair step that inserts a background job for each user
* Each background job will delete for 15 seconds if it takes longer we
reschedule. This is done so instances that don't use the system cron
won't time out.
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-19 20:14:44 +01:00
Morris Jobke
46768e71d9 Merge pull request #2076 from nextcloud/log_preview_access 
Dispatch event on preview request
 2016-11-18 20:45:29 +01:00
Julius Haertl
2e8dd21815
Improve caching 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Robin Appelman
b56f2c9ed0
basic lockdown logic 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-11-16 15:24:23 +01:00
Joas Schilling
b8958ee937
Fix activity manager tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 09:25:45 +01:00
Roeland Jago Douma
99ada40df4
Dispatch event on preview request 
Fixes: #73

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 14:28:09 +01:00
Roeland Jago Douma
931493b70e
Get correct L10N for Settings Manager 
Fixes #2022

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-10 11:08:37 +01:00
Joas Schilling
706b5c3fb6
Use a php class for the definitions to avoid loading problems 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 08:52:07 +01:00
Roeland Jago Douma
5466fbf761
Move Ipreview to more of DI thingy 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
c8ff9fb00e
Watch for file modification/deletion 
* Only connect the watcher once the instance is properly setup else
AppData fails hard.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Lukas Reschke
68cebef64c
DI for root.php 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-02 23:16:51 +01:00
Joas Schilling
2cd92d0abb
Fix missing update of session, when it was already used. 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-02 20:30:36 +01:00
Morris Jobke
e6b52ef4cd Merge pull request #1347 from nextcloud/bring-back-remember-me 
fix remember me login
 2016-11-02 18:32:38 +01:00
Christoph Wurst
6f86e468d4
inject ISecureRandom into user session and use injected config too 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-02 13:39:16 +01:00
Christoph Wurst
d907666232
bring back remember-me 
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-02 13:39:16 +01:00
Lukas Reschke
1a676bacb4
Remove non-required getter 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 18:45:13 +01:00
Lukas Reschke
8acb54aa0b
Add update support 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:47 +01:00
Lukas Reschke
32cf661215
Use new appstore API 
This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:44 +01:00
Roeland Jago Douma
e351ba56f1
Move browserSupportsCspV3 to CSPNonceManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-25 22:03:10 +02:00
Lukas Reschke
38b3ac8213
Add ContentSecurityPolicyNonceManager 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-24 16:35:31 +02:00
Thomas Müller
a7245ea082
Fixing ctor call 2016-10-19 00:15:01 +02:00
Morris Jobke
cc28f82b36
Add config option to update charset of mysql to utf8mb4 
* fully optional
* requires additional options set in the database
 2016-10-19 00:15:01 +02:00
Robin Appelman
0d842e0550
optimize Folder::getById to use less queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:28 +02:00
Roeland Jago Douma
851769adc8
Deprecate old app folder 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:16 +02:00
Roeland Jago Douma
6807cb684f
avatar to appdata 
* Fix AvatarTest

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:16 +02:00
Roeland Jago Douma
5d8b941fea
Initial AppData 
* Introduce simpleFS
* Introduce IAppData
* Introduce AppData Factory to get your AppData folder
* Update FileDisplayResponse

* AppData implements a ISimpleRoot but lazy. So only if an apps starts
  to access data will stuff get initialized

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-05 11:00:14 +02:00
Roeland Jago Douma
14136295b7
Cache avatars properly 
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
 2016-08-30 09:00:16 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes 
Theming: Fix missing color usage
 2016-08-26 15:02:21 +02:00
Lukas Reschke
de6ab82766 Merge pull request #1080 from nextcloud/always_lazyroot 
Always use the LazyRoot
 2016-08-26 13:18:01 +02:00