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.

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

new Group-Member association attribute (zimbraMailForwardingAddress) #14767

Closed
wants to merge 1,159 commits into from

Conversation

tofuSCHNITZEL
Copy link
Contributor

added "zimbraMailForwardingAddress" as a Group-Member association attribute to enable the use of Zimbra Distribution Lists as groups in nextcloud when connecting to a zimbra LDAP

@kesselb
Copy link
Contributor

kesselb commented Mar 20, 2019

First-time contributor

Thank you for your contribution 🎉

Indentation needs to be fixed and code style looks wrong (https://docs.nextcloud.com/server/stable/developer_manual/general/codingguidelines.html).

I personally don't like so many logic in wrapped in a switch-case 🙈

@tofuSCHNITZEL
Copy link
Contributor Author

I personally don't like so many logic in wrapped in a switch-case 🙈

yes I understand, but in this case I think it helps reusing code and improving readability (compared to a lot of if/elseifs) and it also makes future customization for different "ldapGroupMemberAssocAttr" easier

@kesselb
Copy link
Contributor

kesselb commented Mar 20, 2019

Make sense (and I'm not sure how to do it better right now).

Do you think we could introduce a new variable for strtolower($this->access->connection->ldapGroupMemberAssocAttr)?

@tofuSCHNITZEL
Copy link
Contributor Author

Do you think we could introduce a new variable for strtolower($this->access->connection->ldapGroupMemberAssocAttr)?

I created a new class variable for it - seems like a good idea as it is used quite often

@MorrisJobke
Copy link
Member

@blizzz Mind to review?

MorrisJobke and others added 5 commits July 17, 2019 11:43
Move log detail aggregation and reuse it in syslog/systemd logger
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Greta Doci <gretadoci@gmail.com>
…stricted-groups

Remove deleted groups from app restrictions fixes nextcloud#15823
…for-deleted-notifications

Notifications overhaul
@blizzz
Copy link
Member

blizzz commented Jul 17, 2019

@tofuSCHNITZEL thanks for you contribution. I am sorry I have to ask you to rebase and some changes might be needed, because the group backend code also changed since.

Further, I am thinking of moving out the attribute's logic specific parts out to to a to be created class, so it can do it's magic there. The reason is to take complexity out of the methods here and capsule them where they belong. That would help with the switch :) On the other hand it would extend the scope a lot, so perhaps that to be done in a different PR. If you're up to it. Otherwise it just the rebase and adaption.

MorrisJobke and others added 11 commits July 17, 2019 22:38
…-put-contents

Fix File#putContents(string) on ObjectStorage
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
To ensure there is only 1 background job per user

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Allow passing a nonce from the web server, allowing the possibility to enforce a strict CSP from the web server.

Signed-off-by: Sam Bull <git@sambull.org>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
rullzer and others added 13 commits August 11, 2019 12:51
…yarn/nextcloud-vue-0.12.1

Bump nextcloud-vue from 0.12.0 to 0.12.1
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v3.1.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
…yarn/file-loader-4.2.0

Bump file-loader from 4.1.0 to 4.2.0
…yarn/css-loader-3.2.0

Bump css-loader from 3.1.0 to 3.2.0
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 0.23.1 to 1.0.0.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/style-loader@v0.23.1...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
So fun fact. Chrome considers a redirect after submitting a form part of
the form actions. Since we redirect to a new protocol (nc://login/).
Causing the form submission to work but the redirect failing hard.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
…yarn/style-loader-1.0.0

Bump style-loader from 0.23.1 to 1.0.0
As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
 "cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
Add X-Frame-Options header to .htaccess
@rullzer rullzer modified the milestones: Nextcloud 17, Nextcloud 18 Aug 11, 2019
dependabot-preview bot and others added 10 commits August 11, 2019 20:30
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.0.7 to 3.1.2.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](vuejs/vue-router@v3.0.7...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Correctly handle emtpy string in proxyuserpwd config
Bump vue-router from 3.0.7 to 3.1.2
…ribute to enable the use of Zimbra Distribution Lists as groups in nextcloud when connecting to a zimbra LDAP

Signed-off-by: Tobias Perschon <tp@bitconnect.at>
Signed-off-by: Tobias Perschon <tp@bitconnect.at>
Signed-off-by: Tobias Perschon <tobias@perschon.at>
Signed-off-by: Tobias Perschon <tobias@perschon.at>
… zimbraldap

# Conflicts:
#	apps/user_ldap/lib/Group_LDAP.php
#	apps/user_ldap/lib/Wizard.php
@tofuSCHNITZEL
Copy link
Contributor Author

tofuSCHNITZEL commented Aug 13, 2019

@tofuSCHNITZEL thanks for you contribution. I am sorry I have to ask you to rebase and some changes might be needed, because the group backend code also changed since.

I rebased (or at least I tried) and I applied all my changes to the current master but I'm not sure if I completely messed up everything with the rebase seeing how my pull request now has so many commits... Is there a way to fix this (if its wrong) or should we just close this request and I create a new one with a fresh branch based on the current master?

Idk I think its a huge mess. code that was removed (eg usage of dn2ocname) that is now back - maybe I should just close this and open a new pull request?

@tofuSCHNITZEL tofuSCHNITZEL deleted the zimbraldap branch August 13, 2019 21:37
@tofuSCHNITZEL
Copy link
Contributor Author

please see new pull request #16737

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.