Skip the cert validator if the csr we are passed in is a valid filename

The validator will still fire, just after the load_files() call. Basically
it will hit the validator twice. The first time it will exit because the
value of csr is a filename. The second time it will run the validator against
the contents of the file.

ticket https://fedorahosted.org/freeipa/ticket/1777
This commit is contained in:
Rob Crittenden
2011-09-13 14:25:16 -04:00
committed by Martin Kosek
parent ba1bdda25f
commit 29ec63c381
2 changed files with 8 additions and 1 deletions

View File

@@ -420,7 +420,7 @@ arg: Str('serial_number', validate_serial_number, label=Gettext('Serial number',
output: Output('result', None, None)
command: cert_request
args: 1,3,1
arg: File('csr', validate_csr, cli_name='csr_file', normalizer=normalize_csr)
arg: File('csr', validate_csr, cli_name='csr_file', label=Gettext('CSR', domain='ipa', localedir=None), normalizer=normalize_csr)
option: Str('principal', label=Gettext('Principal', domain='ipa', localedir=None))
option: Str('request_type', autofill=True, default=u'pkcs10')
option: Flag('add', autofill=True, default=False)