Skip to content

Release/1.9.4 #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashah-splunk merged 6 commits into from
Mar 13, 2023
Merged

Release/1.9.4 #211

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7de566c
Update HttpService.java
ashah-splunk Jan 6, 2023
2968934
Merge pull request #205 from splunk/master
ashah-splunk Jan 6, 2023
8367148
Merge pull request #206 from splunk/DVPL-11907
ashah-splunk Jan 11, 2023
37d1e69
IPv6 Host check added
ashah-splunk Mar 9, 2023
98bad32
Merge pull request #210 from splunk/ipv6-support
ashah-splunk Mar 10, 2023
396bec3
release updates
ashah-splunk Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion splunk/src/main/java/com/splunk/HttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ public class HttpService {
private static String HTTP_SCHEME = "http";
private static String HOSTNAME = "localhost";
private static String HOSTIP = "127.0.0.1";
private static String HOSTIPv6 = "::1";

private static final HostnameVerifier HOSTNAME_VERIFIER = new HostnameVerifier() {
public boolean verify(String s, SSLSession sslSession) {
if (s.equals(HOSTNAME) || s.equals(HOSTIP)) {
if (s.equals(HOSTNAME) || s.equals(HOSTIP) || s.equals(HOSTIPv6)) {
return true;
} else {
HostnameVerifier hv = HttpsURLConnection.getDefaultHostnameVerifier();
Expand Down
23 changes: 23 additions & 0 deletions splunk/src/test/java/com/splunk/HttpServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,29 @@ public void setUp() throws Exception {
);
}

@Test
public void testHttpServiceWithHostIP(){
HttpService service = new HttpService("127.0.0.1");
ResponseMessage response = service.get("/");
Assert.assertEquals(200, response.getStatus());
Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));
}

@Test
public void testHttpServiceWithHostIPv6(){
// IPv6 Host without the [] brackets
HttpService service = new HttpService("::1");
ResponseMessage response = service.get("/");
Assert.assertEquals(200, response.getStatus());
Assert.assertTrue(firstLineIsXmlDtd(response.getContent()));

// IPv6 Host with the [] brackets
HttpService newService = new HttpService("[::1]");
ResponseMessage resp = newService.get("/");
Assert.assertEquals(200, resp.getStatus());
Assert.assertTrue(firstLineIsXmlDtd(resp.getContent()));
}

@Test
public void testGet() {
ResponseMessage response = httpService.get("/");
Expand Down