try {
hostname = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
- e.printStackTrace();
- env.warn().log("Unable to get hostname");
+ env.warn().log("Unable to get hostname : "+e.getMessage());
return (0);
}
if(cluster!=null && !cluster.isClosed()) {
cluster.close();
}
- e.printStackTrace(System.err);
+ env.warn().log(System.err);
}
}
}
public static void batchDelete(StringBuilder sb, List<String> row) {
- Long l = Long.parseLong(row.get(5));
+ long l = Long.parseLong(row.get(5));
String date = Chrono.batchFmt.format(new Date(l));
sb.append("DELETE from authz.cred WHERE id='");
sb.append(row.get(1));
sb.append(" AND expires='");
sb.append(date);
sb.append("';\n");
-// sb.append(" AND expires=dateof(maxtimeuuid(");
-// sb.append(row.get(5));
-// sb.append("));\n");
}
lcred.add(new Range(TWO_MONTH,1,-1,-1,GregorianCalendar.MONTH,1,GregorianCalendar.MONTH,2));
lur.add( new Range(ONE_MONTH,1,-1,-1,0,0,GregorianCalendar.MONTH,1));
- // Comment out until we can get some more clear actions in place for GUI
- // lur.add( new Range(ONE_MONTH,1,-1,-1,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
- // lur.add( new Range(ONE_WEEK,2,-1,1,0,0,GregorianCalendar.WEEK_OF_MONTH,1));
-
lx509.add(new Range(ONE_MONTH,1,-1,-1,GregorianCalendar.WEEK_OF_MONTH,2,GregorianCalendar.MONTH,1));
}
}
if(row.size()>3) {
escalation = Integer.parseInt(row.get(3));
}
- return;
} else if(type.equals(row.get(0))) {
String user = user(row);
if(user!=null) {
String path = pkg.getName().replace('.', '/');
URL url = cl.getResource(path);
List<String> classNames = new ArrayList<>();
- String urlString = url.toString();
- if(urlString.startsWith("jar:file:")) {
- int exclam = urlString.lastIndexOf('!');
- JarFile jf = new JarFile(urlString.substring(9,exclam));
- try {
- Enumeration<JarEntry> jfe = jf.entries();
- while(jfe.hasMoreElements()) {
- String name = jfe.nextElement().getName();
- if(name.startsWith(path) && name.endsWith(".class")) {
- classNames.add(name.substring(0,name.length()-6).replace('/', '.'));
+ String urlString;
+ if (url != null) {
+ urlString = url.toString();
+ if (urlString.startsWith("jar:file:")) {
+ int exclam = urlString.lastIndexOf('!');
+ JarFile jf = new JarFile(urlString.substring(9, exclam));
+ try {
+ Enumeration<JarEntry> jfe = jf.entries();
+ while (jfe.hasMoreElements()) {
+ String name = jfe.nextElement().getName();
+ if (name.startsWith(path) && name.endsWith(".class")) {
+ classNames.add(name.substring(0, name.length() - 6).replace('/', '.'));
+ }
}
+ } finally {
+ jf.close();
}
- } finally {
- jf.close();
- }
- } else {
- File dir = new File(url.getFile());
- for( String f : dir.list()) {
- if(f.endsWith(".class")) {
- classNames.add(pkg.getName() + '.' + f.substring(0,f.length() - 6));
+ } else {
+ File dir = new File(url.getFile());
+ String[] dirs = dir.list();
+ if (dirs != null) {
+ for (String f : dirs) {
+ if (f.endsWith(".class")) {
+ classNames.add(pkg.getName() + '.' + f.substring(0, f.length() - 6));
+ }
+ }
}
}
- }
- for(String cls : classNames) {
- try {
- Class<?> c = cl.loadClass(cls);
- if((c!=null)&&(!Modifier.isAbstract(c.getModifiers()))) {
- Constructor<?> cst = c.getConstructor(Access.class);
- NotifyBody nb = (NotifyBody)cst.newInstance(access);
- if(nb!=null) {
- bodyMap.put("info|" + nb.name, nb);
- bodyMap.put(nb.type+'|' + nb.name, nb);
- }
+ for (String cls : classNames) {
+ try {
+ Class<?> c = cl.loadClass(cls);
+ if ((c != null) && (!Modifier.isAbstract(c.getModifiers()))) {
+ Constructor<?> cst = c.getConstructor(Access.class);
+ NotifyBody nb = (NotifyBody) cst.newInstance(access);
+ bodyMap.put("info|" + nb.name, nb);
+ bodyMap.put(nb.type + '|' + nb.name, nb);
+ }
+ } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ e.printStackTrace();
}
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
- e.printStackTrace();
}
}
}
remove.add(new File(logDir, args()[i]));
}
} else {
- remove.add(new File(logDir,"Delete"+Chrono.dateOnlyStamp()+".csv"));
+ final String ending = Chrono.dateOnlyStamp()+".csv";
+ for (File file : logDir.listFiles(f -> {
+ String name = f.getName();
+ return name.endsWith(ending) && (
+ name.startsWith("Delete") || name.startsWith("Clean."));
+ })) {
+ remove.add(file);
+ };
}
for(File f : remove) {
public Result<List<Data>> readNS(AuthzTrans trans, final String ns) {
DAOGetter getter = new DAOGetter(trans,dao()) {
+ @Override
public Result<List<Data>> call() {
return dao.readNS(trans, ns);
}
} else {
}
-// if (getter.result==null) {
-// if (lurd==null) {
- return Result.err(Status.ERR_PermissionNotFound,"No Permission found - " + lurd.details);
-// } else {
-// return Result.ok(lurd);
-// }
-// }
-// return getter.result;
+ return Result.err(Status.ERR_PermissionNotFound,"No Permission found - " + lurd.details);
}
public Result<List<Data>> readChildren(AuthzTrans trans, final String ns, final String type) {
*/
public Result<List<Data>> readByType(AuthzTrans trans, final String ns, final String type) {
DAOGetter getter = new DAOGetter(trans,dao()) {
+ @Override
public Result<List<Data>> call() {
return dao.readByType(trans, ns, type);
}
public Result<List<Data>> readNS(AuthzTrans trans, final String ns) {
DAOGetter getter = new DAOGetter(trans,dao()) {
+ @Override
public Result<List<Data>> call() {
return dao.readNS(trans, ns);
}
public Result<List<Data>> readName(AuthzTrans trans, final String name) {
DAOGetter getter = new DAOGetter(trans,dao()) {
+ @Override
public Result<List<Data>> call() {
return dao().readName(trans, name);
}
obj[++idx]=data.target;
obj[++idx]=data.subject;
obj[++idx]=data.memo;
-// obj[++idx]=data.detail;
obj[++idx]=data.reconstruct;
}
};
}
},writeConsistency)
);
-// disable(CRUD.Create);
- replace(CRUD.read, new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] +
+ replace(CRUD.read, new PSInfo(trans, SELECT_SP + helpers[FIELD_COMMAS] +
" FROM history WHERE id = ?", defLoader,readConsistency)
// new HistLoader(2) {
// @Override
private class YYYYMM implements Accept<Data> {
private int[] yyyymm;
- public YYYYMM(int yyyymm[]) {
+ public YYYYMM(int[] yyyymm) {
this.yyyymm = yyyymm;
}
@Override
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications 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.
}
public String toString() {
- return user.toString() + ' ' + id.toString() + ' ' + Chrono.dateTime(expires) + (active?"":"in") + "active";
+ return user + ' ' + id + ' ' + Chrono.dateTime(expires) + (active?"":"in") + "active";
}
}
}
// VALIDATIONS done... Add NS
- if ((rq = q.nsDAO().create(trans, namespace.data())).notOK()) {
+ rq = q.nsDAO().create(trans, namespace.data());
+ if (rq.notOK()) {
return Result.err(rq);
}
public DirectAAFLur(AuthzEnv env, Question question/*, TokenMgr tm*/) {
this.env = env;
- this.question = question;
-// oauth = new OAuth2Lur(null);
+ this.question = question
}
@Override
return true;
} else{
String[] lp = p.getKey().split("\\|");
- if (lp.length<3)return false;
+ if (lp.length<3) {
+ return false;
+ }
if (data.fullType().equals(lp[0]))
if (data.instance!=null && (data.instance.equals(lp[1]) || "*".equals(data.instance)))
if (data.action!=null && (data.action.equals(lp[2]) || "*".equals(data.action)))
new DirectRegistrar(access,locateDAO,port)
};
}
-
+
+ @Override
public void destroy() {
Cache.stopTimer();
locateDAO.close(env.newTransNoAvg());
try {
String[] info = Split.split('/', urlinfo);
Client c = new Client(new URL(JscepCA.CA_PREFIX + info[0] + JscepCA.CA_POSTFIX),
- cert -> {
- //TODO checkIssuer
- return true;
- }
+ cert -> true
);
// Map URL to Client, because Client doesn't expose Connection
mxcwiC.put(c, mxcwiS.get(urlinfo));
public class X509ChainWithIssuer extends X509andChain {
private String issuerDN;
- public X509Certificate caX509;
public X509ChainWithIssuer(X509ChainWithIssuer orig, X509Certificate x509) {
super(x509,orig.trustChain);
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2018 IBM.
+ * Modifications 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.
trans.error().log("CMService var primary is null");
} else {
String fg = fqdns.get(i);
- if (fg!=null && primary!=null && fg.equals(primary.getHostName())) {
- if (i != 0) {
+ if ((fg!=null && primary!=null && fg.equals(primary.getHostName()))&&(i != 0)) {
String tmp = fqdns.get(0);
fqdns.set(0, primary.getHostName());
fqdns.set(i, tmp);
- }
}
}
}
Collection<? extends Certificate> certs = Factory.toX509Certificate(cdd.x509);
for(Iterator<? extends Certificate> iter = certs.iterator(); iter.hasNext();) {
X509Certificate x509 = (X509Certificate)iter.next();
- if(x509.getNotAfter().after(now) && x509.getSubjectDN().getName().contains(cn)) {
- if(++count>max_509s) {
+ if((x509.getNotAfter().after(now) && x509.getSubjectDN().getName().contains(cn))&&(++count>max_509s)) {
break;
- }
- }
+ }
}
}
if(count>max_509s) {
} else if ("set".equalsIgnoreCase(largs[idx])) {
while (largs.length > ++idx) {
int equals = largs[idx].indexOf('=');
- String tag, value;
+ String tag;
+ String value;
if (equals < 0) {
tag = largs[idx];
value = access.getProperty(Config.AAF_APPPASS,null);
while ((line = reader.readLine()) != null) {
showDetails = (line.contains("-d"));
- if (line.equalsIgnoreCase("quit") || line.equalsIgnoreCase("q") || line.equalsIgnoreCase("exit")) {
+ if ("quit".equalsIgnoreCase(line) || "q".equalsIgnoreCase(line) || "exit".equalsIgnoreCase(line)) {
break;
- } else if (line.equalsIgnoreCase("--help -d") || line.equalsIgnoreCase("help -d")
- || line.equalsIgnoreCase("help")) {
+ } else if ("--help -d".equalsIgnoreCase(line) || "help -d".equalsIgnoreCase(line)
+ || "help".equalsIgnoreCase(line)) {
line = "--help";
- } else if (line.equalsIgnoreCase("cls")) {
+ } else if ("cls".equalsIgnoreCase(line)) {
reader.clearScreen();
continue;
- } else if (line.equalsIgnoreCase("?")) {
+ } else if ("?".equalsIgnoreCase(line)) {
keyboardHelp();
continue;
}
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications 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.
public void detailedHelp(int _indent, StringBuilder sb) {
int indent = _indent;
detailLine(sb,indent,"Create a Permission with:");
- detailLine(sb,indent+=2,"type - A Namespace qualified identifier identifying the kind of");
+ indent=indent+2;
+ detailLine(sb,indent,"type - A Namespace qualified identifier identifying the kind of");
detailLine(sb,indent+11,"resource to be protected");
detailLine(sb,indent,"instance - A name that distinguishes a particular instance of resource");
detailLine(sb,indent,"action - What kind of action is allowed");
*/
public class ListApprovals extends Cmd {
private static final String HEADER = "List Approvals";
- private final static String[] options = {"user","approver","ticket"};
+ private static final String[] options = {"user","approver","ticket"};
public ListApprovals(List parent) {
super(parent,"approvals",
new Param(optionsToString(options),true),
package org.onap.aaf.auth.layer;
-public class DirectIntrospectImpl {
+public interface DirectIntrospectImpl {
}
long lhash;
int curr;
while ((max-min)>100) {
- ttok.pos((curr=(min+(max-min)/2))*REC_SIZE);
+ curr=(min+(max-min)/2);
+ ttok.pos(curr*REC_SIZE);
tib.rewind();
lhash = hashToLong(tib.get());
if (lhash<hash) {
content.add(code, others);
}
- public HttpCode<TRANS,?> getCode(TRANS trans, HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
+ public HttpCode<TRANS,?> getCode(TRANS trans, HttpServletRequest req, HttpServletResponse resp) {
// Type is associated with Accept for GET (since it is what is being returned
// We associate the rest with ContentType.
// FYI, thought about this a long time before implementing this way.
package org.onap.aaf.auth.rserv;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import javax.servlet.ServletException;
+
import org.onap.aaf.misc.env.Env;
import org.onap.aaf.misc.env.TimeTaken;
private final String[] columns;
private final Rows rows;
private Code<HTMLGen> other;
-// private DynamicCode<HTMLGen, AuthGUI, AuthzTrans> prefix,postfix;
+
public Table(String title, TRANS trans, Data<S,TRANS> data, Code<HTMLGen> other, String name, String ... attrs) {
this(title,trans,data,name, attrs);
public Table(String title, TRANS trans, Data<S,TRANS> data, String name, String ... attrs) {
super(true,name);
-// prefix=postfix=null;
for (String a : attrs) {
addAttr(false, a);
}
break;
case CMArtiChangeForm.UPDATE:
Future<Artifacts> fu = client.update("/cert/artifacts", gui.artifactsDF, artifacts);
- if ((rv=fu).get(AAFcli.timeout())) {
+ rv=fu;
+ if(rv.get(AAFcli.timeout())) {
hgen.p("Artifact " + arti.getMechid() + " on " + arti.getMachine() + " is updated");
ok.set(true);
}
}
lmu = users.get(u.getId());
if (lmu==null) {
- users.put(u.getId(),lmu=new ArrayList<>());
+ lmu=new ArrayList<>();
+ users.put(u.getId(),lmu);
}
mu=null;
for (Map<Integer,List<User>> xmu : lmu) {
}
if (mu==null) {
- lmu.add(mu=new HashMap<>());
+ mu=new HashMap<>();
+ lmu.add(mu);
}
lu = mu.get(u.getType());
if (lu==null) {
- mu.put(u.getType(),lu = new ArrayList<>());
+ lu = new ArrayList<>();
+ mu.put(u.getType(),lu);
}
lu.add(u);
}
new BreadCrumbs(breadcrumbs),
new NamedCode(true,"content") {
final Slot sID = gui.env.slot(LoginLanding.NAME+'.'+LoginLanding.fields[0]);
-// final Slot sPassword = gui.env.slot(LoginLanding.NAME+'.'+LoginLanding.fields[1]);
@Override
public void code(final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications 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.
import aaf.v2_0.CredRequest;
public class PassDeleteAction extends Page {
- public static final String NAME = "PassDeleteAction";
+ public static final String CLASS = "PassDeleteAction";
public static final String HREF = "/gui/passdelete";
- private static enum Params{id,date,ns,type};
+ private enum Params{id,date,ns,type};
public PassDeleteAction(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException {
- super(gui.env,NAME,HREF,Params.values(),
+ super(gui.env,CLASS,HREF,Params.values(),
new BreadCrumbs(breadcrumbs),
- new SlotCode<AuthzTrans>(true,gui.env,NAME,Params.values()) {
+ new SlotCode<AuthzTrans>(true,gui.env,CLASS,Params.values()) {
@Override
public void code(final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
cache.dynamic(hgen, new DynamicCode<HTMLGen,AAF_GUI, AuthzTrans>() {
*
*/
private static class Model extends TableData<AAF_GUI,AuthzTrans> {
- final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;
+ final static long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L;
private final Slot sAsUser;
private static final String[] headers = new String[] {"Request Date","Status","Memo","Approver"};
String prevTicket = null;
for (Approval a : approvals) {
String approver = a.getApprover();
-// String approverShort = approver.substring(0,approver.indexOf('@'));
AbsCell tsCell = null;
String ticket = a.getTicket();
hgen.js(copyRoleJS);
hgen.text("function copyRole(role) {");
hgen.text("var txtRole = document.querySelector(\"#role\");");
-// hgen.text("if (role==;");
hgen.text("txtRole.value=role;");
hgen.text("}");
hgen.end(copyRoleJS);
import javax.servlet.Filter;
-import org.onap.aaf.auth.cache.Cache.Dated;
import org.onap.aaf.auth.env.AuthzEnv;
import org.onap.aaf.auth.env.AuthzTrans;
import org.onap.aaf.auth.env.AuthzTransFilter;
public class AAF_Hello extends AbsService<AuthzEnv,AuthzTrans> {
public enum API{TOKEN_REQ, TOKEN,INTROSPECT, ERROR,VOID};
- public Map<String, Dated> cacheUser;
public AAFAuthn<?> aafAuthn;
public AAFLurPerm aafLurPerm;
* Construct AuthzAPI with all the Context Supporting Routes that Authz needs
*
* @param env
- * @param si
- * @param dm
- * @param decryptor
* @throws APIException
*/
public AAF_Hello(final AuthzEnv env) throws Exception {
import org.onap.aaf.auth.locate.mapper.Mapper;
import org.onap.aaf.auth.locate.validation.LocateValidator;
import org.onap.aaf.cadi.aaf.AAFPermission;
-import org.onap.aaf.misc.env.APIException;
import locate.v1_0.Endpoints;
import locate.v1_0.MgmtEndpoint;
* Construct AuthzAPI with all the Context Supporting Routes that Authz needs
*
* @param env
- * @param si
- * @param dm
- * @param decryptor
* @throws APIException
*/
public AAF_OAuth(final AuthzEnv env) throws Exception {
import org.onap.aaf.auth.env.AuthzTrans;
import org.onap.aaf.auth.layer.Result;
+@FunctionalInterface
public interface DirectIntrospect<INTROSPECT> {
Result<INTROSPECT> mappedIntrospect(AuthzTrans trans, String token);
}
odd.refresh = AAFToken.toToken(UUID.randomUUID());
odd.active = true;
long exp;
- odd.expires = new Date(exp=(System.currentTimeMillis()+TOK_EXP));
+ exp=(System.currentTimeMillis()+TOK_EXP);
+ odd.expires = new Date(exp);
odd.exp_sec = exp/1000;
odd.req_ip = trans.ip();
// Get Common "yyyymm" parameter, or none
- private static int[] getYears(HttpServletRequest req) throws NumberFormatException {
+ private static int[] getYears(HttpServletRequest req) {
// Sonar says threading issues.
SimpleDateFormat FMT = new SimpleDateFormat("yyyyMM");
String yyyymm = req.getParameter("yyyymm");
public static final char ALT_START_INST_KEY_CHAR='/';
public static final char LIST_SEP = ',';
- public static final String INST_KEY_REGEX = new StringBuilder().append(START_INST_KEY_CHAR).toString();
public static final String ASTERIX = "*";
/**
if (sInst == null || pInst == null) {
return false;
}
- if (sInst == "" || pInst == "") {
+ if (sInst.equals("") || pInst.equals("")) {
return false;
}
if (ASTERIX.equals(sInst)) {
* Action is not quite as complex. But we write it in this function so it can be consistent
*/
public static boolean evalAction(String sAction,String pAction) {
- if (ASTERIX.equals(sAction))return true; // If Server's String is "*", then it accepts every Action
- if (pAction == "") return false;
+ if (ASTERIX.equals(sAction)) return true; // If Server's String is "*", then it accepts every Action
+ if (pAction.equals("")) return false;
for (String sItem : Split.split(LIST_SEP,sAction)) { // allow for "," definition in Action
if (pAction.charAt(0)==START_REGEX_CHAR? // First char
sItem.matches(pAction.substring(1)): // Evaluate as Regular Expression
Ns ns;
Nss nss = new Nss();
- nss.getNs().add(ns = new Nss.Ns());
+ ns = new Nss.Ns();
+ nss.getNs().add(ns);
ns.setName("org.osaaf.myns");
ns.getResponsible().add("ab1234@people.osaaf.org");
ns.getResponsible().add("cd5678@people.osaaf.org");
ns.getAdmin().add("zy9876@people.osaaf.org");
ns.getAdmin().add("xw5432@people.osaaf.org");
ns.setDescription("This is my Namespace to set up");
-
- nss.getNs().add(ns = new Nss.Ns());
+ ns = new Nss.Ns();
+ nss.getNs().add(ns);
ns.setName("org.osaaf.myOtherNs");
ns.getResponsible().add("ab1234@people.osaaf.org");
ns.getResponsible().add("cd5678@people.osaaf.org");
niceUTCDateFmt.setTimeZone(TimeZone.getTimeZone("UTC"));\r
iso8601Fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");\r
batchFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss+SSSS");\r
+ // Note: DB and thus Batch conversions should always be in UTC Time\r
+ batchFmt.setTimeZone(TimeZone.getTimeZone("UTC"));\r
}\r
\r
\r
Code Review / aaf / authz.git / commitdiff