diff options
Diffstat (limited to 'auth/auth-gui')
4 files changed, 17 insertions, 24 deletions
diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 6b02437e..dde1a5d8 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -117,8 +117,9 @@ <mainClass>org.onap.aaf.auth.gui.AAF_GUI</mainClass> <name>gui</name> <commandLineArguments> - <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.gui.props</commandLineArgument> + <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.aaf.gui.props</commandLineArgument> <commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/gui</commandLineArgument> + <commandLineArgument>cadi_etc_dir=${project.ext_root_dir}/etc</commandLineArgument> </commandLineArguments> <jvmSettings> <extraArguments> 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 c65e7db5..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 @@ -61,7 +61,7 @@ public class CMArtiChangeForm extends Page { static final String NAME = "ArtifactChange"; static final String fields[] = {"id","machine","ns","directory","ca","osuser","renewal","notify","cmd","others","types[]","sans"}; - static final String types[] = {"jks","file","script"}; + static final String types[] = {"pkcs12","jks","file","script"}; static final String UPDATE = "Update"; static final String CREATE = "Create"; static final String COPY = "Copy"; @@ -169,7 +169,7 @@ public class CMArtiChangeForm extends Page { arti.setRenewDays(30); arti.setNotification("mailto:"+user.email()); arti.getType().add(types[0]); - arti.getType().add(types[2]); + arti.getType().add(types[3]); submitText = CREATE; delete = false; } else { @@ -179,24 +179,14 @@ public class CMArtiChangeForm extends Page { arti.setNotification("mailto:"+user.email()); } } - // CSO Approval no longer required for SAN use -// final String mechID = arti.getMechid(); -// boolean maySans=gui.lur.fish(new Principal() { -// @Override -// public String getName() { -// return mechID; -// }},getPerm(arti.getCa(),"san")); -// if(!maySans) { -// arti.getSans().clear(); -// } Mark table = new Mark(TABLE); hgen.incr(table) - .input(fields[0],"MechID*",true,"value="+arti.getMechid()) + .input(fields[0],"AppID*",true,"value="+arti.getMechid()) .input("sponsor", "Sponsor",false,"value="+arti.getSponsor(),"readonly","style=border:none;background-color:white;") - .input(fields[1],"Machine*",true,"value="+arti.getMachine(),"style=width:130%;"); + .input(fields[1],"FQDN*",true,"value="+arti.getMachine(),"style=width:130%;"); // if(maySans) { hgen.incr(HTMLGen.TR).incr(HTMLGen.TD).end() - .incr(HTMLGen.TD,"class=subtext").text("Use full machine names, "); + .incr(HTMLGen.TD,"class=subtext").text("Use Fully Qualified Domain Names (that will be in DNS), "); if(!trans.fish(getPerm(arti.getCa(),"ip"))) { hgen.text("NO "); } @@ -211,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) { |