diff options
author | Jack Magne <jmagne@dhcp-32-224.sjc.redhat.com> | 2012-08-30 17:23:11 -0700 |
---|---|---|
committer | Jack Magne <jmagne@dhcp-32-224.sjc.redhat.com> | 2012-08-30 17:25:40 -0700 |
commit | e9ab0ec12bc7e22857850a6a183df825154971d4 (patch) | |
tree | 63fe414bdc307b4591b16e68f593afa04fe11b5a /base/tps/src/processor/RA_Enroll_Processor.cpp | |
parent | 99c05ac83888005a1aa3a1c31fe77d8ee5e36c42 (diff) | |
download | pki-e9ab0ec12bc7e22857850a6a183df825154971d4.tar.gz pki-e9ab0ec12bc7e22857850a6a183df825154971d4.tar.xz pki-e9ab0ec12bc7e22857850a6a183df825154971d4.zip |
Bug 844800 - TPS should provide the ability to not allow tokens marked as 'Terminated' to be formatted and reused.
Diffstat (limited to 'base/tps/src/processor/RA_Enroll_Processor.cpp')
-rw-r--r-- | base/tps/src/processor/RA_Enroll_Processor.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/base/tps/src/processor/RA_Enroll_Processor.cpp b/base/tps/src/processor/RA_Enroll_Processor.cpp index d88d84087..ba751646e 100644 --- a/base/tps/src/processor/RA_Enroll_Processor.cpp +++ b/base/tps/src/processor/RA_Enroll_Processor.cpp @@ -1989,11 +1989,19 @@ TPS_PUBLIC RA_Status RA_Enroll_Processor::Process(RA_Session *session, NameValue } if (RA::ra_is_token_present(cuid)) { - RA::Debug(FN, "Found token %s", cuid); - if (RA::ra_is_tus_db_entry_disabled(cuid)) { - RA::Error(FN, "CUID %s Disabled", cuid); + + int token_status = RA::ra_get_token_status(cuid); + + // As far as the ui states, state "enrolled" maps to the state of "FOUND" or 4; + + RA::Debug(FN, "Found token %s status %d", cuid, token_status); + + int STATUS_FOUND = 4; + if (token_status == -1 || !RA::transition_allowed(token_status, STATUS_FOUND)) { + RA::Error(FN, "Operation for CUID %s Disabled illegal transition attempted %d:%d", cuid,token_status, STATUS_FOUND); status = STATUS_ERROR_DISABLED_TOKEN; - PR_snprintf(audit_msg, 512, "token disabled"); + + PR_snprintf(audit_msg, 512, "Operation for CUID %s Disabled, illegal transition attempted %d:%d.", cuid,token_status, STATUS_FOUND); goto loser; } |