X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FCred.java;h=e2f37651ee22fe41e730ec926937371c1ec31446;hp=c4a9b0dbbd463f9d9df9db2a31fc368d638c63a2;hb=9a152c4fed4678049b63f53cd94a558b2d6e2cd7;hpb=f83c15c4a04a26c3d57423f3c67058ea38d5302f diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java index c4a9b0db..e2f37651 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java @@ -3,13 +3,14 @@ * 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. * 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. @@ -22,12 +23,14 @@ package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.SortedMap; import java.util.TreeMap; import org.onap.aaf.auth.dao.cass.CredDAO; @@ -45,36 +48,65 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; public class Cred { - public static final TreeMap data = new TreeMap<>(); - public static final TreeMap> byNS = new TreeMap<>(); + public static final SortedMap data = new TreeMap<>(); + public static final SortedMap> byNS = new TreeMap<>(); public final String id; public final List instances; public final String ns; - + public Cred(String id) { this.id = id; instances = new ArrayList<>(); ns=Question.domain2ns(id); } - + public static class Instance { public final int type; - public final Date expires,written; + public final Date expires; + public final Date written; public final Integer other; - - public Instance(int type, Date expires, Integer other, long written) { + public final String tag; + public List notes; + + + public Instance(int type, Date expires, Integer other, long written, String tag) { this.type = type; this.expires = expires; this.other = other; this.written = new Date(written); + this.tag = tag; + } + + /** + * Usually returns Null... + * @return + */ + public List notes() { + return notes; + } + + public void addNote(int level, String note) { + if(notes==null) { + notes=new ArrayList<>(); + } + notes.add(new Note(level,note)); } - + public String toString() { - return expires.toString() + ": " + type; + return expires.toString() + ": " + type + ' ' + tag; + } + } + + public static class Note { + public final int level; + public final String note; + + public Note(int level, String note) { + this.level = level; + this.note = note; } } - public Date last(final int ... types) { Date last = null; for (Instance i : instances) { @@ -97,7 +129,7 @@ public class Cred { return last; } - + public Set types() { Set types = new HashSet<>(); for (Instance i : instances) { @@ -107,19 +139,18 @@ public class Cred { } public static void load(Trans trans, Session session, int ... types ) { - load(trans, session,"select id, type, expires, other, writetime(cred) from authz.cred;",types); - + load(trans, session,"select id, type, expires, other, writetime(cred), tag from authz.cred;",types); } public static void loadOneNS(Trans trans, Session session, String ns,int ... types ) { - load(trans, session,"select id, type, expires, other, writetime(cred) from authz.cred WHERE ns='" + ns + "';"); + load(trans, session,"select id, type, expires, other, writetime(cred), tag from authz.cred WHERE ns='" + ns + "';", types); } private static void load(Trans trans, Session session, String query, int ...types) { trans.info().log( "query: " + query ); TimeTaken tt = trans.start("Read Creds", Env.REMOTE); - + ResultSet results; try { Statement stmt = new SimpleStatement( query ); @@ -141,7 +172,7 @@ public class Cred { boolean hastype = false; for (int t : types) { if (t==type) { - hastype=true; + hastype=true; break; } } @@ -149,7 +180,8 @@ public class Cred { continue; } } - add(row.getString(0), row.getInt(1),row.getTimestamp(2),row.getInt(3),row.getLong(4)); + add(row.getString(0), row.getInt(1),row.getTimestamp(2),row.getInt(3),row.getLong(4), + row.getString(5)); } } finally { tt.done(); @@ -160,22 +192,24 @@ public class Cred { } public static void add( - final String id, - final int type, - final Date timestamp, - final int other, - final long written - ) { + final String id, + final int type, + final Date timestamp, + final int other, + final long written, + final String tag + ) { Cred cred = data.get(id); if (cred==null) { cred = new Cred(id); data.put(id, cred); } - cred.instances.add(new Instance(type, timestamp, other, written/1000)); - + cred.instances.add(new Instance(type, timestamp, other, written/1000,tag)); + List lscd = byNS.get(cred.ns); if (lscd==null) { - byNS.put(cred.ns, (lscd=new ArrayList<>())); + lscd=new ArrayList<>(); + byNS.put(cred.ns,lscd); } boolean found = false; for (Cred c : lscd) { @@ -187,13 +221,13 @@ public class Cred { if (!found) { lscd.add(cred); } - } + } - /** + /** * Count entries in Cred data. * Note, as opposed to other methods, need to load the whole cred table for the Types. - * @param numbuckets + * @param numbuckets * @return */ public static CredCount count(int numbuckets) { @@ -207,55 +241,53 @@ public class Cred { } public static class CredCount { - public int raw[]; - public int basic_auth[]; - public int basic_auth_256[]; - public int cert[]; - public int x509Added[]; - public int x509Expired[]; - public Date dates[]; - + public int [] raw; + public int [] basicAuth; + public int [] basicAuth256; + public int [] cert; + public int [] x509Added; + public int [] x509Expired; + public Date [] dates; + public CredCount(int numbuckets) { raw = new int[numbuckets]; - basic_auth = new int[numbuckets]; - basic_auth_256 = new int[numbuckets]; + basicAuth = new int[numbuckets]; + basicAuth256 = new int[numbuckets]; cert = new int[numbuckets]; x509Added = new int[numbuckets]; x509Expired = new int[numbuckets]; dates = new Date[numbuckets]; GregorianCalendar gc = new GregorianCalendar(); dates[0]=gc.getTime(); // now - gc.set(GregorianCalendar.DAY_OF_MONTH, 1); - gc.set(GregorianCalendar.HOUR, 0); - gc.set(GregorianCalendar.MINUTE, 0); - gc.set(GregorianCalendar.SECOND,0); - gc.set(GregorianCalendar.MILLISECOND,0); - gc.add(GregorianCalendar.MILLISECOND, -1); // last milli of month - for (int i=1;i row) { - sb.append("DELETE from authz.cred WHERE id='"); - sb.append(row.get(1)); - sb.append("' AND type="); - sb.append(Integer.parseInt(row.get(3))); - // Note: We have to work with long, because Expires is part of Key... can't easily do date. - sb.append(" AND expires=dateof(maxtimeuuid("); - sb.append(row.get(5)); - sb.append("));\n"); - } - - public String toString() { + 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 type="); + sb.append(Integer.parseInt(row.get(3))); + // Note: We have to work with long, because Expires is part of Key... can't easily do date. + sb.append(" AND expires='"); + sb.append(date); + sb.append("';\n"); + + } + + public String toString() { StringBuilder sb = new StringBuilder(id); sb.append('['); for (Instance i : instances) { @@ -323,13 +365,27 @@ public class Cred { } - public static String histSubject(List row) { - return row.get(1); - } + public static String histSubject(List row) { + return row.get(1); + } + + + public static String histMemo(String fmt, String orgName, List row) { + String reason; + if(row.size()>5) { // Reason included + reason = row.get(5); + } else { + reason = String.format(fmt, row.get(1),orgName,row.get(4)); + } + return reason; + } + + + public static void clear() { + data.clear(); + byNS.clear(); + } - public static String histMemo(String fmt, String orgName, List row) { - return String.format(fmt, row.get(1),orgName,row.get(4)); - } } \ No newline at end of file