aafcli= new AAFcli(gui.access,gui.env, pw,
aafcon.hman(),
aafcon.securityInfo(),
- new HTransferSS(p,AAF_GUI.app,
+ new HTransferSS(p,AAF_GUI.APP,
aafcon.securityInfo()));
aafcli.verbose(false);
aafcli.gui(true);
public static final String AAF_GUI_COPYRIGHT = "aaf_gui_copyright";
public static final String HTTP_SERVLET_REQUEST = "HTTP_SERVLET_REQUEST";
public static final int TIMEOUT = 60000;
- public static final String app = "AAF GUI";
+ public static final String APP = "AAF GUI";
// AAF API
public final AAFConHttp aafCon;
public final AAFLurPerm lur;
- public final Slot slot_httpServletRequest;
+ public final Slot slotHttpServletRequest;
protected final String deployedVersion;
private StaticSlot sThemeWebPath;
private StaticSlot sDefaultTheme;
env.put(sThemeWebPath,"theme");
}
- slot_httpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
+ slotHttpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
deployedVersion = app_version;
// Certificate Manager
- String aaf_url_cm = env.getProperty(Config.AAF_URL_CM,Config.AAF_URL_CM_DEF);
- cmCon = new AAFConHttp(env.access(),aaf_url_cm);
+ String aafUrlCm = env.getProperty(Config.AAF_URL_CM,Config.AAF_URL_CM_DEF);
+ cmCon = new AAFConHttp(env.access(),aafUrlCm);
artifactsDF = env.newDataFactory(Artifacts.class);
certInfoDF = env.newDataFactory(CertInfo.class);
// WebContent Handler
///////////////////////
CachingFileAccess<AuthzTrans> cfa = new CachingFileAccess<AuthzTrans>(env);
- //route(env,GET,"/"+env.get(sThemeWebPath)+"/:key*", cfa);
route(env,GET,"/theme/:key*", cfa);
///////////////////////
aafCon = aafCon();
}
public<RET> RET cmClientAsUser(TaggedPrincipal p,Retryable<RET> retryable) throws APIException, LocatorException, CadiException {
- return cmCon.hman().best(new HTransferSS(p,app, aafCon.securityInfo()), retryable);
+ return cmCon.hman().best(new HTransferSS(p, APP, aafCon.securityInfo()), retryable);
}
@Override
cache.dynamic(hgen, new DynamicCode<HTMLGen, AAF_GUI, TransStore>() {
@Override
public void code(AAF_GUI gui, TransStore trans, final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
- HttpServletRequest req = trans.get(gui.slot_httpServletRequest, null);
+ HttpServletRequest req = trans.get(gui.slotHttpServletRequest, null);
StringBuilder key = new StringBuilder();
- String value, hidden;
+ String value;
+ String hidden;
for (Page p : breadcrumbs) {
hidden="";
// Add keys for page from commandline, where possible.
public interface ContentCode extends Code<HTMLGen> {
public String[] idattrs();
public void addAttr(boolean first, String attr);
- public boolean no_cache();
-}
+ public boolean noCache();
+}
\ No newline at end of file
import org.onap.aaf.misc.xgen.html.HTMLGen;
public class Controls extends NamedCode {
+ public static final String INPUT = "input";
public Controls() {
super(false,"controls");
}
@Override
public void code(final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
hgen.incr("form","method=post")
- .incr("input", true, "type=checkbox", "name=vehicle", "value=Bike").text("I have a bike").end()
+ .incr(INPUT, true, "type=checkbox", "name=vehicle", "value=Bike").text("I have a bike").end()
.text("Password: ")
- .incr("input", true, "type=password", "id=password1").end()
- .tagOnly("input", "type=submit", "value=Submit")
+ .incr(INPUT, true, "type=password", "id=password1").end()
+ .tagOnly(INPUT, "type=submit", "value=Submit")
.end();
}
new HttpCode<AuthzTrans,AAF_GUI>(gui,page.name()) {
@Override
public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- trans.put(gui.slot_httpServletRequest, req);
+ trans.put(gui.slotHttpServletRequest, req);
for (int i=0; i<fields.length;++i) {
int idx = fields[i].indexOf("[]");
if (idx<0) { // single value
} else {
// Transfer whether Page shouldn't be cached to local Final var.
- final boolean no_cache = page.no_cache;
+ final boolean noCache = page.noCache;
gui.route(gui.env, meth, page.url(),
new HttpCode<AuthzTrans,AAF_GUI>(gui,page.name()) {
@Override
public void handle(AuthzTrans trans, HttpServletRequest req, HttpServletResponse resp) throws Exception {
- trans.put(gui.slot_httpServletRequest, req);
+ trans.put(gui.slotHttpServletRequest, req);
for (int i=0; i<slots.length;++i) {
int idx = fields[i].indexOf("[]");
if (idx<0) { // single value
@Override
public boolean no_cache() {
- return no_cache;
+ return noCache;
}
}, "text/html","*/*");
}
private String preamble;
private NamedCode content;
- public Form(boolean no_cache, NamedCode content) {
- super(no_cache,content);
+ public Form(boolean noCache, NamedCode content) {
+ super(noCache,content);
this.content = content;
preamble=null;
}
package org.onap.aaf.auth.gui;
public abstract class NamedCode implements ContentCode {
- private final boolean no_cache;
+ private final boolean noCache;
private String name;
private String[] idattrs;
/*
* Mark whether this code should not be cached, and any attributes
*/
- public NamedCode(final boolean no_cache, final String name) {
+ public NamedCode(final boolean noCache, final String name) {
this.name = name;
idattrs = new String[] {name};
- this.no_cache = no_cache;
+ this.noCache = noCache;
}
- public NamedCode(boolean no_cache, NamedCode content) {
- this.no_cache = no_cache;
+ public NamedCode(boolean noCache, NamedCode content) {
+ this.noCache = noCache;
name=content.name;
idattrs = content.idattrs;
}
idattrs = temp;
}
- public boolean no_cache() {
- return no_cache;
+ public boolean noCache() {
+ return noCache;
}
}
public static final String AAF_URL_CADI_HELP = "aaf_url.cadi_help";
public static final String PERM_CA_TYPE = "certman";
public static final String PERM_NS = Define.ROOT_NS();
+ public static final String HREF = "href=";
+ public static final String TARGET_BLANK = "target=_blank";
- public static enum BROWSER {iPhone,html5,ie,ieOld};
+ public enum BROWSER {IPHONE, HTML5, IE, IEOLD};
public static final int MAX_LINE = 20;
protected static final String[] NO_FIELDS = new String[0];
private static final String BROWSER_TYPE = "BROWSER_TYPE";
- private final String bcName, bcUrl;
+ private final String bcName;
+ private final String bcUrl;
private final String[] fields;
- public final boolean no_cache;
+ public final boolean noCache;
// Note: Only access is synchronized in "getPerm"
- private final static Map<String,Map<String,Permission>> perms = new HashMap<>();
+ private static final Map<String,Map<String,Permission>> perms = new HashMap<>();
/*
* Relative path, Menu Name, Full Path
{"ns","My Namespaces","/gui/ns"},
{"approve","My Approvals","/gui/approve"},
{"myrequests","My Pending Requests","/gui/myrequests"},
- // Enable later
- // {"onboard","Onboarding"},
+ // Enable later
+ //{"onboard","Onboarding"},
{"passwd","Password Management","/gui/passwd"},
{"cui","Command Prompt","/gui/cui"},
{"api","AAF API","/gui/api"},
bcName = name;
bcUrl = url;
// Mark which fields must be "no_cache"
- boolean no_cacheTemp=false;
+ boolean noCacheTemp=false;
for (NamedCode nc : content) {
- if (nc.no_cache()) {
- no_cacheTemp=true;
+ if (nc.noCache()) {
+ noCacheTemp=true;
break;
}
}
- no_cache=no_cacheTemp;
+ noCache =noCacheTemp;
}
public Page(AuthzEnv env, String name, String url, String [] fields, final NamedCode ... content) throws APIException,IOException {
this(env,name,url,1,fields,content);
bcName = name;
bcUrl = url;
// Mark which fields must be "no_cache"
- boolean no_cacheTemp=false;
+ boolean noCacheTemp=false;
for (NamedCode nc : content) {
- if (nc.no_cache()) {
- no_cacheTemp=true;
+ if (nc.noCache()) {
+ noCacheTemp=true;
break;
}
}
- no_cache=no_cacheTemp;
+ noCache =noCacheTemp;
}
imp.js(prefix + f);
} else if(f.endsWith(".css")) {
if(f.endsWith("iPhone.css")) {
- if(BROWSER.iPhone.equals(browser)) {
+ if(BROWSER.IPHONE.equals(browser)) {
imp.css(prefix + f);
}
} else if (f.endsWith("Desktop.css")){
- if(!BROWSER.iPhone.equals(browser)) {
+ if(!BROWSER.IPHONE.equals(browser)) {
imp.css(prefix + f);
}
// Make Console specific to Console page
@Override
public void code(AAF_GUI state, AuthzTrans trans, final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
switch(browser(trans,browserSlot)) {
- case ieOld:
- case ie:
+ case IEOLD:
+ case IE:
hgen.directive("!DOCTYPE html");
hgen.directive("meta", "http-equiv=X-UA-Compatible","content=IE=11");
default:
hgen.imports(getImports(env,theme,backdots,browser));
switch(browser) {
- case ie:
- case ieOld:
+ case IE:
+ case IEOLD:
hgen.js().text("document.createElement('header');")
.text("document.createElement('nav');")
.done();
// Obtain User Info, and print
TaggedPrincipal p = trans.getUserPrincipal();
- String user,secured;
+ String user;
+ String secured;
if (p==null) {
user = "please choose a Login Authority";
secured = "NOT Secure!";
.text("</sup>").end();
switch(browser(trans,browserSlot)) {
- case ieOld:
- case ie:
+ case IEOLD:
+ case IE:
xgen.incr("h5").text("This app is Mobile First HTML5. Internet Explorer "
+ " does not support all HTML5 standards. Old, non TSS-Standard versions may not function correctly.").br()
.text(" For best results, use a highly compliant HTML5 browser like Firefox.")
props = themeProps==null?null:themeProps.get(theme);
}
- if(props!=null) {
- if("TRUE".equalsIgnoreCase(props.getProperty("main_menu_in_nav"))) {
+ if((props!=null) && ("TRUE".equalsIgnoreCase(props.getProperty("main_menu_in_nav")))) {
xgen.incr("h2").text("Navigation").end();
Mark mark = new Mark();
boolean selected = isSelected(trans.path(),Home.HREF);
- //trans.path().endsWith("home");
xgen.incr(mark,HTMLGen.UL)
.incr(HTMLGen.LI,selected?"class=selected":"")
.incr(HTMLGen.A, "href=home")
.end(2);
boolean noSelection = !selected;
for(String[] mi : MENU_ITEMS) {
- //selected = trans.path().endsWith(mi[0]);
if(noSelection) {
selected = isSelected(trans.path(),mi[2]);
noSelection = !selected;
selected = false;
}
xgen.incr(HTMLGen.LI,selected?"class=selected":"")
- .incr(HTMLGen.A, "href="+mi[2])
+ .incr(HTMLGen.A, HREF+mi[2])
.text(mi[1])
.end(2);
}
xgen.end(mark);
- }
}
}
});
hgen.incr("h2").text("Related Links").end();
hgen.incr(UL);
- String aaf_help = env.getProperty(AAF_URL_AAF_HELP,null);
- if (aaf_help!=null) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_AAF_HELP),"target=_blank").text("AAF WIKI").end(2);
+ String aafHelp = env.getProperty(AAF_URL_AAF_HELP,null);
+ if (aafHelp!=null) {
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_AAF_HELP),TARGET_BLANK).text("AAF WIKI").end(2);
String sub = env.getProperty(AAF_URL_AAF_HELP+".sub");
if (sub!=null) {
hgen.incr(UL,"style=margin-left:5%");
for (String s : Split.splitTrim(',', sub)) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_AAF_HELP+".sub."+s),"target=_blank").text(s.replace('+', ' ')).end(2);
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_AAF_HELP+".sub."+s),TARGET_BLANK).text(s.replace('+', ' ')).end(2);
}
hgen.end();
}
}
- aaf_help = env.getProperty(AAF_URL_CADI_HELP,null);
- if (aaf_help!=null) {
- hgen.leaf(LI).leaf(A,"href="+aaf_help,"target=_blank").text("CADI WIKI").end(2);
+ aafHelp = env.getProperty(AAF_URL_CADI_HELP,null);
+ if (aafHelp!=null) {
+ hgen.leaf(LI).leaf(A,HREF+aafHelp,TARGET_BLANK).text("CADI WIKI").end(2);
}
String tools = env.getProperty(AAFURL_TOOLS);
if (tools!=null) {
.leaf(HTMLGen.H3).text("Related Tools").end();
for (String tool : Split.splitTrim(',',tools)) {
- hgen.leaf(LI).leaf(A,"href="+env.getProperty(AAF_URL_TOOL_DOT+tool),"target=_blank").text(tool.replace('+', ' ')).end(2);
+ hgen.leaf(LI).leaf(A,HREF+env.getProperty(AAF_URL_TOOL_DOT+tool),TARGET_BLANK).text(tool.replace('+', ' ')).end(2);
}
hgen.end();
}
String agent = trans.agent();
int msie;
if (agent.contains("iPhone") /* other phones? */) {
- br=BROWSER.iPhone;
+ br=BROWSER.IPHONE;
} else if ((msie = agent.indexOf("MSIE"))>=0) {
msie+=5;
- int end = agent.indexOf(";",msie);
+ int end = agent.indexOf(';',msie);
float ver;
try {
ver = Float.valueOf(agent.substring(msie,end));
- br = ver<8f?BROWSER.ieOld:BROWSER.ie;
+ br = ver<8f?BROWSER.IEOLD :BROWSER.IE;
} catch (Exception e) {
- br = BROWSER.ie;
+ br = BROWSER.IE;
}
} else {
- br = BROWSER.html5;
+ br = BROWSER.HTML5;
}
trans.put(slot,br);
}
}
protected static String getSingleParam(HttpServletRequest req, String tag) {
- String values[] = req.getParameterValues(tag);
+ String[] values = req.getParameterValues(tag);
return values.length<1?null:values[0];
}
cache.dynamic(hgen, new DynamicCode<HTMLGen, AAF_GUI, AuthzTrans>() {
@Override
public void code(AAF_GUI authGUI, AuthzTrans trans, Cache<HTMLGen> cache, HTMLGen xgen) throws APIException, IOException {
- HttpServletRequest req = trans.get(gui.slot_httpServletRequest, null);
+ HttpServletRequest req = trans.get(gui.slotHttpServletRequest, null);
if (req!=null) {
String query = req.getQueryString();
if (query!=null) {
xgen.leaf(HTMLGen.A, "href=gui/home?Authentication=BasicAuth").text("AAF Basic Auth").end();
}
});
-// hgen.leaf("a", "href=#","onclick=divVisibility('cso');").text("Global Login").end()
-// .incr("p", "id=cso","style=display:none").text("this will redirect to global login").end()
-// .leaf("a", "href=#","onclick=divVisibility('tguard');").text("tGuard").end()
-// .incr("p", "id=tguard","style=display:none").text("this will redirect to tGuard login").end()
-// hgen.leaf("a", "href=#","onclick=divVisibility('basicauth');").text("AAF Basic Auth").end();
hgen.end(loginPaths);
-
-// hgen.incr("form","method=post","style=display:none","id=basicauth","gui/home?Authentication=BasicAuth");
-// Mark table = new Mark(TABLE);
-// hgen.incr(table);
-// cache.dynamic(hgen, new DynamicCode<HTMLGen, AuthGUI, AuthzTrans>() {
-// @Override
-// public void code(final AuthGUI gui, final AuthzTrans trans, final Cache<HTMLGen> cache, final HTMLGen hgen)
-// throws APIException, IOException {
-// hgen
-// .input(fields[0],"Username",true)
-// .input(fields[1],"Password",true, "type=password");
-// Mark selectRow = new Mark();
-// hgen
-// .incr(selectRow, "tr")
-// .incr("td")
-// .incr("label", "for=envs", "required").text("Environment").end()
-// .end()
-// .incr("td")
-// .incr("select", "name=envs", "id=envs", "required")
-// .incr("option", "value=").text("Select Environment").end();
-// for (String env : envs) {
-// hgen.incr("option", "value="+env).text(env).end();
-// }
-// hgen
-// .end(selectRow)
-
-// hgen.end();
-// }
-// });
-// hgen.end();
-// hgen.tagOnly("input", "type=submit", "value=Submit")
-// .tagOnly("input", "type=reset", "value=Reset")
-// .end();
-
-
}
});
}
} else {
if (!(trans.user().equals(app.getUser()) ||
trans.user().equals(app.getApprover()))) {
- HttpServletRequest req = trans.get(gui.slot_httpServletRequest,null);
+ HttpServletRequest req = trans.get(gui.slotHttpServletRequest,null);
if(req==null || !req.isUserInRole(Define.ROOT_NS()+"|access|*|*")) {
return Cells.EMPTY;
}
public class WebCommand extends Page {
public static final String HREF = "/gui/cui";
+ public static final String INPUT = "input";
+ public static final String TYPE_BUTTON = "type=button";
public WebCommand(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException {
super(gui.env, "Web Command Client",HREF, NO_FIELDS,
@Override
public void code(AAF_GUI state, AuthzTrans trans, Cache<HTMLGen> cache, HTMLGen xgen)
throws APIException, IOException {
- String image_root = "src=../../"+state.env.get(sThemeWebPath).toString() + '/' + state.env.get(sTheme) + "/images/icons";
- hgen.img(image_root + "/options_down.png", "onclick=handleDivHiding('options',this);",
+ String imageRoot = "src=../../"+state.env.get(sThemeWebPath).toString() + '/' + state.env.get(sTheme) + "/images/icons";
+ hgen.img(imageRoot + "/options_down.png", "onclick=handleDivHiding('options',this);",
"id=options_img", "alt=Options", "title=Options")
.end(); //options_link
hgen.divID("options");
switch(browser(trans,trans.env().slot(getBrowserType()))) {
- case ie:
- case ieOld:
+ case IE:
+ case IEOLD:
// IE doesn't support file save
break;
default:
- xgen.img(image_root+"/AAF_download.png", "onclick=saveToFile();",
+ xgen.img(imageRoot+"/AAF_download.png", "onclick=saveToFile();",
"alt=Save log to file", "title=Save log to file");
}
-// xgen.img("src=../../"+gui.theme+"/AAF_email.png", "onclick=emailLog();",
-// "alt=Email log to me", "title=Email log to me");
- xgen.img(image_root+"/AAF_font_size.png", "onclick=handleDivHiding('text_slider',this);",
+ xgen.img(imageRoot+"/AAF_font_size.png", "onclick=handleDivHiding('text_slider',this);",
"id=fontsize_img", "alt=Change text size", "title=Change text size");
- xgen.img(image_root+"/AAF_details.png", "onclick=selectOption(this,0);",
+ xgen.img(imageRoot+"/AAF_details.png", "onclick=selectOption(this,0);",
"id=details_img", "alt=Turn on/off details mode", "title=Turn on/off details mode");
- xgen.img(image_root+"/AAF_maximize.png", "onclick=maximizeConsole(this);",
+ xgen.img(imageRoot+"/AAF_maximize.png", "onclick=maximizeConsole(this);",
"id=maximize_img", "alt=Maximize Console Window", "title=Maximize Console Window");
}
});
hgen.divID("text_slider");
- hgen.tagOnly("input", "type=button", "class=change_font", "onclick=buttonChangeFontSize('dec')", "value=-")
- .tagOnly("input", "id=text_size_slider", "type=range", "min=75", "max=200", "value=100",
+ hgen.tagOnly(INPUT, TYPE_BUTTON, "class=change_font", "onclick=buttonChangeFontSize('dec')", "value=-")
+ .tagOnly(INPUT, "id=text_size_slider", "type=range", "min=75", "max=200", "value=100",
"oninput=changeFontSize(this.value)", "onchange=changeFontSize(this.value)", "title=Change Text Size")
- .tagOnly("input", "type=button", "class=change_font", "onclick=buttonChangeFontSize('inc')", "value=+")
+ .tagOnly(INPUT, TYPE_BUTTON, "class=change_font", "onclick=buttonChangeFontSize('inc')", "value=+")
.end(); //text_slider
hgen.end(); //options
hgen.end(); //console_and_options
hgen.divID("input_area");
- hgen.tagOnly("input", "type=text", "id=command_field",
+ hgen.tagOnly(INPUT, "type=text", "id=command_field",
"autocomplete=off", "autocorrect=off", "autocapitalize=off", "spellcheck=false",
"onkeypress=keyPressed()", "placeholder=Type your AAFCLI commands here", "autofocus")
- .tagOnly("input", "id=submit", "type=button", "value=Submit",
+ .tagOnly(INPUT, "id=submit", TYPE_BUTTON, "value=Submit",
"onclick=http('put','../../gui/cui',getCommand(),callCUI);")
.end();
Code Review / aaf / authz.git / commitdiff