- if (u.isInGroup(Group.SUPPORTER) || u.isInGroup(Group.ORG_AGENT) || u.isInGroup(Group.TTP_AGENT) || u.canVerify()) {
- vars.put("certlogin", LoginPage.getAuthorizationContext(req).isStronglyAuthenticated());
- vars.put("certlogininfo", true);
- } else {
- vars.put("certlogininfo", false);
+
+
+ vars.put("catsinfo", false);
+ if (u.canVerify() && !u.hasValidRAChallenge()) {
+ vars.put("catsinfo", true);
+ vars.put("catsra", true);
+ }
+ if (u.isInGroup(Group.SUPPORTER) && !u.hasValidSupportChallenge()) {
+ vars.put("catsinfo", true);
+ vars.put("catssupport", true);
+ }
+ if (u.isInGroup(Group.ORG_AGENT) && !u.hasValidOrgAgentChallenge()) {
+ vars.put("catsinfo", true);
+ vars.put("catsorgagent", true);
+ }
+ if (u.isInGroup(Group.TTP_AGENT) && !u.hasValidTTPAgentChallenge()) {
+ vars.put("catsinfo", true);
+ vars.put("catsttpagent", true);