Skip to content

Commit

Permalink
graph/sharedWitMe: fix response for shares from project space
Browse files Browse the repository at this point in the history
Resources on project space do not have a real owner assigned. A special
of the type USER_TYPE_SPACE_OWNER is returned as the owner. This type of
user can't be looked up via a GetUser request. So we skip that call for
this usertype.

This also fixes the behavior of 'sharedWithMe' for case when the owner
or creator of a share or shared resource can't be looked up in the 'users'
service. Previously cause the complete request to fail with an error message.
So a single share with an unresolvable owner caused 'sharedWithMe' to fail.
Now we log a warning but return all shares. Those where the owner or creator
couldn't be resolved will have the 'displayName' field of the user in the
'remoteItem.shared.owner' or 'remoteItem.shared.sharedBy' property left
empty.

Fixes: #8215
Fixes: #8027
  • Loading branch information
rhafer committed Jan 19, 2024
1 parent cd4db2c commit d4c4f06
Show file tree
Hide file tree
Showing 85 changed files with 104 additions and 104 deletions.
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.eventhistory.v0"
url: /apis/grpc_apis/ocis_messages_eventhistory_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.policies.v0"
url: /apis/grpc_apis/ocis_messages_policies_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.search.v0"
url: /apis/grpc_apis/ocis_messages_search_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.settings.v0"
url: /apis/grpc_apis/ocis_messages_settings_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.store.v0"
url: /apis/grpc_apis/ocis_messages_store_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.thumbnails.v0"
url: /apis/grpc_apis/ocis_messages_thumbnails_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.eventhistory.v0"
url: /apis/grpc_apis/ocis_services_eventhistory_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.policies.v0"
url: /apis/grpc_apis/ocis_services_policies_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.search.v0"
url: /apis/grpc_apis/ocis_services_search_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.settings.v0"
url: /apis/grpc_apis/ocis_services_settings_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.store.v0"
url: /apis/grpc_apis/ocis_services_store_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.thumbnails.v0"
url: /apis/grpc_apis/ocis_services_thumbnails_v0
date: 2024-01-19T03:49:33Z
date: 2024-01-19T08:02:56Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/antivirus_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the antivirus service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -245,7 +245,7 @@ a| [subs=-attributes]
The socket clamav is running on. Note the default value is an example which needs adaption according your OS.

a|`ANTIVIRUS_ICAP_TIMEOUT` +
xref:deprecation-note-2024-01-19-03-49-53[Deprecation Note]
xref:deprecation-note-2024-01-19-08-03-13[Deprecation Note]
a| [subs=-attributes]
++int64 ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-provider_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the app-provider service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-registry_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the app-registry service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/audit_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the audit service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-basic_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the auth-basic service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-bearer_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the auth-bearer service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-machine_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the auth-machine service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-service_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the auth-service service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/clientlog_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the clientlog service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/eventhistory_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the eventhistory service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/frontend_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the frontend service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/gateway_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the gateway service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
36 changes: 18 additions & 18 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Flag to enable or disable the creation of the demo users.
The default role assignments the demo users should be setup.

a| `OCIS_ADMIN_USER_ID`

Expand Down Expand Up @@ -116,7 +116,7 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++cache-userinfo ++
++storage-system ++

a| [subs=-attributes]
The database name the configured store should use.
Expand Down Expand Up @@ -235,7 +235,7 @@ a| [subs=-attributes]
++Duration ++

a| [subs=-attributes]
++10s ++
++24m0s ++

a| [subs=-attributes]
Default time to live for user info in the user info cache. Only applied when access tokens has no expiration. See the Environment Variable Types description for more details.
Expand Down Expand Up @@ -285,7 +285,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id] ++
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Purge Restore] ++

a| [subs=-attributes]
A list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers. See the Environment Variable Types description for more details.
Expand Down Expand Up @@ -994,7 +994,7 @@ a| [subs=-attributes]
++attribute ++

a| [subs=-attributes]
An option to control the behavior for disabling users. Supported options are 'none', 'attribute' and 'group'. If set to 'group', disabling a user via API will add the user to the configured group for disabled users, if set to 'attribute' this will be done in the ldap user entry, if set to 'none' the disable request is not processed. Default is 'attribute'.
An option to control the behavior for disabling users. Valid options are 'none', 'attribute' and 'group'. If set to 'group', disabling a user via API will add the user to the configured group for disabled users, if set to 'attribute' this will be done in the ldap user entry, if set to 'none' the disable request is not processed.

a| `OCIS_LDAP_GROUP_BASE_DN`

Expand Down Expand Up @@ -1095,7 +1095,7 @@ a| [subs=-attributes]
++ownclouduuid ++

a| [subs=-attributes]
LDAP Attribute to use as the unique id for groups. This should be a stable globally unique ID like a UUID.
LDAP Attribute to use as the unique id for groups. This should be a stable globally unique id (e.g. a UUID).

a| `OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING`

Expand All @@ -1112,7 +1112,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this to true if the defined 'id' attribute for groups is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the group ID's.
Set this to true if the defined 'id' attribute for groups is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the group IDs.

a| `OCIS_LDAP_GROUP_SCHEMA_MAIL`

Expand Down Expand Up @@ -1162,7 +1162,7 @@ a| [subs=-attributes]
++sub ++

a| [subs=-attributes]
LDAP search scope to use when looking up groups. Supported scopes are 'base', 'one' and 'sub'.
LDAP search scope to use when looking up groups. Supported values are 'base', 'one' and 'sub'.

a| `OCIS_LDAP_INSECURE`

Expand Down Expand Up @@ -1248,7 +1248,7 @@ a| [subs=-attributes]
++ownCloudUserEnabled ++

a| [subs=-attributes]
LDAP Attribute to use as a flag telling if the user is enabled or disabled.
LDAP attribute to use as a flag telling if the user is enabled or disabled.

a| `OCIS_LDAP_USER_FILTER`

Expand Down Expand Up @@ -1318,7 +1318,7 @@ a| [subs=-attributes]
++ownclouduuid ++

a| [subs=-attributes]
LDAP Attribute to use as the unique id for users. This should be a stable globally unique id like a UUID.
LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID.

a| `OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING`

Expand All @@ -1335,7 +1335,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's.
Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user IDs.

a| `OCIS_LDAP_USER_SCHEMA_MAIL`

Expand Down Expand Up @@ -1404,7 +1404,7 @@ a| [subs=-attributes]
++sub ++

a| [subs=-attributes]
LDAP search scope to use when looking up users. Supported scopes are 'base', 'one' and 'sub'.
LDAP search scope to use when looking up users. Supported values are 'base', 'one' and 'sub'.

a| `OCIS_LOG_COLOR`

Expand Down Expand Up @@ -1656,7 +1656,7 @@ a| [subs=-attributes]
++https://localhost:9200 ++

a| [subs=-attributes]
The identity provider value to set in the group IDs of the CS3 group objects for groups returned by this group provider.
The identity provider value to set in the userids of the CS3 user objects for users returned by this user provider.

a| `OCIS_PASSWORD_POLICY_BANNED_PASSWORDS_LIST`

Expand Down Expand Up @@ -1854,10 +1854,10 @@ a| [subs=-attributes]
++Duration ++

a| [subs=-attributes]
++336h0m0s ++
++0s ++

a| [subs=-attributes]
Time to live for events in the store. Defaults to '336h' (2 weeks). See the Environment Variable Types description for more details.
Time to live for events in the store. See the Environment Variable Types description for more details.

a| `OCIS_REVA_GATEWAY`

Expand Down Expand Up @@ -1973,7 +1973,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares.
Set this to true if you want to enforce passwords on Uploader, Editor or Contributor shares. If not using the global OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD, you must define the FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD in the frontend service.

a| `OCIS_SPACES_MAX_QUOTA`

Expand Down Expand Up @@ -2026,7 +2026,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
ID of the oCIS STORAGE-SYSTEM system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format.
ID of the oCIS storage-system system user. Admins need to set the ID for the STORAGE-SYSTEM system user in this config option which is then used to reference the user. Any reasonable long string is possible, preferably this would be an UUIDv4 format.

a| `OCIS_SYSTEM_USER_IDP`

Expand Down Expand Up @@ -2317,7 +2317,7 @@ a| [subs=-attributes]
++https://localhost:9200 ++

a| [subs=-attributes]
The identity provider value to set in the group IDs of the CS3 group objects for groups returned by this group provider.
The identity provider value to set in the userids of the CS3 user objects for users returned by this user provider.

a| `STORAGE_USERS_ASYNC_PROPAGATOR_PROPAGATION_DELAY`

Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/graph_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the graph service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/groups_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-01-19-03-49-53]
[#deprecation-note-2024-01-19-08-03-13]
[caption=]
.Deprecation notes for the groups service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
Loading

0 comments on commit d4c4f06

Please sign in to comment.