X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FApproval.java;h=83d9cd5e618f3557b46b2d1b7f642f0b382c0857;hb=78ccdcc1d1c29760e4cf833f94df62e1c5aa733f;hp=ce19865a5e738cf93874723cce38ade0af46912f;hpb=f64f482462b697e06a47ad55aa5447dc829ce727;p=aaf%2Fauthz.git diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java index ce19865a..83d9cd5e 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Approval.java @@ -4,12 +4,14 @@ * =========================================================================== * 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. @@ -26,6 +28,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Set; +import java.util.SortedMap; import java.util.TreeMap; import java.util.UUID; @@ -33,6 +36,7 @@ import org.onap.aaf.auth.dao.cass.ApprovalDAO; import org.onap.aaf.auth.env.AuthzTrans; import org.onap.aaf.auth.layer.Result; import org.onap.aaf.cadi.util.CSV; +import org.onap.aaf.misc.env.Env; import org.onap.aaf.misc.env.TimeTaken; import org.onap.aaf.misc.env.Trans; @@ -43,27 +47,77 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; public class Approval implements CacheChange.Data { - public static final String ADD_USER_TO_ROLE = "Add User ["; + public static final String ADD_USER_TO_ROLE = "Add User ["; public static final String RE_APPROVAL_IN_ROLE = "Extend access of User ["; public static final String RE_VALIDATE_ADMIN = "Revalidate as Admin of AAF Namespace ["; public static final String RE_VALIDATE_OWNER = "Revalidate as Owner of AAF Namespace ["; - public static TreeMap> byApprover = new TreeMap<>(); - public static TreeMap> byUser = new TreeMap<>(); - public static TreeMap> byTicket = new TreeMap<>(); - public static List list = new LinkedList<>(); - private final static CacheChange cache = new CacheChange<>(); - + public static final SortedMap> byApprover = new TreeMap<>(); + public static final SortedMap> byUser = new TreeMap<>(); + public static final SortedMap> byTicket = new TreeMap<>(); + public static final List list = new LinkedList<>(); + private static final CacheChange cache = new CacheChange<>(); + public final ApprovalDAO.Data add; private String role; - - public Approval(UUID id, UUID ticket, String approver,// Date last_notified, + + public static final Creator v2_0_17 = new Creator() { + @Override + public Approval create(Row row) { + return new Approval(row.getUUID(0), row.getUUID(1), row.getString(2), + row.getString(3),row.getString(4),row.getString(5),row.getString(6),row.getString(7), + row.getLong(8)/1000); + } + + @Override + public String select() { + return "select id,ticket,approver,user,memo,operation,status,type,WRITETIME(status) from authz.approval"; + } + }; + + public static final Visitor FullLoad = new Visitor() { + @Override + public void visit(Approval app) { + List ln; + list.add(app); + + String person = app.getApprover(); + if (person!=null) { + ln = byApprover.get(person); + if (ln==null) { + ln = new ArrayList<>(); + byApprover.put(app.getApprover(), ln); + } + ln.add(app); + } + + person = app.getUser(); + if (person!=null) { + ln = byUser.get(person); + if (ln==null) { + ln = new ArrayList<>(); + byUser.put(app.getUser(), ln); + } + ln.add(app); + } + UUID ticket = app.getTicket(); + if (ticket!=null) { + ln = byTicket.get(ticket); + if (ln==null) { + ln = new ArrayList<>(); + byTicket.put(app.getTicket(), ln); + } + ln.add(app); + } + } + }; + + public Approval(UUID id, UUID ticket, String approver,// Date last_notified, String user, String memo, String operation, String status, String type, long updated) { add = new ApprovalDAO.Data(); add.id = id; add.ticket = ticket; add.approver = approver; -// add.last_notified = last_notified; add.user = user; add.memo = memo; add.operation = operation; @@ -72,7 +126,7 @@ public class Approval implements CacheChange.Data { add.updated = new Date(updated); role = roleFromMemo(memo); } - + public static String roleFromMemo(String memo) { if (memo==null) { return null; @@ -82,21 +136,24 @@ public class Approval implements CacheChange.Data { int second = memo.indexOf(']', ++first); if (second>=0) { String role = memo.substring(first, second); - if (memo.startsWith(RE_VALIDATE_ADMIN)) { - return role + ".admin"; - } else if (memo.startsWith(RE_VALIDATE_OWNER)) { - return role + ".owner"; - } else { - first = memo.indexOf('[',second); - if(first>=0) { - second = memo.indexOf(']', ++first); - if(second>=0) { - if(memo.startsWith(RE_APPROVAL_IN_ROLE) || - memo.startsWith(ADD_USER_TO_ROLE)) { - return memo.substring(first, second); - } - } - } + return getRoleString(role, memo, second); + } + } + return null; + } + + public static String getRoleString(String role, String memo, int second) { + if (memo.startsWith(RE_VALIDATE_ADMIN)) { + return role + ".admin"; + } else if (memo.startsWith(RE_VALIDATE_OWNER)) { + return role + ".owner"; + } else { + int secondString = memo.indexOf('[',second); + if(secondString>=0) { + second = memo.indexOf(']', ++secondString); + if(second>=0 && (memo.startsWith(RE_APPROVAL_IN_ROLE) || + memo.startsWith(ADD_USER_TO_ROLE))) { + return memo.substring(secondString, second); } } } @@ -104,61 +161,61 @@ public class Approval implements CacheChange.Data { } public static int load(Trans trans, Session session, Creator creator, Visitor visitor) { - int count = 0; - try { - count+=call(trans,session,creator.query(null), creator, visitor); + int count = 0; + try { + count += call(trans,session,creator.query(null), creator, visitor); } finally { trans.info().log("Found",count,"Approval Records"); } - return count; + return count; } - - public static int load(Trans trans, Session session, Creator creator ) { - int count = 0; - try { - count+=call(trans,session,creator.query(null), creator, FullLoad); + + public static int load(Trans trans, Session session, Creator creator ) { + int count = 0; + try { + count += call(trans,session,creator.query(null), creator, FullLoad); } finally { trans.info().log("Found",count,"Approval Records"); } - return count; + return count; } - + public static int loadUsers(Trans trans, Session session, Set users, Visitor visitor) { - int total = 0; - for(String user : users) { - total+=call(trans,session,String.format("%s WHERE user='%s';",v2_0_17.select(), user),v2_0_17,visitor); - } - return total; + int total = 0; + for(String user : users) { + total += call(trans,session,String.format("%s WHERE user='%s';",v2_0_17.select(), user),v2_0_17,visitor); + } + return total; } - + public static void row(CSV.RowSetter crs, Approval app) { - crs.row("approval",app.add.id,app.add.ticket,app.add.user,app.role,app.add.memo); - } + crs.row("approval",app.add.id,app.add.ticket,app.add.user,app.role,app.add.memo); + } - private static int call(Trans trans, Session session, String query, Creator creator, Visitor visitor) { - TimeTaken tt = trans.start("DB Query", Trans.REMOTE); + private static int call(Trans trans, Session session, String query, Creator creator, Visitor visitor) { + TimeTaken tt = trans.start("DB Query", Env.REMOTE); ResultSet results; try { Statement stmt = new SimpleStatement( query ); results = session.execute(stmt); int count = 0; for (Row row : results.all()) { - ++count; - visitor.visit(creator.create(row)); + ++count; + visitor.visit(creator.create(row)); } return count; } finally { tt.done(); } } - + @Override public void expunge() { List la = byApprover.get(getApprover()); if (la!=null) { la.remove(this); } - + la = byUser.get(getUser()); if (la!=null) { la.remove(this); @@ -173,64 +230,13 @@ public class Approval implements CacheChange.Data { } public static void clear() { - byApprover.clear(); - byUser.clear(); - byTicket.clear(); - list.clear(); - cache.resetLocalData(); + byApprover.clear(); + byUser.clear(); + byTicket.clear(); + list.clear(); + cache.resetLocalData(); } - public static Creator v2_0_17 = new Creator() { - @Override - public Approval create(Row row) { - return new Approval(row.getUUID(0), row.getUUID(1), row.getString(2), - row.getString(3),row.getString(4),row.getString(5),row.getString(6),row.getString(7), - row.getLong(8)/1000); - } - - @Override - public String select() { - return "select id,ticket,approver,user,memo,operation,status,type,WRITETIME(status) from authz.approval"; - } - }; - - public static Visitor FullLoad = new Visitor() { - @Override - public void visit(Approval app) { - List ln; - list.add(app); - - String person = app.getApprover(); - if (person!=null) { - ln = byApprover.get(person); - if (ln==null) { - ln = new ArrayList<>(); - byApprover.put(app.getApprover(), ln); - } - ln.add(app); - } - - person = app.getUser(); - if (person!=null) { - ln = byUser.get(person); - if (ln==null) { - ln = new ArrayList<>(); - byUser.put(app.getUser(), ln); - } - ln.add(app); - } - UUID ticket = app.getTicket(); - if (ticket!=null) { - ln = byTicket.get(ticket); - if (ln==null) { - ln = new ArrayList<>(); - byTicket.put(app.getTicket(), ln); - } - ln.add(app); - } - } - }; - /** * @return the status */ @@ -289,11 +295,11 @@ public class Approval implements CacheChange.Data { add.ticket=null; add.status="lapsed"; } - + public String getRole() { return role; } - + public String toString() { return getUser() + ' ' + getMemo(); } @@ -311,12 +317,12 @@ public class Approval implements CacheChange.Data { } } } - + public static void resetLocalData() { cache.resetLocalData(); } - + public static int sizeForDeletion() { return cache.cacheSize(); } @@ -333,10 +339,10 @@ public class Approval implements CacheChange.Data { return cache.contains(a); } - public static void deleteByIDBatch(StringBuilder sb, String id) { - sb.append("DELETE from authz.approval where id="); - sb.append(id); - sb.append(";\n"); - } + public static void deleteByIDBatch(StringBuilder sb, String id) { + sb.append("DELETE from authz.approval where id="); + sb.append(id); + sb.append(";\n"); + } }