-
-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: supported IPV6 in HA configuration (#1860)
Fixed issue #1859
- Loading branch information
Showing
12 changed files
with
149 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.arcadedb.network;/* | ||
| * Copyright © 2021-present Arcade Data Ltd ([email protected]) | ||
| * | ||
| * 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 | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * @author Luca Garulli ([email protected]) | ||
| */ | ||
| public class HostUtil { | ||
| public static final String CLIENT_DEFAULT_PORT = "2480"; | ||
| public static final String HA_DEFAULT_PORT = "2424"; | ||
|
|
||
| public static String[] parseHostAddress(String host, final String defaultPort) { | ||
| if (host == null) | ||
| throw new IllegalArgumentException("Host null"); | ||
|
|
||
| host = host.trim(); | ||
|
|
||
| if (host.isEmpty()) | ||
| throw new IllegalArgumentException("Host is empty"); | ||
|
|
||
| final String[] parts = host.split(":"); | ||
| if (parts.length == 1 || parts.length == 8) | ||
| // ( IPV4 OR IPV6 ) NO PORT | ||
| return new String[] { host, defaultPort }; | ||
| else if (parts.length == 2 || parts.length == 9) { | ||
| // ( IPV4 OR IPV6 ) + PORT | ||
| final int pos = host.lastIndexOf(":"); | ||
| return new String[] { host.substring(0, pos), host.substring(pos + 1) }; | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("Invalid host " + host); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright © 2021-present Arcade Data Ltd ([email protected]) | ||
| * | ||
| * 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 | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-FileCopyrightText: 2021-present Arcade Data Ltd ([email protected]) | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package com.arcadedb; | ||
|
|
||
| import com.arcadedb.network.HostUtil; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * @author Luca Garulli ([email protected]) | ||
| */ | ||
| public class HostUtilTest { | ||
| @Test | ||
| public void testIPv4() { | ||
| final String[] parts = HostUtil.parseHostAddress("10.33.5.22", HostUtil.CLIENT_DEFAULT_PORT); | ||
| assertThat(parts.length).isEqualTo(2); | ||
| assertThat(parts[0]).isEqualTo("10.33.5.22"); | ||
| assertThat(parts[1]).isEqualTo(HostUtil.CLIENT_DEFAULT_PORT); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIPv4WithPort() { | ||
| final String[] parts = HostUtil.parseHostAddress("10.33.5.22:33", HostUtil.CLIENT_DEFAULT_PORT); | ||
| assertThat(parts.length).isEqualTo(2); | ||
| assertThat(parts[0]).isEqualTo("10.33.5.22"); | ||
| assertThat(parts[1]).isEqualTo("33"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIPv6() { | ||
| final String[] parts = HostUtil.parseHostAddress("fe80:0:0:0:250:56ff:fe9a:6990", HostUtil.CLIENT_DEFAULT_PORT); | ||
| assertThat(parts.length).isEqualTo(2); | ||
| assertThat(parts[0]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990"); | ||
| assertThat(parts[1]).isEqualTo(HostUtil.CLIENT_DEFAULT_PORT); | ||
| } | ||
|
|
||
| @Test | ||
| public void testIPv6WithPort() { | ||
| final String[] parts = HostUtil.parseHostAddress("fe80:0:0:0:250:56ff:fe9a:6990:22", HostUtil.CLIENT_DEFAULT_PORT); | ||
| assertThat(parts.length).isEqualTo(2); | ||
| assertThat(parts[0]).isEqualTo("fe80:0:0:0:250:56ff:fe9a:6990"); | ||
| assertThat(parts[1]).isEqualTo("22"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.