1
0
Fork 0
mirror of synced 2024-07-07 15:36:19 +12:00
Commit graph

698 commits

Author SHA1 Message Date
Matej Bačo a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Steven Nguyen 00a4929301 Fix date format for usage APIs 2022-09-15 23:48:09 +00:00
shimon 5652e2d94f audits.resource label update 2022-09-08 15:16:54 +03:00
shimon 834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Jake Barnby 15939bb155
Merge remote-tracking branch 'origin/0.16.x' into fix-storage-audit-resources 2022-09-08 17:24:00 +12:00
Eldad Fux 01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux 1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux 0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +03:00
Jake Barnby 9665ec09e7
Make storage audit resources consistent with other resources 2022-09-07 20:22:25 +12:00
Jake Barnby 4590c464ef
Use write const 2022-09-06 21:17:25 +12:00
shimon 1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
Jake Barnby e55faff0a1
Fix tests 2022-09-05 19:51:33 +12:00
Jake Barnby 5c08e066aa
Fix allowed permissions for documents/files 2022-09-05 13:41:01 +12:00
shimon 5d16c39d5f account labels 2022-09-04 11:13:44 +03:00
Jake Barnby 1896193718
Fix missed optional updates 2022-09-03 12:44:33 +12:00
Jake Barnby f4f178d3bf
Merge remote-tracking branch 'origin/rc-qa-matej' into fix-rc-qa 2022-09-03 11:44:14 +12:00
Matej Bačo ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
Jake Barnby ddcb68c944
Make document/file security optional for create collection/bucket 2022-09-02 15:39:54 +12:00
Damodar Lohani 8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
Damodar Lohani 7b5cee8da9 fix description to use markdown for links 2022-08-31 10:24:13 +00:00
Damodar Lohani d647bdaf9e update compression attribute description 2022-08-31 09:55:55 +00:00
Christy Jacob 5a58312b53
Merge pull request #3741 from appwrite/refactor-guest-rate-limits
Refactor guest rate limits
2022-08-31 10:41:23 +02:00
Jake Barnby ce28dd8201
Use route method in abuse key for guest writes 2022-08-31 15:58:32 +12:00
Damodar Lohani 594b66c18a fix missing break 2022-08-31 02:59:51 +00:00
Damodar Lohani bc7ec3854f linter fix 2022-08-31 02:56:44 +00:00
Damodar Lohani 63f95c0a5c Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 02:55:26 +00:00
Jake Barnby 190d9684f0
Use consts for rate limit count + period 2022-08-31 11:34:17 +12:00
Jake Barnby 1d4866c5b5
Use IP + User ID as abuse key for create routes 2022-08-31 11:33:19 +12:00
Jake Barnby b9148d380b
Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Damodar Lohani 2d1741504a compression on update bucket endpoint 2022-08-30 13:50:38 +00:00
Damodar Lohani 5fa7d34757 zstd compression support on endpoints 2022-08-30 13:46:55 +00:00
Christy Jacob 7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Damodar Lohani 6c04550558 compression attribute on create bucket endpoint 2022-08-30 12:55:26 +00:00
Matej Bačo 63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo 2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Jake Barnby 938f8394e0
Add abuse limits for create/update/delete document/file 2022-08-30 00:49:01 +12:00
Matej Bačo 889eaff418 Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-29 08:52:28 +00:00
Jake Barnby ccfd104545
Allow guest write scope for document, file and execution 2022-08-29 17:53:37 +12:00
Jake Barnby a16cd37f1a Remove filter_var usage 2022-08-27 15:19:51 +12:00
Jake Barnby c531213a5f Doc updates 2022-08-27 15:19:00 +12:00
Matej Bačo 7f0507473d Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-26 07:47:42 +00:00
Jake Barnby a679f2f767 Improve permission parameter descriptions 2022-08-26 16:37:06 +12:00
Jake Barnby 57048400dc Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into refactor-permissions-inc-console-fix 2022-08-26 15:01:39 +12:00
Jake Barnby 593c62116c Review fixes 2022-08-26 15:01:16 +12:00
Jake Barnby f945ab79ec
Apply suggestions from code review
Co-authored-by: Damodar Lohani <lohanidamodar@users.noreply.github.com>
2022-08-26 14:52:25 +12:00
Jake Barnby 8307b2148f Remove redundant auth exceptions catches 2022-08-26 14:23:23 +12:00
Jake Barnby e6e126dff4 Catch AuthorzationExceptions from database to throw 401 instead of 500 2022-08-25 23:30:26 +12:00
Matej Bačo c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
Matej Baco fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby 625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Jake Barnby 3149a298a7 Aggregate before role checks 2022-08-25 15:51:21 +12:00
Jake Barnby 002b30d110 Fix missing check for existing validity on listFiles 2022-08-25 13:05:31 +12:00
Jake Barnby d4b270e527 Better storage permission checks 2022-08-25 01:24:54 +12:00
Matej Bačo 2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo d1f6cb31d6 Upgrade listFiles queries 2022-08-23 08:49:39 +00:00
Matej Bačo 6fcd3757fe Upgrade listBuckets queries 2022-08-23 08:37:55 +00:00
Jake Barnby 00441885d2 Remove fallback setting for missing permissions 2022-08-23 13:42:53 +12:00
Jake Barnby e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Damodar Lohani c5a8e470c5 update usage labels to match audits labels pattern 2022-08-21 02:03:19 +00:00
Jake Barnby cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby 7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Damodar Lohani 3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
shimon 9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03:00
shimon cc9a166146 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/storage.php
	app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
shimon 9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani 80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Jake Barnby e3ec275a51 Cleaner permission checks 2022-08-16 23:26:38 +12:00
Jake Barnby 1aa36b6b2c Simplify permission checks 2022-08-16 21:08:14 +12:00
Jake Barnby 326220762e Exception fixes 2022-08-16 21:07:30 +12:00
Jake Barnby 5d84d6d43f Lint 2022-08-16 20:33:06 +12:00
Jake Barnby bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
Jake Barnby f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
shimon 590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
shimon f12ccfa02a prefix removed from storage audits label 2022-08-15 16:59:58 +03:00
shimon df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
Jake Barnby bf2fa212aa Fix setting defaults 2022-08-16 01:16:20 +12:00
Jake Barnby 28e7934aeb Update document/file validator allowed permissions 2022-08-16 01:02:02 +12:00
Jake Barnby b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
shimon 67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
Jake Barnby 77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Jake Barnby 813e9135c6 Review fixes 2022-08-15 22:11:17 +12:00
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Damodar Lohani a5aa20ac5c Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-15 05:35:14 +00:00
shimon 5e476a2e5a some fixes 2022-08-15 07:29:44 +03:00
shimon c0d8337417 some fixes 2022-08-14 23:45:05 +03:00
shimon 104e6564f7 some fixes 2022-08-14 23:06:21 +03:00
shimon cabe989555 some fixes 2022-08-14 22:42:20 +03:00
shimon 1109004727 some fixes 2022-08-14 22:27:43 +03:00
shimon 857803e362 some fixes 2022-08-14 21:02:38 +03:00
shimon ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob 8e24dbe22f feat: update exception class 2022-08-14 13:35:11 +05:30
Christy Jacob cfab9221f2 feat: exceptions on more files 2022-08-14 12:32:41 +05:30
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Jake Barnby 737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Damodar Lohani c1c325505b organize metrics 2022-08-13 05:01:43 +00:00
Damodar Lohani d688187e23 update metrics value 2022-08-13 04:39:01 +00:00
Damodar Lohani 74a159ab99 fix key 2022-08-13 03:44:57 +00:00
Damodar Lohani be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
Jake Barnby 8d4191b1a0 Lint 2022-08-13 02:46:50 +12:00
shimon 1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
Damodar Lohani c5993ba8b9 storage usage stats via route labels 2022-08-11 02:18:22 +00:00
Damodar Lohani 16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
shimon 092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
Jake Barnby 3611f9df94 Parameter order fix 2022-08-09 18:58:08 +12:00
Damodar Lohani bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
shimon 89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
Jake Barnby 69a79f660f Storage permission check fixes 2022-08-08 22:58:36 +12:00
shimon a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
shimon c8196c41d4 api::payload 2022-08-07 18:09:37 +03:00
shimon ec39ff267c api::parseLabel 2022-08-07 17:30:47 +03:00
shimon f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Jake Barnby 5e4a422495 Use helpers to process permissions 2022-08-05 18:01:25 +12:00
Jake Barnby 54b07a9446 Handle document/file level security in collections layer 2022-08-04 16:20:11 +12:00
Jake Barnby d9f0ece812 Remove new properties from DB level 2022-08-04 12:08:16 +12:00
Jake Barnby 4520114780 Refactor storage to use new permissions 2022-08-02 21:19:15 +12:00
shimon 45ad0f6bdf Reference comments 2022-07-30 22:10:30 +03:00
shimon 5511a93e9c Expires header returned to the endpoints 2022-07-28 18:24:18 +03:00
Bradley Schofield 3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield 96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
shimon d09bf306ce response changes 2022-07-26 15:50:33 +03:00
shimon 16ed2c1572 tidy up 2022-07-24 18:22:31 +03:00
shimon f214ead6f6 tidy up 2022-07-24 12:49:51 +03:00
shimon 64050337cf tidy up 2022-07-24 10:05:24 +03:00
shimon 02907f12f1 cache logic moved to api::init & api::shutdown 2022-07-23 20:42:42 +03:00
Torsten Dittmann 5604a6837f Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-07-14 14:14:05 +02:00
fogelito 45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito 7e08575245 builds, stats 2022-07-11 18:12:41 +03:00
Matej Bačo aae7ec6146 Upgrade to use new permissiosn validator features 2022-07-10 17:25:27 +00:00
shimon 59627ea9ef logger moved to App::shutdown 2022-07-09 21:24:28 +03:00
shimon b2b2534dcc logger moved to App::shutdown 2022-07-07 18:06:05 +03:00
shimon a0cfc2110a logger moved to App::shutdown 2022-07-07 17:51:22 +03:00
shimon 27333035c0 restore 2022-07-05 10:48:52 +03:00
shimon 0c2c030b71 restore 2022-07-05 10:46:41 +03:00
shimon 56a21b3968 small fix 2022-07-05 10:37:46 +03:00
shimon 7b429bdcd7 cache cleanup 2022-07-03 12:36:59 +03:00
Torsten Dittmann e83cf382fd fix: all sdks and specs 2022-06-28 13:21:28 +02:00