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=a9029626f50cb540043f97b0d23e3207939830a1;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=2cc6907b2d809ff83c898263b4a38e79db37dca1;hpb=d9c0bb04b77f6a637f1fc07b69c90898d672bd34;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 2cc6907b..a9029626 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,6 +4,8 @@ * =========================================================================== * 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 @@ -23,9 +25,9 @@ package org.onap.aaf.auth.batch.helpers; import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Set; import java.util.TreeMap; import java.util.UUID; @@ -33,7 +35,6 @@ 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; @@ -44,26 +45,77 @@ import com.datastax.driver.core.SimpleStatement; import com.datastax.driver.core.Statement; public class Approval implements CacheChange.Data { - public static final String RE_APPROVAL_IN_ROLE = "Re-Approval in Role '"; - public static final String RE_VALIDATE_ADMIN = "Re-Validate as Administrator for AAF Namespace '"; - public static final String RE_VALIDATE_OWNER = "Re-Validate Ownership for AAF Namespace '"; + 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<>(); + private static final CacheChange cache = new CacheChange<>(); public final ApprovalDAO.Data add; private String role; + + 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); + } + } + }; - public Approval(UUID id, UUID ticket, String approver, Date last_notified, + 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; @@ -77,118 +129,77 @@ public class Approval implements CacheChange.Data { if (memo==null) { return null; } - int first = memo.indexOf('\''); + int first = memo.indexOf('['); if (first>=0) { - int second = memo.indexOf('\'', ++first); + 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 if (memo.startsWith(RE_APPROVAL_IN_ROLE)) { - return role; + } else { + first = memo.indexOf('[',second); + if(first>=0) { + second = memo.indexOf(']', ++first); + if(second>=0 && (memo.startsWith(RE_APPROVAL_IN_ROLE) || + memo.startsWith(ADD_USER_TO_ROLE))) { + return memo.substring(first, second); + } + } } } } return null; } - public static void load(Trans trans, Session session, Creator creator, Visitor visitor) { - trans.info().log( "query: " + creator.select() ); - TimeTaken tt = trans.start("Read Approval", Env.REMOTE); - - ResultSet results; + public static int load(Trans trans, Session session, Creator creator, Visitor visitor) { + int count = 0; try { - Statement stmt = new SimpleStatement( creator.select() ); - results = session.execute(stmt); + count+=call(trans,session,creator.query(null), creator, visitor); } finally { - tt.done(); + trans.info().log("Found",count,"Approval Records"); } - + return count; + } + + public static int load(Trans trans, Session session, Creator creator ) { int count = 0; try { - Iterator iter = results.iterator(); - Row row; - tt = trans.start("Load X509s", Env.SUB); - try { - while (iter.hasNext()) { - ++count; - row = iter.next(); - visitor.visit(creator.create(row)); - } - } finally { - tt.done(); - } + count+=call(trans,session,creator.query(null), creator, FullLoad); } finally { - trans.info().log("Found",count,"X509 Certificates"); + trans.info().log("Found",count,"Approval Records"); } + return count; } - public static void row(CSV.Writer cw, Approval app) { - cw.row("approval",app.add.id,app.add.ticket,app.add.user,app.role,app.add.memo); - } - + 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; + } + + 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); + } - public static void load(Trans trans, Session session, Creator creator ) { - trans.info().log( "query: " + creator.select() ); - TimeTaken tt = trans.start("Load Notify", Env.REMOTE); - + private static int call(Trans trans, Session session, String query, Creator creator, Visitor visitor) { + TimeTaken tt = trans.start("DB Query", Trans.REMOTE); ResultSet results; try { - Statement stmt = new SimpleStatement(creator.select()); + Statement stmt = new SimpleStatement( query ); results = session.execute(stmt); + int count = 0; + for (Row row : results.all()) { + ++count; + visitor.visit(creator.create(row)); + } + return count; } finally { tt.done(); } - int count = 0; - tt = trans.start("Process Notify", Env.SUB); - - try { - List ln; - for (Row row : results.all()) { - ++count; - try { - Approval app = creator.create(row); - 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); - } - } finally { - tt.done(); - } - } - } finally { - tt.done(); - trans.info().log("Found",count,"Approval Records"); - } } @Override @@ -211,41 +222,14 @@ public class Approval implements CacheChange.Data { } } - public void update(AuthzTrans trans, ApprovalDAO apprDAO, boolean dryRun) { - if (dryRun) { - trans.info().printf("Would update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified); - } else { - trans.info().printf("Update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified); - apprDAO.update(trans, add); - } + public static void clear() { + 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.getTimestamp(3), - row.getString(4),row.getString(5),row.getString(6),row.getString(7),row.getString(8) - ,row.getLong(9)/1000); - } - - @Override - public String select() { - return "select id,ticket,approver,last_notified,user,memo,operation,status,type,WRITETIME(status) from authz.approval"; - } - }; - - /** - * @return the lastNotified - */ - public Date getLast_notified() { - return add.last_notified; - } - /** - * @param lastNotified the lastNotified to set - */ - public void setLastNotified(Date last_notified) { - add.last_notified = last_notified; - } /** * @return the status */ @@ -348,10 +332,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"); + } }