-
Notifications
You must be signed in to change notification settings - Fork 18
Conversation
6a86d5c
to
d005641
Compare
f65ad41
to
485afae
Compare
9b9b3d5
to
6734311
Compare
Sorry I'm not using Conjur much these days, so I won't be able to test this for a while :( |
5be2805
to
ecf7204
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Just a couple questions.
@@ -5,33 +5,40 @@ | |||
|
|||
This module represents an object that holds conjurrc data | |||
""" | |||
# pylint: disable=too-few-public-methods |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is pylint run on these files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. It was listing an error which is why I added this ignore statement.
@@ -64,6 +71,25 @@ services: | |||
- conjur | |||
- conjur-https | |||
|
|||
ldap-server: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like a lot of duplication with github.com/cyberark/conjur-api-python/pull/22,
Is there any around the duplication? or is this just something from splitting up the repos
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True. This sets up a test environment with an ldap server the same way the cyberark/conjur-api-python#22 does. But the tests it runs are different. The ones in the api repo test the API functions by themselves, while the ones in this PR test them E2E in the CLI.
objectClass: organizationalPerson | ||
objectClass: inetOrgPerson | ||
objectClass: top | ||
userPassword: ldapuser |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do these ldif files prefer no newline?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question, I don't know. Probably doesn't matter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Just saw one tiny formatting thing, but I don't want to stop this commit because of it.
Depends on #410, cyberark/conjur-api-python#23
Desired Outcome
The
conjur init
command should support LDAP authentication. It should be possible to specify the authentication type using the-t
or--authn-type
option. The default value should beauthn
(same as current), and it should additionally supportldap
.When using
ldap
, a--service-id
option should be mandatory.If the
--service-id
option is specified, then--authn-type
should default toldap
.The CLI implementation should be straightforward. It needs to support the new CLI arguments in the
init
command,and it will need to pass them to the conjur-api-python library.
Create new and update existing unit and integration tests.
Implemented Changes
Connected Issue/Story
Resolves #264, #324
CyberArk internal issue link: ONYX-20431
Definition of Done
conjur init
supports--authn-type
and--service-id
parametersChangelog
CHANGELOG update
Test coverage
changes, or
Documentation
README
s) were updated in this PRBehavior
Security