backup before clean, verifysupportedkeyfiletype

Author: soh boon keong

.vscode/settings.json

@@ -1,5 +1,10 @@
 # Change Log
 
+### V2.0-SNAPSHOT
+
+- Library to use authParam
+- Usage for APEX 2
+
 ### V1.3.5-SNAPSHOT
 
 - Fixed vulnerability CVE-2020-25649, CVE-2020-15522, CVE-2020-9488 and CVE-2019-17571

1:

@@ -124,7 +124,7 @@ gradle test jacocoTestReport
 ```
 
 The compiled _jar_ file will be located in the **build/libs** folder
-+ java-apex-api-security-1.0-SNAPSHOT.jar
++ java-apex-api-security-2.0-SNAPSHOT.jar
 
 Import this jar into your java classpath to use the utility class
 
@@ -139,7 +139,7 @@ repositories {
     mavenLocal()
 }
 dependencies {
-    compile group: 'com.api.util', name: 'ApiSecurity', version: '1.3.5-SNAPSHOT'
+    compile group: 'com.api.util', name: 'ApiSecurity', version: '2.0-SNAPSHOT'
 }
 	
 ```

CHANGELOG.md

@@ -4,7 +4,7 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.6.3'
 }
 
-version '1.3.5-SNAPSHOT'
+version '2.0.0-SNAPSHOT'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"

README.md

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.api.util</groupId>
   <artifactId>ApiSecurity</artifactId>
-  <version>1.3.5-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

build.gradle

@@ -1,8 +1,6 @@
 package com.api.util.ApiSecurity;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
@@ -28,14 +26,7 @@ public String toString(Boolean isBaseString) {
 		Boolean quote = false;
 		return this.toString(delimiter, sort, quote, isBaseString);
 	}
-	
-//	public String toString(Boolean isBaseString, Boolean sort) {
-//		String delimiter = "&";
-//		Boolean quote = false;
-//		
-//		return this.toString(delimiter, sort, quote, isBaseString);
-//	}
-	
+		
 	public String toString(String delimiter, Boolean sort, Boolean quote, Boolean isBaseString)
 	{
 		List<String> list = new ArrayList<String>();

expected

@@ -276,8 +276,8 @@ public static PrivateKey getPrivateKey(String keystoreFileName, String password,
      		//For JKS file
      		privateKey = getPrivateKeyFromKeyStore(keystoreFileName, password, alias);
      	}
-    	
     	return privateKey;
+    	
     }
 
     public static PrivateKey getPrivateKey(String keystoreFileName, String password) throws ApiUtilException {
@@ -419,10 +419,11 @@ public static PublicKey getPublicKeyFromX509Certificate(String publicCertificate
      * @return Public Key
      * @throws IOException
      * @throws GeneralSecurityException
+     * @throws ApiUtilException
      */
-    public static PublicKey getPublicKeyPEM(String publicCertificateFileName) throws IOException, GeneralSecurityException {
+    public static PublicKey getPublicKeyPEM(String publicCertificateFileName) throws IOException, GeneralSecurityException, ApiUtilException {
     	//log.debug("Enter :: getPublicKeyFromPubKey :: publicCertificateFileName : {} ", publicCertificateFileName);
-    	
+    	System.out.println("in publicKEYPEM  error " + publicCertificateFileName);
 
     	log.debug("Enter :: getPublicKeyPEM :: publicCertificateFileName : {} ", publicCertificateFileName);
 		PublicKey key = null;
@@ -445,8 +446,9 @@ public static PublicKey getPublicKeyPEM(String publicCertificateFileName) throws
 			}
 
 		}catch(Exception e){
+			System.out.println("in publicKEYPEM  error " + e.toString());
 			log.error(e.getMessage(),e);
-			throw e;
+			throw new ApiUtilException(e.getMessage(), e);
 		}finally{
 			if(null!=pemParser){
 				pemParser.close();
@@ -1143,9 +1145,12 @@ public static PrivateKey getPrivateKeyPEM(String privateKeyFileName, String pass
             	key = converter.getPrivateKey(privateKeyInfo);
             	System.out.println(" what is this KEY " + key.toString());
 
+            }else {
+            	throw new ApiUtilException("Error while getting Private Key from PEM");
             }
 
 		}catch(Exception e){
+			System.out.println("I am in error fpr getPrivateKeyPEM " + e.getMessage());
 //			throw e;
 			throw new ApiUtilException(e.getMessage(), e);
 		}finally{
@@ -1160,7 +1165,7 @@ public static PrivateKey getPrivateKeyPEM(String privateKeyFileName, String pass
 			}
 		}
 		log.debug("Exit :: getPrivateKeyPEM");
-		
+		System.out.println(" what is this KEYPEM " + key.toString());
         return key;
 
 	}

pom.xml

@@ -161,7 +161,7 @@ public void Test_L2_Not_Supported_Cert_Test() throws ApiUtilException
 //    , IOException, GeneralSecurityException
 	{
 		String fileName = getLocalPath("certificates/ssc.alpha.example.com.pem");
-    	String expectedMessage = "unable to read encrypted data: javax.crypto.BadPaddingException: pad block corrupted";
+    	String expectedMessage = "unable to read encrypted data: Error finalising cipher";
     	//String fileName = getLocalPath("certificates/team20.pem");
         //String expectedMessage = "org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo cannot be cast to org.bouncycastle.openssl.PEMKeyPair";