diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-07-19 13:29:32 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-07-19 13:29:44 -0500 |
| commit | 32cdd553a8668e6d03a9cf5b11b360d35a63c87f (patch) | |
| tree | 48c02e4be820d87efb777d7be20bad57d517b61c /auth/auth-gui/src/main/java | |
| parent | 9c8a8b0926b13b07fb1e5394903401e7a3f1ff79 (diff) | |
Configuration and Auto-Certificates
Issue-ID: AAF-378
Change-Id: Ic820a4e43684a6130f00b28b415a974876099fc3
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-gui/src/main/java')
3 files changed, 10 insertions, 8 deletions
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java index 346c8ae2..eb34a62c 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java @@ -67,7 +67,8 @@ public class Page extends HTMLCacheGen { public static final String AAF_URL_GUI_ONBOARD = "aaf_url.gui_onboard"; public static final String AAF_URL_AAF_HELP = "aaf_url.aaf_help"; public static final String AAF_URL_CADI_HELP = "aaf_url.cadi_help"; - public static final String PERM_CA_TYPE = Define.ROOT_NS() + ".ca"; + public static final String PERM_CA_TYPE = "certman"; + public static final String PERM_NS = Define.ROOT_NS(); public static enum BROWSER {iPhone,html5,ie,ieOld}; @@ -386,7 +387,7 @@ public class Page extends HTMLCacheGen { p = msp.get(instance); } if(p==null) { - p=new AAFPermission(PERM_CA_TYPE,instance,action); + p=new AAFPermission(PERM_NS, PERM_CA_TYPE,instance,action); msp.put(action, p); } return p; diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java index 7cd79dab..a96b08b9 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java @@ -201,11 +201,11 @@ public class CMArtiChangeForm extends Page { } hgen.text("IPs allowed, separated by commas.").end() - .input(fields[11], "SANs", false, "value="+(sb==null?"":sb.toString()),"style=width:180%;"); + .input(fields[11], "SANs", false, "value="+(sb==null?"":sb.toString()),"style=width:130%;"); // } - hgen.input(fields[2],"Namespace",true,"value="+arti.getNs(),"style=width:180%;") - .input(fields[3],"Directory", true, "value="+arti.getDir(),"style=width:180%;") - .input(fields[4],"Certificate Authority",true,"value="+arti.getCa(),"style=width:180%;") + hgen.input(fields[2],"Namespace",true,"value="+arti.getNs(),"style=width:130%;") + .input(fields[3],"Directory", true, "value="+arti.getDir(),"style=width:130%;") + .input(fields[4],"Certificate Authority",true,"value="+arti.getCa(),"style=width:130%;") .input(fields[5],"O/S User",true,"value="+arti.getOsUser()) .input(fields[6],"Renewal Days before Expiration", true, "value="+arti.getRenewDays(),"style=width:20%;") .input(fields[7],"Notification",true,"value="+arti.getNotification()) diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java index a39bf822..d7b0da0f 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleDetail.java @@ -87,6 +87,7 @@ public class RoleDetail extends Page { * */ private static class Model extends TableData<AAF_GUI,AuthzTrans> { + private static final String ACCESS = "access"; private Slot sRoleName,sRole,sUserRole,sMayWrite,sMayApprove,sMark,sNS; public Model(AuthzEnv env) { sRoleName = env.slot(NAME+".role"); @@ -125,9 +126,9 @@ public class RoleDetail extends Page { if(!roles.isEmpty()) { Role role = fr.value.getRole().get(0); trans.put(sRole, role); - Boolean mayWrite = trans.fish(new AAFPermission(role.getNs()+".access",":role:"+role.getName(),"write")); + Boolean mayWrite = trans.fish(new AAFPermission(role.getNs(),ACCESS,":role:"+role.getName(),"write")); trans.put(sMayWrite,mayWrite); - Boolean mayApprove = trans.fish(new AAFPermission(role.getNs()+".access",":role:"+role.getName(),"approve")); + Boolean mayApprove = trans.fish(new AAFPermission(role.getNs(),ACCESS,":role:"+role.getName(),"approve")); trans.put(sMayApprove, mayApprove); if(mayWrite || mayApprove) { |