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 to read bind_password from a file #172

Merged
merged 1 commit into from
Aug 17, 2022
Merged

Allow to read bind_password from a file #172

merged 1 commit into from
Aug 17, 2022

Conversation

Ma27
Copy link
Contributor

@Ma27 Ma27 commented Aug 11, 2022

That way you don't have to leak your bind password into your config.
Useful for e.g. NixOS where config is stored in a world-readable
location.

@Ma27 Ma27 requested a review from a team as a code owner August 11, 2022 10:35
squahtx
squahtx reviewed Aug 11, 2022
View reviewed changes
Copy link
Contributor

@squahtx squahtx left a comment

Choose a reason for hiding this comment

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

Looks really useful, thanks!

Could we update the README to mention the new config option?

Also do you mind adding a sign off to confirm that you're happy for your contribution to fall under the project license, etc?
https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off

@Ma27 Ma27 force-pushed the ldap-bind-pw-file branch 2 times, most recently from 27a9e74 to ec3062c Compare August 17, 2022 09:06
@Ma27
Copy link
Contributor Author

Ma27 commented Aug 17, 2022

Updated the README accordingly and added a Signed-off-by via git commit --amend --signoff :)

@Ma27 Ma27 requested a review from squahtx August 17, 2022 09:07
squahtx
squahtx reviewed Aug 17, 2022
View reviewed changes
Copy link
Contributor

@squahtx squahtx left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks for updating the README.

One very minor wording suggestion:

README.rst Outdated Show resolved Hide resolved
@Ma27 Ma27 requested a review from squahtx August 17, 2022 09:25
@squahtx
Copy link
Contributor

squahtx commented Aug 17, 2022

The linter check in CI seems unhappy. Could you give scripts-dev/lint.sh a run?

@Ma27
Allow to read bind_password from a file
cd5b6d9 
That way you don't have to leak your bind password into your config.
Useful for e.g. NixOS where config is stored in a world-readable
location.

Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
@Ma27
Copy link
Contributor Author

Ma27 commented Aug 17, 2022

Applied the diff from CI for now, let's see if that's sufficient.
Should be an OK change considering that it's only ' vs " and some indentation stuff.

squahtx
squahtx approved these changes Aug 17, 2022
View reviewed changes
Copy link
Contributor

@squahtx squahtx left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you for your contribution!

@Ma27
Copy link
Contributor Author

Ma27 commented Aug 17, 2022

AFAICS the mypy error also occurs on master, so it's not actionable here, correct?

@squahtx squahtx merged commit c65e8cb into matrix-org:main Aug 17, 2022
@Ma27 Ma27 deleted the ldap-bind-pw-file branch August 17, 2022 09:38
@squahtx
Copy link
Contributor

squahtx commented Aug 17, 2022 •
edited

AFAICS the mypy error also occurs on master, so it's not actionable here, correct?

Yes, seems like it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squahtx squahtx squahtx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ma27 @squahtx