csrgen: accept public key info as Bytes

cert_get_requestdata() method is meant for internal use only and
is never passed a file. Make its parameter public_key_info Bytes
to better represent what's actually being passed to it.

https://pagure.io/freeipa/issue/7131
This commit is contained in:
Stanislav Laznicka 2017-09-20 11:50:26 +02:00
parent 61dde27f70
commit 2b90c8a20e
2 changed files with 3 additions and 3 deletions

View File

@ -132,7 +132,7 @@ class cert_request(CertRetrieveOverride):
response = self.api.Command.cert_get_requestdata(
profile_id=profile_id,
principal=options.get('principal'),
public_key_info=unicode(pubkey_info_b64))
public_key_info=pubkey_info_b64)
req_info_b64 = response['result']['request_info']
req_info = base64.b64decode(req_info_b64)

View File

@ -11,7 +11,7 @@ from ipalib import errors
from ipalib import output
from ipalib import util
from ipalib.frontend import Local, Str
from ipalib.parameters import File, Principal
from ipalib.parameters import Bytes, Principal
from ipalib.plugable import Registry
from ipalib.text import _
from ipapython import dogtag
@ -52,7 +52,7 @@ class cert_get_requestdata(Local):
label=_('Profile ID'),
doc=_('CSR Generation Profile to use'),
),
File(
Bytes(
'public_key_info',
label=_('Subject Public Key Info'),
doc=_('DER-encoded SubjectPublicKeyInfo structure'),