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

security/sssd2: Numerous cleanups #272

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

arrowd
Copy link
Contributor

@arrowd arrowd commented Jun 8, 2024

@jhixson74 Please take a look

@jhixson74
Copy link
Contributor

Thanks @arrowd , I'll take a look at this soon. I've got some other sssd patches that are going in as well. Lots of folks finally starting to chime in ;-)

@arrowd
Copy link
Contributor Author

arrowd commented Jun 9, 2024

In some cases I'm bumping into the following unimplemented function: https://github.com/SSSD/sssd/blob/a56b8d1aaf030fea196b65545dfe207ea10bdf50/src/util/find_uid.c#L328

I wonder if your WIP patches are going to cover that?

@arrowd
Copy link
Contributor Author

arrowd commented Jun 22, 2024

I've implemented that missing function and will submit it after this PR gets in. Can you please take a look, @jhixson74 ?

@jhixson74
Copy link
Contributor

I am working on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279255 currently. It will get committed tomorrow. After that I can look at this. The patch in the bug implements the find uid function.

@jhixson74
Copy link
Contributor

@arrowd Would you mind opening this up on bugzilla with attached as patches? Currently I don't know how to do github merges. I'm not authorized and merging is blocked. I'll figure that out another day ;-)

@jhixson74
Copy link
Contributor

Actually, I can make the diff myself. Nevermind ;-)

@bsdimp
Copy link
Member

bsdimp commented Jun 24, 2024

Actually, I can make the diff myself. Nevermind ;-)

You can add github as a remote to your normal tree, the cherry-pick the changes on the pull request to main. It's super fast. Add the Pyll Request trailer and reviewed by and you're done. :)

@arrowd
Copy link
Contributor Author

arrowd commented Jun 24, 2024

I use gh pr checkout https://github.com/freebsd/freebsd-ports/pull/272 && git rebase main

@bsdimp
Copy link
Member

bsdimp commented Jun 24, 2024

I use gh pr checkout https://github.com/freebsd/freebsd-ports/pull/272 && git rebase main

That works... my scripting does that...

@jhixson74
Copy link
Contributor

@arrowd Can you explain what changes you've made and why? Looking over them, I agree lots of cleanup can occur, but other things like changing the data directory I'm not going to do.

@arrowd
Copy link
Contributor Author

arrowd commented Jun 24, 2024

The canonical data dir for foo is usually ${PREFIX}/share/foo. In case of sssd2 the port name is duplicated due to --datadir being set explicitly (${PREFIX}/share/sssd/sssd/sssd.api.conf, note the sssd/sssd/ part). My change fixes that.

P.S. You can comment on specific lines in the pull request to make the context of the question clearer.

@arrowd
Copy link
Contributor Author

arrowd commented Jul 13, 2024

Restored one patch that was actually useful.

@arrowd
Copy link
Contributor Author

arrowd commented Jul 30, 2024

@jhixson74 can we get this in? We're running sssd2 with this change at $WORK for months now.

@arrowd
Copy link
Contributor Author

arrowd commented Aug 17, 2024

Rebased after @0mp change.

@arrowd
Copy link
Contributor Author

arrowd commented Aug 22, 2024

I understand that PRs are not subject for maintainer timeouts, but maybe I just push this?

@0mp
Copy link
Member

0mp commented Aug 22, 2024

I agree with @jhixson74 that it is a lot of changes that are not explained in the commit message. Also, it'd be easier to review if you separated the no-op cleanups that are no brainers to approve and commit from changes like the DATADIR.

I created a Bugzilla PR so that it stays on the radar: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280992

I work on sssd2 from time to time so I'll try to comment on the specific lines I find confusing next week or so.

@arrowd
Copy link
Contributor Author

arrowd commented Sep 15, 2024

I split the change into multiple commits to ease reviewing.

@arrowd
Copy link
Contributor Author

arrowd commented Oct 6, 2024

Yet another ping.

@arrowd
Copy link
Contributor Author

arrowd commented Oct 14, 2024

Anything else I can do to get this in?

@0mp
Copy link
Member

0mp commented Oct 14, 2024

Thank you for splitting the changes into smaller chunks. It's way easier to see what's going on there and will be easier to understand later on in the commit history.

Assuming that you've tested the change and it builds in poudriere, the changes look alright.

Reviewed by: 0mp

Also, I think that at this point you can also go for Approved by: maintainer timeout.

@jhixson74
Copy link
Contributor

I have not timed out. I have been watching this for a while.

I do not agree with changing the path here. Many of the other changes are okay. If I am going to be bullied into forced changes, then by all means go ahead and just change the maintainer to yourself. Thanks.

@arrowd
Copy link
Contributor Author

arrowd commented Oct 14, 2024

This is not constructive. How am I supposed to proceed after this comment?

Many of the other changes are okay.

Can you please name the commits you're OK with, so I can push them.

I do not agree with changing the path here.

Where? If you're talking about changing DATADIR then I explained it here: #272 (comment)
You never replied to that, and I'm waiting on this PR for months. I'd say it is me that is being bullied here.

P.S. You can leave review comments on specific lines in the "Files changed" tab to make the context clearer.

@0mp
Copy link
Member

0mp commented Oct 14, 2024

I have not timed out. I have been watching this for a while.

I do not agree with changing the path here. Many of the other changes are okay. If I am going to be bullied into forced changes, then by all means go ahead and just change the maintainer to yourself. Thanks.

I'm really sorry if the tone of my message turned out inappropriate. I assumed that the maintainer timeout is as a reasonable way forward as there were no comments on the issue for more than 2 weeks.

The community appreciates your work, @jhixson74. I thought that you are out of time and wouldn't mind the fixes to land.

From what I understand, the only patch that the current maintainer is not OK with is 7897c7d. I think that John has a good point in not liking the fixing of the DATADIR paths. Sure, it is not great at the moment and it would be nice to clean up the path names but I suspect that it may cause unnecessary problems for our users (no one likes the configuration paths to change in the name of a cleanup).

From what I understand, the way forward would be to remove the controversial DATADIR cleanup for now. This would leave us with a general cleanup which boils down to a cleaner port and no changes to the users of binary packages. Would you be willing to review such a patch set, @jhixson74, if @arrowd prepared one?

Thanks :)

@jhixson74
Copy link
Contributor

I am okay with all of the changes except the DATADIR. Thank you for summing things up @0mp. There are indeed users that would be very unhappy with this change.

@arrowd Can you explain what changes you've made and why? Looking over them, I agree lots of cleanup can occur, but other things like changing the data directory I'm not going to do.

I explained that here. Maybe I should've been more clear?

@arrowd
Copy link
Contributor Author

arrowd commented Oct 14, 2024

I explained that here. Maybe I should've been more clear?

Sorry, I can't find it. Can you post an URL?

I think that John has a good point in not liking the fixing of the DATADIR paths. Sure, it is not great at the moment and it would be nice to clean up the path names but I suspect that it may cause unnecessary problems for our users (no one likes the configuration paths to change in the name of a cleanup).

I don't get it. These files are program's data, not configs. Users do not (well, should not) change any files under ${DATADIR}, so it should be perfectly safe to move them. User-editable configs reside in etc/ and are installed via @sample mechanism.

freebsd-git pushed a commit that referenced this pull request Oct 16, 2024
- Simplify depending on Kerberos
- - Do not use gssapi:bootstrap
- - Do not redefine variables already defined by USES
- - Instead of patching, pass the KRB5_CONFIG env var
- Trim unused dependencies
- Remove hunks from the configure.ac patch that aren't needed anymore
- Simplify SHEBANG_FILES
- No need to define LIB_DIRS, DEBUG_FLAGS and STRIP
- Bump PORTREVISION to catch possible regressions

Tested by:	arrowd
Approved by:	0mp, jhixson
Pull Request:	#272
Sponsored by:	Future Crew, LLC
Sponsored by:	Future Crew, LLC
@arrowd
Copy link
Contributor Author

arrowd commented Oct 16, 2024

I have pushed all changes except the DATADIR one. I leave this change in this open PR, as I'm still believe that it is a correct one.

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

Successfully merging this pull request may close these issues.

4 participants