belkast/soapClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added functionality for missing values

Browse Source
This commit is contained in:
Keith Armstrong 2025-01-02 13:47:47 -05:00
parent a3d511dc12
commit eb333754a1
3 changed files with 74 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
example/props_USER_TO_ROLE.conf
View File

@ -1,8 +1,9 @@
SHIM_URL = https://test.mycompany.com:8443/IDMProv/role/service SHIM_URL = https://test.mycompany.com:8443/IDMProv/role/service
PASSWORD = PT9TKHwFgJCxATJtAAMtMwtIF0UjFal6fo5riBN+ExY=
USERNAME = cn=keitha,ou=active,ou=users,o=belkast USERNAME = cn=keitha,ou=active,ou=users,o=belkast
XML_FILE = USER_TO_ROLE.xml PASSWORD = PT9TKHwFgJCxATJtAAMtMwtIF0UjFal6fo5riBN+ExY=
INPUT_FILE = msalah.csv
SSL = true SSL = true
JAVA_KS_LOCATION = ldap.keystore JAVA_KS_LOCATION = ldap.keystore
JAVA_KS_PASSWORD = changeit JAVA_KS_PASSWORD = changeit
XML_FILE = USER_TO_ROLE.xml
CSV_FILE = msalah.csv
CSV_ALLOW_EMPTY_COLUMN_VALUES = true

65
src/com/belkast/soap/userVerify.java
View File

@ -26,9 +26,30 @@ public class userVerify
} }
} }
Boolean varUserBlockEmpty = false;
HashMap<String, Boolean> valueMap = new HashMap();
valueMap.put("", true);
valueMap.put("Y", true);
valueMap.put("y", true);
valueMap.put("N", false);
valueMap.put("n", false);
while (true) {
System.out.print("Block on empty column values (Y/n) : ");
String varAnswer = myObj.nextLine(); // Read user input
if (varAnswer.toUpperCase().equals("Y") || varAnswer.toUpperCase().equals("N") || varAnswer == "")
{
varUserBlockEmpty = valueMap.get(varAnswer);
break;
}
}
System.out.println(); System.out.println();
System.out.println("CSV input file : " + varFileName); System.out.println("CSV input file : " + varFileName);
ArrayList thisCSV = readCSV(varFileName, true); System.out.println("CSV block on empty : " + varUserBlockEmpty);
ArrayList thisCSV = readCSV(varFileName, true, varUserBlockEmpty);
System.out.println(); System.out.println();
Iterator<Map> mapper1 = thisCSV.iterator(); Iterator<Map> mapper1 = thisCSV.iterator();
@ -41,8 +62,8 @@ public class userVerify
while (it.hasNext()) while (it.hasNext())
{ {
Map.Entry<Integer, Integer> pair = it.next(); Map.Entry<Integer, Integer> pair = it.next();
System.out.println("record " + varIter + " key : " + pair.getKey()); System.out.println("record " + varIter + " token : " + pair.getKey());
System.out.println("record " + varIter + " val : " + pair.getValue()); System.out.println("record " + varIter + " value : " + pair.getValue());
} }
System.out.println(); System.out.println();
} }
@ -52,7 +73,7 @@ public class userVerify
System.out.println(); System.out.println();
} }
public static ArrayList readCSV (String thisFile, boolean fromUser) public static ArrayList readCSV (String thisFile, boolean fromUser, boolean blockEmpty)
{ {
int readNum = 0; int readNum = 0;
int invalidNum = 0; int invalidNum = 0;
@ -78,37 +99,53 @@ public class userVerify
return finalArray; return finalArray;
} }
CSVFormat csvFormat = CSVFormat.RFC4180.builder() CSVFormat csvFormat = CSVFormat.EXCEL.builder()
.setHeader(varHeader.split(",")) .setHeader()
.setSkipHeaderRecord(true) .setSkipHeaderRecord(false)
.setAllowMissingColumnNames(false)
.setIgnoreEmptyLines(true) .setIgnoreEmptyLines(true)
.setIgnoreSurroundingSpaces(true) .setIgnoreSurroundingSpaces(true)
.setIgnoreHeaderCase(true)
.setTrim(true) .setTrim(true)
.build(); .build();
int headerLen = csvFormat.getHeader().length;
Iterable<CSVRecord> records = csvFormat.parse(in); Iterable<CSVRecord> records = csvFormat.parse(in);
debugProcessor.writer(fromUser, "CSV header tokens : " + varHeader);
debugProcessor.writer(fromUser, "CSV token count : " + headerLen);
debugProcessor.writer(fromUser, "CSV token list : " + varHeader);
debugProcessor.writer(fromUser, ""); debugProcessor.writer(fromUser, "");
for (CSVRecord record : records) { for (CSVRecord record : records) {
readNum++; readNum++;
lineNum = record.getParser().getCurrentLineNumber(); lineNum = record.getParser().getCurrentLineNumber();
boolean isValid = record.isConsistent(); boolean isValid = record.isConsistent();
Boolean validValues = true;
if (isValid) if (isValid)
{ {
Map thisMap = record.toMap();
Iterator<Map.Entry<Integer, Integer>> it = thisMap.entrySet().iterator();
while (it.hasNext())
{
Map.Entry<Integer, Integer> pair = it.next();
String thisVal = String.valueOf(pair.getValue());
if (blockEmpty && (pair.getValue() == null || thisVal.isEmpty()))
{
validValues = false;
debugProcessor.writer(fromUser, "!! line " + lineNum + " [failed] : the " + pair.getKey() + " token value is empty");
}
}
}
if (isValid && validValues)
{
debugProcessor.writer(fromUser, "## line " + lineNum + " [passed]");
finalArray.add(record.toMap()); finalArray.add(record.toMap());
debugProcessor.writer(fromUser, "## " + lineNum + " [passed]");
} }
else else
{ {
invalidNum++; invalidNum++;
String thisLine = Files.readAllLines(Paths.get(thisFile)).get(Math.toIntExact(lineNum - 1)); String thisLine = Files.readAllLines(Paths.get(thisFile)).get(Math.toIntExact(lineNum - 1));
debugProcessor.writer(fromUser, "!! " + lineNum + " [failed] : " + thisLine); debugProcessor.writer(fromUser, "!! line " + lineNum + " [failed] : " + thisLine);
debugProcessor.writer(fromUser, "!! " + lineNum + " [failed] : " + record.toMap().toString()); debugProcessor.writer(fromUser, "!! line " + lineNum + " [failed] : " + record.toMap().toString());
} }
} }
} }

26
src/com/belkast/soap/webService.java
View File

@ -89,23 +89,27 @@ public class webService {
System.out.println(); System.out.println();
String varURL = propertyProcessor.getProperty(thisProps, "SHIM_URL"); String varURL = propertyProcessor.getProperty(thisProps, "SHIM_URL");
String varRoleFile = propertyProcessor.getProperty(thisProps, "INPUT_FILE");
String varInputFile = propertyProcessor.getProperty(thisProps, "XML_FILE");
String varUsername = propertyProcessor.getProperty(thisProps, "USERNAME"); String varUsername = propertyProcessor.getProperty(thisProps, "USERNAME");
String varPasswordTemp = propertyProcessor.getProperty(thisProps, "PASSWORD"); String varPasswordTemp = propertyProcessor.getProperty(thisProps, "PASSWORD");
String varUseSSL = propertyProcessor.getProperty(thisProps, "SSL"); String varUseSSL = propertyProcessor.getProperty(thisProps, "SSL");
String varKeystore_LOC = propertyProcessor.getProperty(thisProps, "JAVA_KS_LOCATION"); String varKeystore_LOC = propertyProcessor.getProperty(thisProps, "JAVA_KS_LOCATION");
String varKeystore_PW = propertyProcessor.getProperty(thisProps, "JAVA_KS_PASSWORD"); String varKeystore_PW = propertyProcessor.getProperty(thisProps, "JAVA_KS_PASSWORD");
String varInputFile = propertyProcessor.getProperty(thisProps, "XML_FILE");
String varRoleFile = propertyProcessor.getProperty(thisProps, "CSV_FILE");
String varPropEmptyColumns = propertyProcessor.getProperty(thisProps, "CSV_ALLOW_EMPTY_COLUMN_VALUES");
Boolean varEmptyColumns = Boolean.valueOf(varPropEmptyColumns);
debugProcessor.writer(varDebug, thisProps + " => SOAP URL : " + varURL); debugProcessor.writer(varDebug, thisProps + " => SOAP URL : " + varURL);
debugProcessor.writer(varDebug, thisProps + " => Username : " + varUsername); debugProcessor.writer(varDebug, thisProps + " => Username : " + varUsername);
debugProcessor.writer(varDebug, thisProps + " => Use SSL : " + varUseSSL); debugProcessor.writer(varDebug, thisProps + " => Use SSL : " + varUseSSL);
debugProcessor.writer(varDebug, thisProps + " => JAVA Keystore : " + varKeystore_LOC); debugProcessor.writer(varDebug, thisProps + " => JAVA keystore : " + varKeystore_LOC);
debugProcessor.writer(varDebug, thisProps + " => JAVA Keystore password : " + varKeystore_PW); debugProcessor.writer(varDebug, thisProps + " => JAVA keystore password : " + varKeystore_PW);
debugProcessor.writer(varDebug, thisProps + " => Input File : " + varRoleFile); debugProcessor.writer(varDebug, thisProps + " => XML file : " + varInputFile);
debugProcessor.writer(varDebug, thisProps + " => XML File : " + varInputFile); debugProcessor.writer(varDebug, thisProps + " => CSV file : " + varRoleFile);
debugProcessor.writer(varDebug, thisProps + " => CSV allow empty : " + varEmptyColumns);
File checkInput = new File (varInputFile); File checkInput = new File (varInputFile);
if (!checkInput.exists()) if (!checkInput.exists())
@ -129,15 +133,15 @@ public class webService {
System.exit(0); System.exit(0);
} }
ArrayList thisCSV = userVerify.readCSV(varRoleFile, false); ArrayList thisCSV = userVerify.readCSV(varRoleFile, false, !varEmptyColumns);
boolean validfile = (thisCSV.size() > 0); boolean validfile = (thisCSV.size() > 0);
debugProcessor.writer(true, varRoleFile + " : CSV file is valid : " + validfile); debugProcessor.writer(true, varRoleFile + " => CSV file is valid : " + validfile);
debugProcessor.writer(true, varRoleFile + " : records to process : " + thisCSV.size()); debugProcessor.writer(true, varRoleFile + " => records to process : " + thisCSV.size());
if (!validfile) if (!validfile)
{ {
debugProcessor.writer(true, varRoleFile + " : verification failed. please verify the file with com.belkast.soap.userVerify!"); debugProcessor.writer(true, varRoleFile + " => verification failed : please verify the file with com.belkast.soap.userVerify!");
} }
int varCount = 0; int varCount = 0;
Iterator<Map> mapper1 = thisCSV.iterator(); Iterator<Map> mapper1 = thisCSV.iterator();