590e679fed
fix Hostname validation (cherry picked from commit fad6898e90b42b07b7ebaeed74df964b64ed64a1)
114 lines
3.6 KiB
Diff
114 lines
3.6 KiB
Diff
From 1e5c3a6b6f8722ebe120d56c4d010285d6bad3de Mon Sep 17 00:00:00 2001
|
|
From: Aravinda VK <aravinda@kadalu.tech>
|
|
Date: Sat, 17 Feb 2024 09:39:09 +0530
|
|
Subject: [PATCH] cli: Fix Hostname validation
|
|
|
|
Gluster volume create command fails to use the hostnames
|
|
that starts with `0.`
|
|
|
|
```
|
|
Please provide a valid hostname/ip other than localhost, 127.0.0.1 or
|
|
loopback address (0.0.0.0 to 0.255.255.255).
|
|
```
|
|
|
|
For example:
|
|
|
|
```
|
|
gluster volume create vol1 0.s1.dev:/data/gfs/vol1/b1 force
|
|
```
|
|
|
|
Signed-off-by: Aravinda VK <aravinda@kadalu.tech>
|
|
---
|
|
cli/src/cli-cmd-parser.c | 44 ++++++++++++++++++++++++----------------
|
|
1 file changed, 26 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
|
|
index 74e5ad7..7ff7652 100644
|
|
--- a/cli/src/cli-cmd-parser.c
|
|
+++ b/cli/src/cli-cmd-parser.c
|
|
@@ -87,6 +87,25 @@ validate_brick_name(char *brick)
|
|
return ret;
|
|
}
|
|
|
|
+bool
|
|
+handle_local_or_loopback_address(char *host_name)
|
|
+{
|
|
+ int ip_len;
|
|
+ ip_len = strlen(host_name);
|
|
+
|
|
+ if (!(strcmp(host_name, "localhost") && strcmp(host_name, "127.0.0.1")) ||
|
|
+ (valid_ipv4_address(host_name, ip_len, 0) &&
|
|
+ !strncmp(host_name, "0.", 2))) {
|
|
+ cli_err(
|
|
+ "Please provide a valid hostname/ip other "
|
|
+ "than localhost, 127.0.0.1 or loopback "
|
|
+ "address (0.0.0.0 to 0.255.255.255).");
|
|
+ return _gf_false;
|
|
+ }
|
|
+
|
|
+ return _gf_true;
|
|
+}
|
|
+
|
|
int32_t
|
|
cli_cmd_ta_brick_parse(const char **words, int wordcount, char **ta_brick)
|
|
{
|
|
@@ -128,15 +147,11 @@ cli_cmd_ta_brick_parse(const char **words, int wordcount, char **ta_brick)
|
|
goto out;
|
|
}
|
|
|
|
- if (!(strcmp(host_name, "localhost") && strcmp(host_name, "127.0.0.1") &&
|
|
- strncmp(host_name, "0.", 2))) {
|
|
- cli_err(
|
|
- "Please provide a valid hostname/ip other "
|
|
- "than localhost, 127.0.0.1 or loopback "
|
|
- "address (0.0.0.0 to 0.255.255.255).");
|
|
+ if (!handle_local_or_loopback_address(host_name)) {
|
|
ret = -1;
|
|
goto out;
|
|
}
|
|
+
|
|
if (!valid_internet_address(host_name, _gf_false, _gf_false)) {
|
|
cli_err(
|
|
"internet address '%s' does not conform to "
|
|
@@ -228,16 +243,12 @@ cli_cmd_bricks_parse(const char **words, int wordcount, int brick_index,
|
|
goto out;
|
|
}
|
|
|
|
- if (!(strcmp(host_name, "localhost") &&
|
|
- strcmp(host_name, "127.0.0.1") && strncmp(host_name, "0.", 2))) {
|
|
- cli_err(
|
|
- "Please provide a valid hostname/ip other "
|
|
- "than localhost, 127.0.0.1 or loopback "
|
|
- "address (0.0.0.0 to 0.255.255.255).");
|
|
+ if (!handle_local_or_loopback_address(host_name)) {
|
|
ret = -1;
|
|
GF_FREE(tmp_host);
|
|
goto out;
|
|
}
|
|
+
|
|
if (!valid_internet_address(host_name, _gf_false, _gf_false)) {
|
|
cli_err(
|
|
"internet address '%s' does not conform to "
|
|
@@ -3728,15 +3739,12 @@ extract_hostname_path_from_token(const char *tmp_words, char **hostname,
|
|
"memory");
|
|
goto out;
|
|
}
|
|
- if (!(strcmp(host_name, "localhost") && strcmp(host_name, "127.0.0.1") &&
|
|
- strncmp(host_name, "0.", 2))) {
|
|
- cli_err(
|
|
- "Please provide a valid hostname/ip other "
|
|
- "than localhost, 127.0.0.1 or loopback "
|
|
- "address (0.0.0.0 to 0.255.255.255).");
|
|
+
|
|
+ if (!handle_local_or_loopback_address(host_name)) {
|
|
ret = -1;
|
|
goto out;
|
|
}
|
|
+
|
|
if (!valid_internet_address(host_name, _gf_false, _gf_false)) {
|
|
cli_err(
|
|
"internet address '%s' does not conform to "
|
|
--
|
|
2.27.0
|
|
|