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

877 commits

Author SHA1 Message Date
Robin Appelman
fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Lukas Reschke
373d1c5e9f Merge pull request #10642 from owncloud/securityutils 
Add some security utilities
 2014-09-03 15:28:42 +02:00
Lukas Reschke
dcea6de26a Fix quoting 2014-09-03 14:16:55 +02:00
Lukas Reschke
a54af89d8a Add test for the second argument 2014-09-03 14:13:12 +02:00
Robin Appelman
dad53180bc Add event source to the public api 2014-09-03 13:36:15 +02:00
Lukas Reschke
20a7fb0334 Fix CHAR_SYMBOLS 2014-09-03 12:22:21 +02:00
Lukas Reschke
77c0adb520 Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils 2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c Add char consts, hash the specified password for the HMAC 2014-09-03 11:03:27 +02:00
Morris Jobke
4024960a0e Merge pull request #10780 from owncloud/config-public 
Extend public config interface
 2014-08-31 15:54:35 +02:00
Lukas Reschke
8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed 
Make external shares work with imported self signed certificates
 2014-08-31 15:50:30 +02:00
Robin Appelman
0a1e5aebf1 Extend public config interface 2014-08-31 15:27:36 +02:00
Lukas Reschke
ae3425d2da Merge branch 'master' into securityutils 
Conflicts:
	lib/private/util.php
 2014-08-31 15:21:09 +02:00
Morris Jobke
73685892ed Merge pull request #10770 from owncloud/getUserFolder 
update public interface for getUserFolder
 2014-08-31 13:26:32 +02:00
Morris Jobke
ac6324a5d0 update public interface for getUserFolder 2014-08-31 11:16:40 +02:00
Robin Appelman
c158db7200 Add certificate class 2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman
ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman
a58e670ae5 Also extend public server interface 2014-08-31 10:20:00 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Clark Tomlinson
cb0da1178b Merge pull request #10653 from owncloud/x-forwarded-for 
Add support for getting the real client IP behind proxies
 2014-08-27 10:32:34 -04:00
Björn Schießle
c35d60f6d8 Merge pull request #9915 from suraia/unsharefromself-source 
Allow specifying the item source in unshareFromSelf().
 2014-08-27 10:31:35 +02:00
Lukas Reschke
d26a9c3c58 Add some security utilities 
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions

Remove .htaccess

Remove .htaccess

Fix typo

Add public API

Use timing constant comparision

Remove CBC constant

Adjust code

Remove confusing $this
 2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1 Add support for getting the real client IP behind proxies 
Fixes https://github.com/owncloud/core/issues/10624

Fix copy paste fail

Add unittest for comma separated headers

Revert 3rdparty
 2014-08-27 00:05:04 +02:00
Lukas Reschke
88c3a4a31a Expose setSystemValue 2014-08-22 15:53:23 +02:00
Morris Jobke
ab6ee6a600 Add doc for \OCP\Files\FileInfo space constants 2014-08-19 16:49:51 +02:00
Morris Jobke
b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Thomas Müller
c08a1e6455 according to PHPDoc this function shall return the entity 2014-08-17 22:27:55 +02:00
Thomas Müller
c1102b1671 Merge pull request #10417 from owncloud/update_deprecation_doc 
update deprecation docs
 2014-08-14 17:54:23 +02:00
Jörn Friedrich Dreyer
fd798fd982 update deprecation docs 2014-08-14 12:22:34 +02:00
Bjoern Schiessle
d9f35d8c15 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-13 17:02:51 +02:00
Vincent Petry
173059f6d0 Fixed file list sorting 
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
 2014-08-11 13:28:53 +02:00
Björn Schießle
d35bfc9a4c Merge pull request #9520 from owncloud/theme_urls 
Add ability to theme iOS and Android client URLs just like desktop URLs.
 2014-08-05 17:53:18 +02:00
scolebrook
2e127d2c5e Add ability to theme iOS and Android client URLs just like desktop URLs. 2014-08-05 13:16:51 +02:00
Bjoern Schiessle
41cca70a63 don't display share permission if resharing was disabled by the admin 2014-08-05 10:57:51 +02:00
Thomas Müller
4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text 
Use svg mimeicons for empty text files
 2014-07-31 11:38:29 +02:00
Robin Appelman
4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Morris Jobke
889088f72d Fix template rendering for 'blank' templates 2014-07-29 16:49:50 +02:00
Björn Schießle
c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Michael Kuhn
ecdd04374a Allow specifying the item source in unshareFromSelf(). 2014-07-26 02:00:49 +02:00
Robin Appelman
acafb4a426 Merge pull request #9669 from owncloud/group-public 
Add group management to the public api
 2014-07-25 17:55:12 +02:00
Bjoern Schiessle
ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Thomas Müller
a8b6cc6a07 - adding default value for $recoveryPassword 
- set password correctly in lost password
 2014-07-24 12:50:39 +02:00
Joas Schilling
01878153e0 Add language parameter to public API for getL10N() 
Fix #9756
 2014-07-21 14:50:34 +02:00
Robin Appelman
94fa21d146 Add group management to the public api 2014-07-16 14:25:31 +02:00
Jörn Friedrich Dreyer
b3106c321c use correct IUser in interface 2014-07-15 17:41:44 +02:00
Robin Appelman
51d0bdc90c Expose the user manager in the public server container 2014-07-14 15:10:56 +02:00
Robin Appelman
20c1ce7f47 Add public interfaces for User, UserManager and UserSession 2014-07-14 15:10:51 +02:00
Thomas Müller
8363f3c635 Adding new interface \OCP\Activity\IExtentsion 
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
 2014-07-08 09:04:37 +02:00
Thomas Müller
2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview 
change order of registering api and capabilities to fix file version previews
 2014-07-04 15:25:24 +02:00
Vincent Petry
ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target 
don't move a share mount point into a different mount point
 2014-07-02 21:01:03 +02:00
Bjoern Schiessle
735eac6c9d add a explicit interface for the home storage 2014-07-01 17:31:33 +02:00
Jörn Friedrich Dreyer
5a588333b2 introduce and use getCurrentConnection() 2014-07-01 16:45:00 +02:00
Robin Appelman
1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +02:00
Robin Appelman
d78a2a9f78 Add StorageNotAvailableException 2014-06-30 15:46:37 +02:00
Vincent Petry
fd8b5680dd Merge pull request #8383 from owncloud/object_storage 
Object storage
 2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer
c112a1d323 move to stream based IObjectStore interface, rearrange & reformat code 2014-06-20 12:27:47 +02:00
Jörn Friedrich Dreyer
f2fe00e972 fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject() 2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408 change architecture from inheritance to composition 2014-06-18 12:53:20 +02:00
Vincent Petry
799205488c Prevent loadApps on upgrade 
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
 2014-06-18 11:10:07 +02:00
Bernhard Posselt
93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Bernhard Posselt
1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
Vincent Petry
5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes 
Update search classes
 2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
aaf0d13171 make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api 2014-06-06 01:17:02 +02:00
Bernhard Posselt
587a8df566 remove controller serializers 2014-06-05 18:00:36 +02:00
Thomas Müller
ec7225da66 remove file locking - code will continue to live in it's own app 2014-06-04 20:11:54 +02:00
ringmaster
54865815f5 Move Lock to private namespace, add interface. Update PHPDoc. 2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662 Removed unused vars/declarations, update PHPDoc. 2014-06-04 07:55:45 +02:00
ringmaster
f9dbdb7c5c Add actual locking and log changes necessary for debugging. 2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2 Continued flock work. 2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e flock changes. Work in progress. 2014-06-04 07:55:44 +02:00
Morris Jobke
9a67986473 add OCP\Config:deleteSystemValue 2014-06-02 18:31:43 +02:00
Lukas Reschke
c8b5ae675c Fix PHPDoc 
- Remove not anymore existing parameters
- Fix typo
 2014-06-01 21:46:05 +02:00
Robin Appelman
8c5521fdfc Add $storage->instanceOfStorage to handle instanceof for storage wrappers 2014-05-29 13:45:50 +02:00
Bart Visscher
a51e9a5cfe Merge pull request #8136 from owncloud/contactsmanager-register 
Implement the register function of OC\ContactsManager
 2014-05-27 22:35:50 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Thomas Müller
8749442fec no return on register and unregister 2014-05-19 21:39:19 +02:00
Thomas Müller
bb6fac1102 Merge branch 'master' into contactsmanager-register 
Conflicts:
	lib/private/contactsmanager.php
 2014-05-19 21:35:13 +02:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc 
* test case added to avoid adding them later
 2014-05-19 17:50:53 +02:00
Thomas Müller
95741f3936 Merge pull request #8435 from owncloud/fix-8322-master 
Expose permission via WebDAV
 2014-05-19 16:52:03 +02:00
Joas Schilling
ab7ae004f7 Automatically copy the share expiration date when new shares are created 
Fix #4823
 2014-05-19 01:38:47 +02:00
Björn Schießle
b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password 
allow admin to enforce passwords for public link shares
 2014-05-16 12:23:01 -04:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Bernhard Posselt
9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Bernhard Posselt
512373fadf provide a way to detect the language that is being used (e.g. for clientside javascript language selection 2014-05-14 01:09:48 +02:00
Robin McCorkell
f7e777f7d2 Fix various code errors detected by Scrutinizer 
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
 2014-05-13 19:09:14 +01:00
Robin McCorkell
87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b Replace @returns with @return, in /lib 2014-05-13 19:08:14 +01:00
Thomas Müller
1d18fd4e6d Merge pull request #8482 from owncloud/public-logger 
Make logger available in the container
 2014-05-12 16:40:58 +02:00
Morris Jobke
6499995474 Merge pull request #8477 from owncloud/better-controllers 
Better appframework controllers
 2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13 Merge pull request #8274 from owncloud/appframework-db 
Port database layer from appframework to core
 2014-05-12 00:12:19 +02:00
Bernhard Posselt
1d45239c65 adjust license headers to new mail address 2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6 rename formatter to responder, formatResponse to buildResponse 2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431 implement most of the basic stuff that was suggested in #8290 2014-05-11 17:54:08 +02:00
Bernhard Posselt
3af30625ab Make db connection protected 2014-05-11 12:54:44 +02:00
Bernhard Posselt
9a4d204b55 add cors middleware 
remove methodannotationreader namespace

fix namespace for server container

fix tests

fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request

remove uneeded  local in cors middleware registratio

dont uppercase cors to easily use it from routes

fix indention

comment fixes

explicitely set allow credentials header to false

dont depend on better controllers PR, fix that stuff later

split cors methods to be in a seperate controller for exposing apis

remove protected definitions from apicontroller since controller has it
 2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca - make logger available in the container 
- inject logger class into log
- adding PHPDoc comments and fixing typos
 2014-05-09 23:26:20 +02:00
Vincent Petry
390549c286 Merge pull request #8221 from owncloud/type-hinting-sharing 
Type hinting fixes for sharing
 2014-05-08 09:30:50 +02:00
Vincent Petry
4a493c8835 Some expected Sabre exceptions are now logged with DEBUG level 2014-05-07 11:43:50 +02:00