From ce4631bddead69c805c5f7855ed3eed6bcfab216 Mon Sep 17 00:00:00 2001
From: Abhi Shah <abhis@splunk.com>
Date: Wed, 30 Nov 2022 17:04:13 +0530
Subject: [PATCH 1/2] code fix

re-fetch version and InstanceType if null
---
 splunk/src/main/java/com/splunk/Service.java     |  6 ++++++
 splunk/src/test/java/com/splunk/ServiceTest.java | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/splunk/src/main/java/com/splunk/Service.java b/splunk/src/main/java/com/splunk/Service.java
index d6d15b8f..05a5ae6d 100644
--- a/splunk/src/main/java/com/splunk/Service.java
+++ b/splunk/src/main/java/com/splunk/Service.java
@@ -1356,6 +1356,9 @@ public void setBearerToken(String value) {
 
 
     public boolean enableV2SearchApi(){
+        if(null == this.instanceType){
+            this.instanceType = this.getInfo().getInstanceType();
+        }
         if(this.instanceType.equalsIgnoreCase("cloud")) {
             return versionIsAtLeast("9.0.2209");
         }else{
@@ -1411,6 +1414,9 @@ boolean versionIsEarlierThan(String version) {
      *         or 1 if this version is greater than the given version.
      */
     public int versionCompare(String otherVersion) {
+        if(null == this.version){
+            this.version = this.getInfo().getVersion();
+        }
         String[] components1 = this.version.split("\\.");
         String[] components2 = otherVersion.split("\\.");
         int numComponents = Math.max(components1.length, components2.length);
diff --git a/splunk/src/test/java/com/splunk/ServiceTest.java b/splunk/src/test/java/com/splunk/ServiceTest.java
index ce9aafdf..a8960842 100644
--- a/splunk/src/test/java/com/splunk/ServiceTest.java
+++ b/splunk/src/test/java/com/splunk/ServiceTest.java
@@ -735,4 +735,19 @@ public void testEnableV2Api(){
         }
     }
 
+    /*
+    Test when Service instance is created using token, it doesn't result in Null Pointer while accessing instanceType and version
+     */
+    @Test
+    public void testServiceWithTokenAuth(){
+        Service newService = new Service(service.getHost());
+        newService.setToken(service.getToken());
+        try{
+            newService.enableV2SearchApi();
+            newService.versionCompare("9.0.2");
+        }catch (Exception ex){
+            Assert.assertNull(ex);
+        }
+    }
+
 }

From c4fc1d90e00c03d63693ca92d72a26e17457145f Mon Sep 17 00:00:00 2001
From: Abhi Shah <abhis@splunk.com>
Date: Mon, 5 Dec 2022 15:53:42 +0530
Subject: [PATCH 2/2] Update HttpService.java

added check for Host IP address.
---
 splunk/src/main/java/com/splunk/HttpService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/splunk/src/main/java/com/splunk/HttpService.java b/splunk/src/main/java/com/splunk/HttpService.java
index d95f3d6e..1b0d1782 100644
--- a/splunk/src/main/java/com/splunk/HttpService.java
+++ b/splunk/src/main/java/com/splunk/HttpService.java
@@ -51,10 +51,11 @@ public class HttpService {
     private static String HTTPS_SCHEME = "https";
     private static String HTTP_SCHEME = "http";
     private static String HOSTNAME = "localhost";
+    private static String HOSTIP = "127.0.0.1";
 
     private static final HostnameVerifier HOSTNAME_VERIFIER = new HostnameVerifier() {
         public boolean verify(String s, SSLSession sslSession) {
-            if (s.equals(HOSTNAME)) {
+            if (s.equals(HOSTNAME) || s.equals(HOSTIP)) {
                 return true;
             } else {
                 HostnameVerifier hv = HttpsURLConnection.getDefaultHostnameVerifier();