Vincent Petry
21907c4f3e
Fix RepairUnmergedShares to not skip valid repair cases
...
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-04 19:50:16 +02:00
Vincent Petry
3a86dd1d1a
Adjust repair version check for unmerged shares
2016-08-04 19:50:16 +02:00
Vincent Petry
6638e1857a
Add repair step for unmerged shares (WIP)
2016-08-04 19:50:16 +02:00
Joas Schilling
713e201074
Merge pull request #602 from nextcloud/backport-workflow-engine
...
🚧 [WIP] Backport workflow engine 🚧
2016-08-04 14:20:14 +02:00
Robin Appelman
de8bb68325
revert to old setup connection logic
2016-07-29 00:41:12 +02:00
Morris Jobke
51be4bf2f0
Merge pull request #618 from nextcloud/backport-519-stable10
...
Backport LDAPProvider to Nextcloud 10
2016-07-28 23:13:21 +02:00
Morris Jobke
0a14cd4d60
Merge pull request #628 from nextcloud/stable10-backport-612
...
[stable10] libxml - compare against loaded version
2016-07-28 16:56:55 +02:00
Morris Jobke
1913419520
libxml - compare against loaded version
...
* if the compiled in version is older than the loaded version Nextcloud doesn't work
* uses the loaded libxml version to check against
fixes #205
2016-07-28 14:11:32 +02:00
Roeland Jago Douma
6990a4e550
Support subdir in the OCS v2 endpoint
...
We should check against the ending substring since people could
run their nextcloud in a subfolder.
* Added test
2016-07-28 13:12:01 +02:00
root
aa02f518ad
Backport LDAPProvider to Nextcloud 10
...
New LDAPProvider for user_ldap
final changes
comments amended
Nextcloud license header for new files
2016-07-28 10:20:38 +02:00
Joas Schilling
2a4a1278fa
Allow DI of the workflow manager by the OCP interface
2016-07-27 14:13:08 +02:00
Arthur Schiwon
1013fac447
fix autoloading in LPAP integration tests, resolves #544
2016-07-26 21:06:29 +02:00
Morris Jobke
d181301699
Merge pull request #508 from nextcloud/stable10_ocs_appframework_xml
...
[Stable10] AppFramework do not get default response
2016-07-25 12:52:13 +02:00
Joas Schilling
28dffaa32f
Make sure we try to autoload the class
2016-07-25 09:42:28 +02:00
Joas Schilling
23b205ed48
Run the license script
2016-07-22 11:40:41 +02:00
Roeland Jago Douma
2abd83212e
AppFramework do not get default response
...
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.
This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-21 20:32:48 +02:00
Lukas Reschke
305534225e
Revert "Remove "Help" link from personal sidebar"
...
This reverts commit deef15a3c7
.
2016-07-21 02:11:30 +02:00
Lukas Reschke
decfd1ab59
Link to proper clients
2016-07-21 01:57:03 +02:00
Lukas Reschke
d4f9a69a72
Port 2d37341
to stable10
2016-07-21 01:46:11 +02:00
Lukas Reschke
96c2b0de66
Use proper certificates
...
Ports bcf693539b
2016-07-21 01:35:19 +02:00
Lukas Reschke
9a1ff29351
Use proper documentation links
...
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
Lukas Reschke
c385423d10
Merge pull request #479 from nextcloud/add-bruteforce-throttler
...
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition
2016-07-20 23:09:27 +02:00
Lukas Reschke
adf67fac96
JSON encode the values
2016-07-20 22:47:33 +02:00
Lukas Reschke
ba4f12baa0
Implement brute force protection
...
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.
It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
Lukas Reschke
020a2a6958
Merge pull request #476 from nextcloud/port-same-site-cookies
...
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Lukas Reschke
a17ba2f488
Merge pull request #466 from nextcloud/escape-special-characters
...
Escape special characters (#25429 )
2016-07-20 21:24:19 +02:00
Roeland Jago Douma
ea47974a08
Add OCSMiddleware to catch OCS exceptions
...
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
2016-07-20 20:03:49 +02:00
Lukas Reschke
a299fa38a9
[master] Port Same-Site Cookies to master
...
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
Morris Jobke
e9c85e02ac
Merge pull request #462 from nextcloud/master-explode
...
[master] Use explode() instead of split()
2016-07-20 18:31:11 +02:00
Björn Schießle
7cdf6402ff
Merge pull request #472 from nextcloud/show-app-name-in-errormsg
...
Show app name in error message if app could not be loaded. (#25441 )
2016-07-20 18:20:49 +02:00
Morris Jobke
1264e9644f
Merge pull request #402 from nextcloud/smb-notifications
...
smb update notifications
2016-07-20 16:19:21 +02:00
Klaas Freitag
99316ec02c
Show app name in error message if app could not be loaded. ( #25441 )
2016-07-20 15:16:16 +02:00
Aaron Wood
7c0de08cc4
Escape special characters ( #25429 )
...
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Use correct method in the AbstractMapping class
* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches
* Don't escape hardcoded wildcard
2016-07-20 14:46:47 +02:00
Lukas Reschke
4f90447150
[master] Use explode() instead of split()
...
Sync from https://github.com/owncloud/core/pull/25488
2016-07-20 14:36:39 +02:00
Björn Schießle
8735a05d93
Merge pull request #441 from nextcloud/fix-maintenance-mode
...
Fix maintenance mode
2016-07-19 16:59:24 +02:00
Roeland Douma
13a25535d2
Merge pull request #400 from nextcloud/ocs_appframework
...
OCS routes use AppFramework
2016-07-19 12:21:14 +02:00
Morris Jobke
544c3c1565
Merge pull request #436 from nextcloud/public-regex-to-match-our-clients
...
Copy the regexes to the public interface
2016-07-19 11:35:10 +02:00
Joas Schilling
80168613be
Fix maintenance mode
...
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
2016-07-19 09:54:42 +02:00
Björn Schießle
ea470f8777
Merge pull request #405 from nextcloud/theming-fixes
...
Theming fixes
2016-07-18 15:59:47 +02:00
Joas Schilling
b1d652e8b0
Copy the regexes to the public interface
2016-07-18 15:11:44 +02:00
Joas Schilling
9781312648
Prevent syntax error when creating user or changing password
2016-07-18 11:44:10 +02:00
Roeland Jago Douma
0bda09236e
Add route tests
2016-07-18 11:09:49 +02:00
Roeland Jago Douma
94cd83ca00
Make the router handle OCS AppFramework Routes
2016-07-18 11:09:04 +02:00
Roeland Jago Douma
1ff4b7f63d
Allow registering of OCS routes with the appframework
2016-07-18 11:09:04 +02:00
Morris Jobke
5157c5a9c4
Merge pull request #418 from nextcloud/remove_asset_pipeline
...
Remove asset pipelin
2016-07-18 09:44:35 +02:00
Roeland Jago Douma
72464f1ce4
Remove asset pipelin
...
Fixes #215
The asset pipeline has shown to do more harm than good. Some apps fail
hard with it. Also it makes sure that you download a huge file on each
unvisited page.
2016-07-15 20:14:11 +02:00
Joas Schilling
2c988ecbf4
Use the themed Defaults everywhere
2016-07-15 09:17:30 +02:00
Robin Appelman
29eeeb2273
Save the files external mount id in the mount cache table
2016-07-13 16:34:08 +02:00
Robin Appelman
e5d7612a19
dont check for pgsql extension during setup
2016-07-12 14:38:24 +02:00
Robin Appelman
7ffda5d10f
use pdo for postgres setup
2016-07-12 14:38:24 +02:00
Robin Appelman
8a79d314cf
Remove duplicate database connect logic in mysql setup
2016-07-12 14:38:24 +02:00
Bjoern Schiessle
7c64e1973f
add test for needsRebundling() check
2016-07-11 15:51:48 +02:00
Lukas Reschke
0c1cf5f7eb
Merge pull request #347 from nextcloud/drop-windows-foo
...
Remove unneeded checks if it runs on a Windows machine
2016-07-11 13:16:03 +02:00
Joas Schilling
103417fd9c
Merge pull request #350 from nextcloud/fix-check-certificate-bundles
...
fix check if the certificate bundle needs to be updated
2016-07-11 11:04:49 +02:00
Bjoern Schiessle
49cad153af
always check the mtime of the system bundle and additionally the user specific certificate bundle if a user is given
2016-07-08 18:24:37 +02:00
Morris Jobke
c2d88a08b7
Remove unneeded checks if it runs on a Windows machine
...
* the setup check is still there
2016-07-08 15:55:17 +02:00
Morris Jobke
390a996297
Sanitize more config options and stack traces
2016-07-08 14:13:16 +02:00
Lukas Reschke
c8ba8f637e
Merge pull request #314 from jernst/master
...
Allow wildcard * to be used in trusted domains
2016-07-07 19:34:11 +02:00
Morris Jobke
2791b8f00d
Revert "occ web executor ( #24957 )"
...
This reverts commit 854352d9a0
.
2016-07-07 12:14:45 +02:00
Morris Jobke
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
Johannes Ernst
66a134e69e
Disallow certain malformed domain names even if they match the trusted domain expression
...
Stricter checking for valid domain names
2016-07-06 23:51:04 +00:00
Johannes Ernst
2b4ceae620
Trusted domain wildcard checking made shorter, supporting multiple *
...
Added test cases
2016-07-06 23:38:30 +00:00
Vincent Petry
dc21a38a85
Use named parameter instead of direct value for system tags search param ( #25380 )
2016-07-06 22:39:34 +02:00
Thomas Pulzer
0638937ada
Changed the input option for database-port to required when parameter was provided.
...
Added casting database port to int for input sanitation in pgsql and oci connections.
2016-07-06 11:31:28 +02:00
Thomas Pulzer
d367318088
Added occ install option for database-port.
...
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
2016-07-06 09:58:38 +02:00
Johannes Ernst
3516b58be6
Duh, no 'next' in PHP.
...
Use === instead of == for extra paranoia.
2016-07-06 04:51:49 +00:00
Johannes Ernst
b1867dc8d1
Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com)
2016-07-05 18:49:18 +00:00
Thomas Müller
d2d99a91a0
fix swift primary object store test ( #25281 )
...
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
Thomas Pulzer
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
Thomas Pulzer
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
Lukas Reschke
dc5fea504b
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
...
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
2016-07-03 16:54:41 +02:00
Hendrik Leppelsack
11be3d6276
remove png references in core
2016-07-01 16:36:37 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Thomas Müller
b55ab6d22a
Various database migration fixes ( #25209 )
...
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating
* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling
* Fix sqlite integer type for autoincrement
* Use lower case table names - fixes pg
* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
2016-06-29 14:54:41 +02:00
Morris Jobke
b6397ef73a
Merge pull request #236 from nextcloud/master-sync-upstream
...
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Robin Appelman
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
Christoph Wurst
1710de8afb
Login hooks ( #25260 )
...
* fix login hooks
* adjust user session tests
* fix login return value of successful token logins
* trigger preLogin hook earlier; extract method 'loginWithPassword'
* call postLogin hook earlier; add PHPDoc
2016-06-27 22:16:22 +02:00
Robin Appelman
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
Lukas Reschke
e0445856b9
Merge pull request #59 from nextcloud/theming-app
...
Theming app
2016-06-27 21:14:40 +02:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Bjoern Schiessle
2a990a0db5
verify user password on change
2016-06-27 14:08:11 +02:00
Bjoern Schiessle
d4989c8037
remove old hook, no longer needed
2016-06-27 14:05:27 +02:00
Bjoern Schiessle
630e4b1b46
check password for link shares
2016-06-27 14:05:27 +02:00
Vincent Petry
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Vincent Petry
7269611722
Merge pull request #25258 from owncloud/integritycheck-whennotinstalled
...
Make code integrity check work when OC is not installed yet
2016-06-27 11:58:35 +02:00
Lukas Reschke
89e889c832
Check if server is installed
...
AppManager has a dependency on Nc being installed
2016-06-27 10:26:23 +02:00
Lukas Reschke
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Bjoern Schiessle
10f6ca20bc
write theme settings to database
2016-06-27 10:26:22 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Christoph Wurst
89198e62e8
check login name when authenticating with client token
2016-06-24 13:57:09 +02:00
Vincent Petry
e677ad56fd
Make code integrity check work when OC is not installed yet
2016-06-24 10:24:41 +02:00
Vincent Petry
0ad065cb8d
Repair step to adjust link share delete permissions
2016-06-24 09:48:48 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Vincent Petry
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Vincent Petry
c49ff83f18
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents
...
Fire hooks for mkdir for folder upload
2016-06-22 10:21:00 +02:00
karakayasemi
c8b7a059b4
Fire hooks for mkdir for folder upload
...
fromTmpFile function, usual mkdir call is only working for file's parent
directory. Does not care upper parent folders. I added a recursive
function that creates parent non-existing folders with usual mkdir.
2016-06-21 17:10:52 +02:00
Christoph Wurst
7f22aeb5d6
redirect to new login route ( #25099 )
...
* redirect to new login route
* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
Lukas Reschke
097cba8b38
Merge pull request #185 from nextcloud/fix-permission-issue
...
Show error message if config file is not readable
2016-06-21 12:14:24 +02:00