Skip to content

Backport 18469 stable8.1 - #19427

Closed
blizzz wants to merge 4 commits into
stable8.1from
backport-18469-stable8.1
Closed

Backport 18469 stable8.1#19427
blizzz wants to merge 4 commits into
stable8.1from
backport-18469-stable8.1

Conversation

@blizzz

@blizzz blizzz commented Sep 28, 2015

Copy link
Copy Markdown
Contributor

Backport of #18469 to stable8.1

Please test and review @MorrisJobke @davitol @tkaufm @Xenopathic

@blizzz blizzz added this to the 8.1.4-current-maintenance milestone Sep 28, 2015
@blizzz

blizzz commented Sep 28, 2015

Copy link
Copy Markdown
Contributor Author

@DeepDiver1975 does that thing run tests against stable8.1 somehow? the failing master thing is totally unrelated.

@MorrisJobke

Copy link
Copy Markdown
Contributor

I just tested this and emails are not imported when I checkout this branch.

Then I upgraded the instance to master and rechecked: the emails are properly imported. Also uid and displayName now show up in oc_preferences. (stable8.1 just puts homePath entries into the preferences).

@blizzz

blizzz commented Sep 29, 2015

Copy link
Copy Markdown
Contributor Author

@MorrisJobke how exactly did you test?

@MorrisJobke

Copy link
Copy Markdown
Contributor

@MorrisJobke how exactly did you test?

  • set up the docker instance
  • add zombies with emails - see Add fake email address for users administration#56
  • checkout stable8.1
  • setup LDAP
  • check that no emails are prefilled into the DB
  • checkout this branch
  • share with a user
  • ❌ check that email is provisioned in the DB

The same steps works if I'm on master.

@blizzz

blizzz commented Sep 29, 2015

Copy link
Copy Markdown
Contributor Author

@MorrisJobke i tried the same… can you verify the email attribute is set in advanced settings?

@MorrisJobke

Copy link
Copy Markdown
Contributor

@MorrisJobke i tried the same… can you verify the email attribute is set in advanced settings?

Yes, it is set. I will retry

Comment thread apps/user_ldap/lib/user/user.php Outdated

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This needs to be in brackets, otherwise it returns 0 instead $valueFromLDAP if that was set. I change to more readable, simpler two-line approach. (This will need to get to master as well.)

@blizzz

blizzz commented Oct 1, 2015

Copy link
Copy Markdown
Contributor Author

@MorrisJobke did you retry?

@blizzz

blizzz commented Oct 1, 2015

Copy link
Copy Markdown
Contributor Author

@MorrisJobke thx for the elucidating screenshare – should work now for you, too :)

@blizzz

blizzz commented Oct 12, 2015

Copy link
Copy Markdown
Contributor Author

requires a backport of #19635 after merging.

…search, in one query)

read all relevant user attributes on login and user search, in one query. saves us some.

Conflicts:
	apps/user_ldap/user_ldap.php

adjust to nested group fix

do not throw exception when no attribute is specified
…bute names coming from ldap are lowercased for easy comparison
@MorrisJobke
MorrisJobke force-pushed the backport-18469-stable8.1 branch from e44df7d to 7ccd52d Compare October 22, 2015 10:01
@MorrisJobke

Copy link
Copy Markdown
Contributor

I rebased this on current stable8.1

@MorrisJobke

Copy link
Copy Markdown
Contributor

requires a backport of #19635 after merging.

I created a backport of #19635 with this PR included - see #19972

@MorrisJobke

Copy link
Copy Markdown
Contributor

I tested this and the email attribute is correctly loaded on demand 👍

@davitol Can you please test this too? Thanks

@MorrisJobke

Copy link
Copy Markdown
Contributor

@davitol Can you please test this too? Thanks

Maybe test this together with #19972 (which has the commits in here included)

@davitol

davitol commented Oct 26, 2015

Copy link
Copy Markdown
Contributor

@MorrisJobke I've tested today in stable8.1 branch WITHOUT applying the patch.

  • Sharing a file and notifiying by email WFM with a LDAP user never logged before 😕
    The mail that contains the following text arrived without problems:

    Hey there,

just letting you know that admin shared nuevoservicio.txt with you.
View it!

Cheers!

ownCloud Enterprise Edition 8.1.4 RC1 (daily) Build:2015-10-26T03:40:45+00:00 5062007

@butonic

butonic commented Oct 26, 2015

Copy link
Copy Markdown
Contributor

@davitol did you make sure to wipe the ldap user mapping?

@davitol

davitol commented Oct 26, 2015

Copy link
Copy Markdown
Contributor

@butonic Just after clicking on Cleaning buttons in expert tab in the LDAP wizard I have retested it, and the mail is sent.

After clicking in the cleaning buttons, the ldap_user_mapping table is empty, but using the sharing wizard and searching for the ldap user in order to share the file, the table is populated again. Am I missing some step or those are not the right ones? 👀

@ghost

ghost commented Oct 26, 2015

Copy link
Copy Markdown

@davitol, if you test with the patch, are there any issues?

@davitol

davitol commented Oct 27, 2015

Copy link
Copy Markdown
Contributor

@cmonteroluque testing with the patch, I haven't found any issue due to this PR

Maybe another reviewer can try to reproduce the ldap neverlogin mail issue in stable8.1 and see if they can reproduce #17362 in stable8.1

@MorrisJobke @tkaufm @Xenopathic maybe?

@blizzz

blizzz commented Oct 27, 2015

Copy link
Copy Markdown
Contributor Author

If I understand this comment correctly, this one should be closed. Please confirm @MorrisJobke

@MorrisJobke

Copy link
Copy Markdown
Contributor

If I understand this comment correctly, this one should be closed. Please confirm @MorrisJobke

We can do this in two ways:

I just left this open to maybe identify possible problems easier - up to you.

@blizzz

blizzz commented Oct 27, 2015

Copy link
Copy Markdown
Contributor Author

@MorrisJobke then it is more straightforward if we just merge one and don't fiddle around anymore :) thanks for clarifying. Closing this in favor of #19972

@blizzz blizzz closed this Oct 27, 2015
@blizzz

blizzz commented Oct 27, 2015

Copy link
Copy Markdown
Contributor Author

let's keep the branch until #19972 is merged

@lock

lock Bot commented Aug 6, 2019

Copy link
Copy Markdown

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants