Fix RA cert import during DL0 replication #721
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ipaserver/install/cainstance.py
Outdated
| @@ -400,7 +400,8 @@ def configure_instance(self, host_name, dm_password, admin_password, | |||
| self.step("Importing RA key", self.__import_ra_key) | |||
| else: | |||
| self.step("importing RA certificate from PKCS #12 file", | |||
| lambda: self.import_ra_cert(ra_p12)) | |||
| lambda: self.import_ra_cert(ra_p12, | |||
| self.dm_password)) | |||
There was a problem hiding this comment.
Could you please put this into a __import_ra_cert helper method so we get rid of this ugly lambda expression?
ipaserver/install/cainstance.py
Outdated
| if password is not None: | ||
| pwdfile_fd, pwdfile_name = tempfile.mkstemp() | ||
| os.write(pwdfile_fd, password) | ||
| os.close(pwdfile_fd) |
There was a problem hiding this comment.
You can / should use ipautil.write_tmp_file here.
There was a problem hiding this comment.
Will do, did not realize we have such a thing, thanks.
ipaserver/install/cainstance.py
Outdated
| """ | ||
| Cloned RAs will use the same RA agent cert as the master so we | ||
| need to import from a PKCS#12 file. | ||
|
|
||
| Used when setting up replication | ||
| """ | ||
| pwdarg = 'pass:' | ||
| if password is not None: |
There was a problem hiding this comment.
Why is the empty password special cased here?
There was a problem hiding this comment.
We won't need this in the end, this should be reworked.
|
🤷 |
|
... because you need to apply the same fix to |
|
Silly me 🙄 |
Previous versions of FreeIPA add password to the ra.p12 file contained in the password-protected tarball. This was forgotten about in the recent changes and fixed now. https://pagure.io/freeipa/issue/6878
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previous versions of FreeIPA add password to the ra.p12 file
contained in the password-protected tarball. This was forgotten
about in the recent changes and fixed now.
https://pagure.io/freeipa/issue/6878