* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modification Copyright (c) 2019 IBM
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
cmds.add(new ListByPerm(this));
cmds.add(new ListActivity(this));
}
-
+
// Package Level on purpose
abstract class ListRoles extends Retryable<Integer> {
protected int list(Future<Roles> fr,Rcli<?> client, String header) throws APIException, CadiException {
- if(fr.get(AAFcli.timeout())) {
+ if (fr.get(AAFcli.timeout())) {
Perms perms=null;
if (aafcli.isDetailed()) {
- for(aaf.v2_0.Role r : fr.value.getRole()) {
+ for (aaf.v2_0.Role r : fr.value.getRole()) {
Future<Perms> fp = client.read(
- "/authz/perms/role/"+r.getName()+(aafcli.isDetailed()?"?ns":""),
+ "/authz/perms/role/"+r.getName()+(aafcli.isDetailed()?"?ns":""),
getDF(Perms.class)
);
- if(fp.get(AAFcli.timeout())) {
- if(perms==null) {
+ if (fp.get(AAFcli.timeout())) {
+ if (perms==null) {
perms = fp.value;
} else {
perms.getPerm().addAll(fp.value.getPerm());
}
}
- private final static String roleFormat = "%-56s Expires %s\n";
- private final static String roleFormatNoDate = "%-61s\n";
- private final static String roleExpiredFormat = "%-53s !!! EXPIRED !!! %s\n";
- private final static String permFormat = " %-30s %-30s %-15s\n";
+ private static final String roleFormat = "%-56s Expires %s\n";
+ private static final String roleFormatNoDate = "%-61s\n";
+ private static final String roleExpiredFormat = "%-53s !!! EXPIRED !!! %s\n";
+ private static final String permFormat = " %-30s %-30s %-15s\n";
+
-
private static final Comparator<aaf.v2_0.Role> roleCompare = new Comparator<aaf.v2_0.Role>() {
@Override
public int compare(aaf.v2_0.Role a, aaf.v2_0.Role b) {
public void report(Roles roles, Perms perms, UserRoles urs, String ... str) {
reportHead(str);
XMLGregorianCalendar now = Chrono.timeStamp().normalize();
- if(roles==null || roles.getRole().isEmpty()) {
+ if (roles==null || roles.getRole().isEmpty()) {
pw().println("<No Roles Found>");
} else if (aafcli.isDetailed()){
- if (aafcli.isDetailed() && str[0].toLowerCase().contains(LIST_ROLES_BY_NAME)) {
+ if (str[0].toLowerCase().contains(LIST_ROLES_BY_NAME)) {
String description = roles.getRole().get(0).getDescription();
- if (description == null) description = "";
+ if (description == null) {
+ description = "";
+ }
reportColHead("%-80s\n","Description: " + description);
- }
+ }
String fullFormat = roleFormat+permFormat;
reportColHead(fullFormat,"[ROLE NS].Name","","[PERM NS].Type","Instance","Action");
Collections.sort(roles.getRole(),roleCompare);
- for(aaf.v2_0.Role r : roles.getRole()) {
+ for (aaf.v2_0.Role r : roles.getRole()) {
String roleName = r.getName();
String ns = r.getNs();
- if(aafcli.isTest()) {
- if(ns==null) {
+ if (aafcli.isTest()) {
+ if (ns==null) {
pw().format(roleFormat, roleName,XXXX_XX_XX);
} else {
pw().format(roleFormat, "["+ns+"]"+roleName.substring(ns.length()),XXXX_XX_XX);
}
} else {
- UserRole ur = get(roleName,urs);
- if(ur!=null && now.compare(ur.getExpires().normalize())>0) {
- if(ns==null) {
+ String fullname;
+ if(ns==null) {
+ fullname = roleName;
+ } else {
+ fullname = ns+'.'+roleName;
+ }
+ UserRole ur = get(fullname,urs);
+ if (ur!=null && now.compare(ur.getExpires().normalize())>0) {
+ if (ns==null) {
pw().format(roleExpiredFormat, roleName,Chrono.dateOnlyStamp(ur.getExpires()));
} else {
- pw().format(roleExpiredFormat, "["+ns+"]"+roleName.substring(ns.length()),Chrono.dateOnlyStamp(ur.getExpires()));
+ pw().format(roleExpiredFormat, "["+ns+"]."+roleName,Chrono.dateOnlyStamp(ur.getExpires()));
}
} else {
- if(ns==null) {
+ if (ns==null) {
pw().format(roleFormat, roleName,ur!=null?Chrono.dateOnlyStamp(ur.getExpires()):"");
} else {
- pw().format(roleFormat, "["+ns+"]"+roleName.substring(ns.length()),ur!=null?Chrono.dateOnlyStamp(ur.getExpires()):"");
+ pw().format(roleFormat, "["+ns+"]."+roleName,ur!=null?Chrono.dateOnlyStamp(ur.getExpires()):"");
}
}
}
- for(Pkey pkey : r.getPerms()) {
+ for (Pkey pkey : r.getPerms()) {
Perm perm = get(pkey,perms);
- if(perm==null || perm.getNs()==null) {
- pw().format(permFormat,
+ if (perm==null || perm.getNs()==null) {
+ pw().format(permFormat,
pkey.getType(),
pkey.getInstance(),
pkey.getAction());
} else {
String ns1 = perm.getNs();
- pw().format(permFormat,
+ pw().format(permFormat,
'['+ns1+"]"+perm.getType().substring(ns1.length()),
perm.getInstance(),
perm.getAction());
String fullFormat = roleFormat;
reportColHead(fullFormat,"ROLE Name","","PERM Type","Instance","Action");
Collections.sort(roles.getRole(),roleCompare);
- for(aaf.v2_0.Role r : roles.getRole()) {
+ for (aaf.v2_0.Role r : roles.getRole()) {
if (urs != null) {
String roleName = r.getName();
- if(!aafcli.isTest()) {
+ if (!aafcli.isTest()) {
UserRole ur = get(roleName,urs);
- if(ur!=null && now.compare(ur.getExpires().normalize())>0) {
+ if (ur!=null && now.compare(ur.getExpires().normalize())>0) {
pw().format(roleExpiredFormat, roleName+"*",Chrono.dateOnlyStamp(ur.getExpires()));
} else {
pw().format(roleFormat, roleName,ur!=null?Chrono.dateOnlyStamp(ur.getExpires()):"");
}
} else {
pw().format(roleFormatNoDate, r.getName());
- for(Pkey perm : r.getPerms()) {
- pw().format(permFormat,
+ for (Pkey perm : r.getPerms()) {
+ pw().format(permFormat,
perm.getType(),
perm.getInstance(),
perm.getAction());
}
}
private Perm get(Pkey pkey, Perms perms) {
- if(perms!=null) {
- for(Perm p : perms.getPerm()) {
- if(pkey.getAction().equals(p.getAction()) &&
+ if (perms!=null) {
+ for (Perm p : perms.getPerm()) {
+ if (pkey.getAction().equals(p.getAction()) &&
pkey.getInstance().equals(p.getInstance()) &&
pkey.getType().equals(p.getType())) {
return p;
}
// The assumption is that these UserRoles are already pulled in by User... no need to check
private UserRole get(String roleName, UserRoles urs) {
- if(urs!=null) {
- for(UserRole ur : urs.getUserRole()) {
- if(roleName.equals(ur.getRole())) {
+ if (urs!=null) {
+ for (UserRole ur : urs.getUserRole()) {
+ if (roleName.equals(ur.getRole())) {
return ur;
}
}