Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow local delivery of schedule message while prohibiting FreeBusy requests #11822

Merged
merged 1 commit into from
Oct 18, 2018
Merged

allow local delivery of schedule message while prohibiting FreeBusy requests #11822

merged 1 commit into from
Oct 18, 2018

Conversation

georgehrke
Copy link
Member

@georgehrke georgehrke commented Oct 14, 2018 •
edited
Loading

To test this you need a copy of thunderbird.

With php occ config:app:set dav disableFreeBusy --value=no (or option not set):

  • FreeBusy is allowed
    freebusy_setting_disabled
  • Invitations are delivered locally
    delivered_setting_disabled

With php occ config:app:set dav disableFreeBusy --value=yes

  • FreeBusy is prohibited
    freebusy_option_enabled
  • but local delivery is still working
    d0182040-b5c3-4b24-b7f1-157ef8715b85

With current master, enabling disableFreeBusy also breaks local delivery.

@georgehrke georgehrke added the 2. developing Work in progress label Oct 14, 2018
@georgehrke georgehrke added this to the Nextcloud 15 milestone Oct 14, 2018
@georgehrke georgehrke force-pushed the bugfix/noid/forbid_freebusy_but_allow_local_delivery branch from 26532e0 to f077c64 Compare October 14, 2018 11:55
@georgehrke georgehrke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 16, 2018
@georgehrke georgehrke requested review from rullzer and MorrisJobke and removed request for rullzer October 16, 2018 18:04
@georgehrke
move disableFreeBusy check from User principal backend to Scheduling …
f5dc7b7 
…Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests

Signed-off-by: Georg Ehrke <[email protected]>
@georgehrke georgehrke force-pushed the bugfix/noid/forbid_freebusy_but_allow_local_delivery branch from f077c64 to f5dc7b7 Compare October 16, 2018 18:27
@georgehrke georgehrke mentioned this pull request Oct 17, 2018
Merged
rullzer
rullzer approved these changes Oct 18, 2018
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to do the trick for me

MorrisJobke
MorrisJobke approved these changes Oct 18, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good 👍

@MorrisJobke
Copy link
Member

CI failure unrelated.

@MorrisJobke MorrisJobke merged commit 4e53ea6 into master Oct 18, 2018
@rullzer
Copy link
Member

rullzer commented Oct 21, 2018

@georgehrke since this is mainly tests and faily straight forward code.
How about a backport?

This was referenced Oct 22, 2018
Merged
Merged
@MorrisJobke MorrisJobke deleted the bugfix/noid/forbid_freebusy_but_allow_local_delivery branch October 23, 2018 14:01
@georgehrke georgehrke mentioned this pull request Jan 8, 2019
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer rullzer approved these changes

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 15
Development

Successfully merging this pull request may close these issues.
3 participants
@georgehrke @MorrisJobke @rullzer